Commit Graph

153 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
2019-03-27 18:12:04 +00:00
peter1138
317f69c152 Codechange: Use override specifier in Window-derived classes. 2019-03-24 16:10:04 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
rubidium
09f6c46d0b (svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed) 2014-10-21 19:16:47 +00:00
rubidium
e811fa1718 (svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed) 2014-10-21 19:16:47 +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
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
3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
frosch
03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
frosch
b39a0ab5ea (svn r24576) -Fix [FS#5319] (r24260): Vehicle list at buoys did no longer work. (Juanjo) 2012-10-07 12:14:39 +00:00
frosch
738fca37bf (svn r24576) -Fix [FS#5319] (r24260): Vehicle list at buoys did no longer work. (Juanjo) 2012-10-07 12:14:39 +00:00
rubidium
98e3f0e14d (svn r23530) -Codechange: begin unify the naming of widgets and add comments to them, in this case the waypoint view widgets 2011-12-16 16:25:34 +00:00
rubidium
b90aa80e77 (svn r23530) -Codechange: begin unify the naming of widgets and add comments to them, in this case the waypoint view widgets 2011-12-16 16:25:34 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
truebrain
2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +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
truebrain
df0afdf0dc (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
peter1138
67fd36246b (svn r23321) -Fix (r23316): Extra viewports and waypoint detail opened up at wrong zoom level. 2011-11-24 18:55:56 +00:00
peter1138
3e1aaa1235 (svn r23321) -Fix (r23316): Extra viewports and waypoint detail opened up at wrong zoom level. 2011-11-24 18:55:56 +00:00
rubidium
6e9122828e (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
rubidium
5a620d1c65 (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
rubidium
87272273b5 (svn r22405) -Document: some more "random-ish" tidbits 2011-05-01 19:14:12 +00:00
rubidium
1a515e6344 (svn r22405) -Document: some more "random-ish" tidbits 2011-05-01 19:14:12 +00:00
terkhen
a88fe7c2aa (svn r22343) -Change: Remove pixel limiter for query strings. 2011-04-17 18:42:17 +00:00
terkhen
10caf391a1 (svn r22343) -Change: Remove pixel limiter for query strings. 2011-04-17 18:42:17 +00:00
frosch
4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
frosch
ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
frosch
bd48a46084 (svn r22131) -Fix: Spectators had trouble closing buoy windows. (Terkhen) 2011-02-23 18:39:56 +00:00
frosch
facf400d27 (svn r22131) -Fix: Spectators had trouble closing buoy windows. (Terkhen) 2011-02-23 18:39:56 +00:00
rubidium
7267a4de2c (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 2010-12-05 22:25:36 +00:00
rubidium
44d1c55347 (svn r21415) -Codechange: limit station/waypoint name by amount of characters, not bytes 2010-12-05 22:25:36 +00:00
alberth
0722492c1b (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
alberth
f5c6fd1a25 (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
rubidium
3fbd0ba9d9 (svn r21035) -Fix [FS#4181] (r21020): crash when opening the buoy's viewport. Based on a patch by Krille. 2010-10-24 20:59:25 +00:00
rubidium
1f5554c5c7 (svn r21035) -Fix [FS#4181] (r21020): crash when opening the buoy's viewport. Based on a patch by Krille. 2010-10-24 20:59:25 +00:00
alberth
42f6245a31 (svn r21021) -Add [FS#4171]: Center industry gui and waypoint gui after resize (partly by Krille). 2010-10-23 20:51:48 +00:00
alberth
df7a32d364 (svn r21021) -Add [FS#4171]: Center industry gui and waypoint gui after resize (partly by Krille). 2010-10-23 20:51:48 +00:00
alberth
835fe2131d (svn r21020) -Add: Use center of waypoint in waypoint gui, if available. 2010-10-23 20:39:21 +00:00
alberth
83094e5e58 (svn r21020) -Add: Use center of waypoint in waypoint gui, if available. 2010-10-23 20:39:21 +00:00
rubidium
4dc1647d12 (svn r20813) -Fix: make the waypoint viewport keep centered around the waypoint when resizing the window (Krille) 2010-09-16 16:14:30 +00:00