dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,624 Commits 1 Branch 0 Tags
dadbad2bfcd8b0d49809ff044917bba25451511c
Commit Graph

555 Commits

Author SHA1 Message Date
peter1138
fb35cb5ed2 Remove: Unnecessary virtual destructors on drop down list items. 2019-03-10 09:20:11 +00:00
peter1138
811bf22620 Codechange: Use Colours type instead of byte. 2019-03-10 09:20:11 +00:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00:00
peter1138
93a6fd42d1 Fix 23960d0f2c: Company livery window shows incorrect groups when opened from group window in multiplayer. 2019-03-03 13:13:35 +01:00
peter1138
7ac17f5ae4 Fix #7281: Unable to select last group in open livery window on group creation. 2019-02-26 11:20:23 +01:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Peter Nelson
c9d801a98d Fix: Make livery window resize properly if GUI scale changes whilst open. 2019-02-02 16:57:47 +00:00
Jonathan G Rennison
9d3b77c5a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
 2019-02-02 01:27:56 +00:00
Peter Nelson
9e9d485713 Fix 23960d0f2c: Scrollbar was broken for non-group liveries. 
Simplify how list position is determined by using existing functions.
Also rename livery_height -> rows and SetLiveryHeight() -> SetRows(), as height implies pixels.
 2019-02-01 13:25:42 +00:00
Jonathan G Rennison
ddf31702a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
 2019-01-31 18:19:45 +00:00
PeterN
23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108) 
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
 2019-01-31 14:57:44 +01:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2019-01-29 02:28:14 +00:00
Peter Nelson
6e5b90f4f7 Change: For consistency, add company name to colour scheme window. 2019-01-27 12:34:49 +01:00
Peter Nelson
256b94a03d Fix: Ignore company colour selection when showing different company's colour scheme. 2019-01-27 12:34:49 +01:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00:00
nikolas
fa95af2da8 Codechange: Fix typo in variable name: pices -> pieces (#7033) 2019-01-11 16:08:02 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
52dadc9252 Merge branch 'master' into jgrpp 2017-07-27 18:41:43 +01:00
frosch
a682962719 (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +00:00
frosch
b8456196ef (svn r27889) -Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (adf88) 2017-07-11 19:37:10 +00:00
Jonathan G Rennison
e6bbbfc58e Make company finance window max money value non-static. 2017-04-12 17:46:27 +01:00
Jonathan G Rennison
5ba7bf9da7 Fix company finance window being too small when first opened. 2017-04-11 18:59:47 +01:00
Jonathan G Rennison
54494a0a7c Merge branch 'send_money_company' into jgrpp 2017-03-03 22:42:07 +00:00
patch-import
f820543391 Import give money to company patch 
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
 2017-03-02 00:09:23 +00:00
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
da177d063f Custom bridge heads: Initial implementation 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
frosch
ade25fff71 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
frosch
2d636266f5 (svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window. 2015-10-30 17:24:30 +00:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +01:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138
217635d357 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 2014-09-28 19:19:47 +00:00
peter1138
58458c6652 (svn r26935) -Codechange: Fit company colour selection drop down list to UI scale. 2014-09-28 19:19:47 +00:00
peter1138
c2d4068a5e (svn r26856) -Codechange: Ensure company face widgets can fit company face. 2014-09-20 09:18:22 +00:00
peter1138
ea33b69798 (svn r26856) -Codechange: Ensure company face widgets can fit company face. 2014-09-20 09:18:22 +00:00
frosch
7a6d2e0110 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 2014-04-27 15:30:53 +00:00
frosch
2a16c33461 (svn r26527) -Codechange: Rename STR_MAPGEN_RANDOM to STR_FACE_RANDOM 2014-04-27 15:30:53 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
planetmaker
f44d54a9e4 (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 2014-03-18 20:53:34 +00:00
planetmaker
3dd1a6ad2d (svn r26416) -Fix [FS#5947]: Shares button state was not appropriately updated when switching setting or company (frosch) 2014-03-18 20:53:34 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
frosch
f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00