dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,372 Commits 1 Branch 0 Tags
bbe079c906da5d0fd57c7f626ea8e9d2da455e80
Commit Graph

1212 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
 2015-08-05 21:54:11 +01:00
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch 
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
 2015-08-05 21:24:30 +01:00
Jonathan G Rennison
80d52eb20e Improved breakdowns patch: fix various issues 
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
 2015-08-02 23:00:39 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +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
0889145dc5 (svn r27024) -Codechange: Adjust spacing on small order list. 2014-10-18 16:12:48 +00:00
peter1138
f5d964bdbd (svn r27024) -Codechange: Adjust spacing on small order list. 2014-10-18 16:12:48 +00:00
rubidium
890f50d491 (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 2014-10-14 11:23:41 +00:00
rubidium
a72dd0480c (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 2014-10-14 11:23:41 +00:00
peter1138
6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
f7f49c15a3 (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 2014-10-04 16:40:23 +00:00
peter1138
ce9fab58bc (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 2014-10-04 16:40:23 +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
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
rubidium
1f067c8529 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 2013-11-11 18:58:15 +00:00
rubidium
be4355edd3 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 2013-11-11 18:58:15 +00:00
alberth
0df874d18d (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 2013-10-01 20:35:06 +00:00
alberth
999e76d305 (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 2013-10-01 20:35:06 +00:00
alberth
03f2d5ded7 (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 2013-10-01 20:22:38 +00:00
alberth
26dbdafeed (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 2013-10-01 20:22:38 +00:00
alberth
736359623b (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 2013-10-01 20:16:44 +00:00
alberth
5437a588a0 (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 2013-10-01 20:16:44 +00:00
frosch
de8a325d6e (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 2013-06-30 14:38:45 +00:00
frosch
f128c61595 (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 2013-06-30 14:38:45 +00:00
frosch
2967eb8749 (svn r25541) -Cleanup: No need to clear a bit which is never set. 2013-06-30 14:38:20 +00:00
frosch
c640289d7f (svn r25541) -Cleanup: No need to clear a bit which is never set. 2013-06-30 14:38:20 +00:00
frosch
538159cb1d (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 2013-06-30 14:36:31 +00:00
frosch
43ec0bf0c1 (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 2013-06-30 14:36:31 +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
frosch
98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +00:00
frosch
5ede413531 (svn r25456) -Fix [FS#5560]: Assertion when opening the refit GUI for a not refittable vehicle. 2013-06-24 20:57:50 +00:00
frosch
abb5a13f1e (svn r25456) -Fix [FS#5560]: Assertion when opening the refit GUI for a not refittable vehicle. 2013-06-24 20:57:50 +00:00
frosch
13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch
4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch
56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch
1876078983 (svn r25058) -Add: tree nodes in the refit GUI for subtype refits. 2013-03-02 12:38:40 +00:00
frosch
591cab43b9 (svn r25058) -Add: tree nodes in the refit GUI for subtype refits. 2013-03-02 12:38:40 +00:00
frosch
dacb82695b (svn r25044) -Change: Collapse subtypes in the refit GUI and only expand them after selecting the cargo type. 2013-02-24 16:43:45 +00:00
frosch
2f3fdbf837 (svn r25044) -Change: Collapse subtypes in the refit GUI and only expand them after selecting the cargo type. 2013-02-24 16:43:45 +00:00
frosch
f81b2246fc (svn r25043) -Change [FS#3764]: Only display subtypes in the refit GUI which are available for all selected vehicles. Also add a generic list item to refit while keeping the subtypes of individual vehicles. 2013-02-24 16:43:24 +00:00
frosch
5cd5aca98c (svn r25043) -Change [FS#3764]: Only display subtypes in the refit GUI which are available for all selected vehicles. Also add a generic list item to refit while keeping the subtypes of individual vehicles. 2013-02-24 16:43:24 +00:00