dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,457 Commits 1 Branch 0 Tags
b80e55d3eca91e1f8785c5f33e6e80cfa3c8f40f
Commit Graph

311 Commits

Author SHA1 Message Date
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
frosch
4a6036208a (svn r27277) -Codechange: Make _displayed_industries a std::bitset. 2015-05-09 09:24:19 +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
alberth
633ac888f6 (svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses. 2014-08-09 19:32:51 +00:00
planetmaker
796fcaa9e1 (svn r26656) -Fix [FS#6044]: Production cheat cannot not be allowed to be active in multiplayer for desync reasons, even when activated in singleplayer previously 2014-06-20 20:04:10 +00:00
frosch
7b3ead329b (svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours. 2014-06-10 16:37:25 +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
frosch
7b238142b8 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 2014-01-12 18:00:39 +00:00
rubidium
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
3784110fe6 (svn r26080) -Fix: possible out of bounds array access 2013-11-24 09:30:30 +00:00
frosch
670c4879cf (svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES. 2013-10-12 16:33:19 +00:00
frosch
0c42bd6a7b (svn r25732) -Fix: In BuildIndustryWindow in RTL mode, draw industry color icon at the right. (sbr) 2013-08-18 20:06:01 +00:00
fonsinchen
4396dcf642 (svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0 2013-08-10 12:47:24 +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
f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 2013-06-30 14:32:31 +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
16feb5c4e9 (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
alberth
41ddef3018 (svn r25238) -Feature: Display imminent closure of an industry in its view window. 2013-05-12 19:38:30 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
alberth
19adc87262 (svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb) 2012-12-01 13:12:39 +00:00
alberth
443d666bba (svn r24764) -Change: Disable horizontal resizing of the industry chain window, it's not useful. 2012-11-25 15:31:45 +00:00
alberth
9f8184e71e (svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window. 2012-11-25 15:24:02 +00:00
frosch
3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
alberth
67f599f9db (svn r24395) -Doc: Fixed argument references in @param descriptions. 2012-07-10 18:37:54 +00:00
frosch
23ad97e755 (svn r24310) -Codechange: Add named constants for the dimensions of settings buttons, and generally make their usage more consistent. 2012-06-01 14:41:09 +00:00
frosch
70d3206320 (svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h 2012-06-01 10:44:45 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
smatz
cf54bc425f (svn r23706) -Codechange: prevent 'unknown command' doxygen errors 2012-01-01 17:36:19 +00:00
truebrain
733516639d (svn r23534) -Codechange: document and rename widgets to be consistent and understandable 2011-12-16 16:39:48 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
rubidium
24263638bf (svn r23526) -Codechange: unify cargos vs cargoes 2011-12-15 21:56:00 +00:00
truebrain
da63ce43fa (svn r23525) -Codechange: make Window::flags4 WindowFlags instead of uint16, with only values known in WindowFlags (and move out 2 timers to their own variable) 
-Codechange: rename Window::flags4 to Window::flags
-Codechange: move some non-inline functions from .hpp to .cpp
 2011-12-15 19:54:23 +00:00
rubidium
9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 2011-12-10 13:54:10 +00:00
frosch
930c6c7779 (svn r23146) -Change: [NewGRF v8] Make callback 22 return a probability to use instead of property 18. 2011-11-08 17:26:13 +00:00
frosch
6365d92776 (svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts. 2011-11-08 17:24:43 +00:00
frosch
c6783955aa (svn r22725) -Fix: Always draw NewGRF supplied texts with a default colour. 2011-08-06 13:56:27 +00:00
frosch
e43d74c438 (svn r22631) -Fix: Additional text in fund industry window is NewGRF supplied and thus should have a default colour. 2011-07-03 14:49:19 +00:00
frosch
e7971ab5df (svn r22627) -Codechange: Rename PrepareTextRefStackUsage() to StartTextRefStackUsage() to make it more obvious that you must call StopTextRefStackUsage() at some point. Also extent the documentation. 2011-07-03 13:49:29 +00:00
frosch
7b251297c9 (svn r22429) -Add: some constants for specific palette colours used in the GUI. 2011-05-06 21:13:29 +00:00
frosch
7cc3d3e143 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 2011-05-04 17:45:16 +00:00
terkhen
a88fe7c2aa (svn r22343) -Change: Remove pixel limiter for query strings. 2011-04-17 18:42:17 +00:00
frosch
db3a8d1abf (svn r22247) -Codechange: Update comments wrt. ForceRebuild() in command-scope. 2011-03-13 21:34:21 +00:00
frosch
4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
frosch
1a14c133c6 (svn r22228) -Fix (r22135)[FS#4546]: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting. 2011-03-08 20:52:59 +00:00
alberth
8c3041b3c9 (svn r22001) -Codechange: Rename difficulty.number_industries to difficulty.industry_density. 2011-02-06 18:26:50 +00:00
alberth
f838069a44 (svn r22000) -Codechange: Introduce an enum for the industry density setting. 2011-02-06 18:11:39 +00:00
alberth
ad2049848a (svn r21927) -Change: Comment-style fixes. 2011-01-30 12:58:54 +00:00