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

215 Commits

Author SHA1 Message Date
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
 2015-08-11 21:41:41 +01:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00: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
frosch
e9c3ca62cd (svn r27251) -Feature [FS#6252]: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations. (adf88) 2015-04-26 09:51:24 +00:00
frosch
6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 2015-02-22 15:26:27 +00:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
alberth
b67d483b46 (svn r27084) -Doc: Improve documentation of AllocateWindowDescFront. 2014-12-18 16:50:11 +00:00
peter1138
4f63bbedc1 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 2014-09-22 08:01: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
5c3b3f84d6 (svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose. 2014-03-23 13:28:32 +00:00
zuu
ac08e89a32 (svn r25854) -Change: Display the cost to upgrade a bridge at the end of bridge that was clicked and not the other end, which could be outside of the screen in some cases (cirdan, LordAro) 2013-10-12 22:45:19 +00:00
frosch
173aed1687 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 2013-06-15 15:31:22 +00:00
frosch
303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
frosch
01dc8ee620 (svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window. 2013-06-11 18:36:26 +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
zuu
327ade9ecc (svn r24948) -Codechange: Do not assume CA_BUS and CA_TRUCK to be equal, instead let the compiler optimize the code if that is the case. (ComLock) 2013-01-28 22:21:29 +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
truebrain
c74ccfff1b (svn r23601) -Fix: fix the conflict in window number 2011-12-19 20:50:21 +00:00
planetmaker
85df9df9b6 (svn r23559) -Codechange: Document and name consistently road build widgets 2011-12-16 18:52:15 +00:00
truebrain
d1dc135461 (svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile 2011-12-16 16:23:50 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
rubidium
6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
frosch
4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
rubidium
cb2c7f871f (svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h 2011-02-07 22:37:22 +00:00
terkhen
d865c6ea02 (svn r21779) -Cleanup(r21778): Remove unneeded space at the start of a line. 2011-01-14 12:46:05 +00:00
terkhen
6877ab9d05 (svn r21778) -Add: After building a road or tram tunnel, connect it to any existing road or tram. 2011-01-14 12:01:07 +00:00
terkhen
3f3d477457 (svn r21776) -Codechange: Give a more appropriate name to the road connection function. 
-Document: Add doxygen comments to the function.
 2011-01-14 11:55:40 +00:00
alberth
7d989073d4 (svn r21627) -Codechange: Remove _place_proc global variable. 2010-12-24 15:08:19 +00:00
alberth
38a59fb3f3 (svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas. 2010-12-23 14:38:01 +00:00
alberth
cf72e1c418 (svn r21552) -Codechange: Move short callback functions into the switch. 2010-12-20 19:24:27 +00:00
alberth
ae06b95793 (svn r21551) -Codechange: Record the last started user action, and use that in the callback. 2010-12-20 19:23:07 +00:00
alberth
353f42b244 (svn r21550) -Codechange: Move the small static functions into the switch. 2010-12-20 19:21:50 +00:00
alberth
0d131665ba (svn r21549) -Codechange: Unfold the _build_road_button_proc array into a switch. 2010-12-20 19:20:38 +00:00
alberth
b3b4bd0b07 (svn r21548) -Codechange: Code style, multi line statements should indent two tabs. 2010-12-20 19:19:23 +00:00
alberth
0722492c1b (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
terkhen
6c9580d6d0 (svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available. 2010-09-28 21:58:06 +00:00
rubidium
360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
rubidium
8c85b4ce3d (svn r20281) -Codechange: unify case scope closure + break coding style 2010-08-01 18:53:30 +00:00
yexo
1e05ef9480 (svn r20073) -Feature: customizable hotkeys for the road toolbar 2010-07-04 10:57:31 +00:00
frosch
0e7653fd7b (svn r19637) -Codechange: Pass complete TransportType to CmdBuildTunnel. 2010-04-14 20:28:37 +00:00
smatz
d2e99657fa (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET 2010-03-23 22:25:43 +00:00
frosch
749d58ca6d (svn r19445) -Change: No need to drag an area when overbuilding bridges. 2010-03-17 20:19:55 +00:00
terkhen
8c512f62e2 (svn r19230) -Feature: Allow to remove multiple road stops using drag and drop. 2010-02-24 21:53:16 +00:00
terkhen
f7e91fa7d2 (svn r19229) -Feature: Allow to build multiple road stops using drag and drop (Based on Wolf01 work) 2010-02-24 21:51:59 +00:00