dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,860 Commits 1 Branch 0 Tags
b9eaef9fe1517c246974b7b6b3dffc7ed1c99158
Commit Graph

133 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
dbc5f1baed Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
 2019-07-11 20:03:23 +01:00
stormcone
6396ec05fe Fix #7609: In the sprite aligner window the 'Reset relative' button crashes the game. 
The 'offs_start_map' is a 'SmallMap', so its own 'Erase' function should be called instead of the underlying vector's 'erase' function.
And fix a "typo". :)
 2019-06-06 17:28:39 +01:00
Jonathan G Rennison
cef359193a Add GRF details to NewGRF debug window 2019-05-01 20:57:59 +01: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
58433c7667 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
 2019-03-30 20:45:58 +00:00
glx22
66dd7c3879 Fix: MSVC warnings (#7423) 2019-03-28 00:09:33 +01: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
Henry Wilson
c01a2e2a81 Codechange: Removed SmallVector completely 2019-03-26 20:15:57 +00:00
Henry Wilson
ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 2019-03-26 20:15:57 +00:00
Henry Wilson
ca2f33c6d0 Codechange: Replaced SmallVector::Erase() with std::vector::erase() 2019-03-26 20:15:57 +00:00
Henry Wilson
a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 2019-03-26 20:15:57 +00:00
peter1138
317f69c152 Codechange: Use override specifier in Window-derived classes. 2019-03-24 16:10:04 +01:00
Jonathan G Rennison
fb3cb9c3d2 Enable NewGRF debug window for non-GRF vehicles 2018-08-15 03:14:53 +01:00
Jonathan G Rennison
a8cfc9fe90 Debug: Add vehicle index and flag dump to NewGRF debug window 2018-06-05 19:09:03 +01:00
Jonathan G Rennison
9ee5aecbaf Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-11-24 01:06:51 +00:00
alberth
e9f12d666d (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 2015-11-20 10:04:28 +00:00
alberth
e1a00bc244 (svn r27451) -Feature[FS#6241]: Move sprite 8 positions in sprite aligner with ctrl+click. (based on work by juzza1) 2015-11-20 10:04:28 +00:00
Jonathan G Rennison
1891e7dfc8 Bump max map size to 28 bits. 
Prevent opening NewGRF debug window on tile indexes > 27 bits,
to avoid overflowing field.
 2015-09-11 22:39:41 +01:00
Jonathan G Rennison
5d222e4d5e Merge branch 'extra_large_maps' into extra_large_maps-sx 
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
 2015-09-11 22:39:01 +01:00
patch-import
7d2b4bd3ea Import extra large maps patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
 2015-09-11 19:53:08 +01:00
alberth
da9721ffd6 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 2015-03-01 08:17:14 +00:00
alberth
a5843149b5 (svn r27174) -Feature[FS#6236]: Display relative offset changes in the sprite aligner (juzza1). 2015-03-01 08:17:14 +00:00
frosch
06e97d529b (svn r27173) -Fix [FS#6237] (r27134): Use the regular clipping functions in the sprite aligner instead of some magic. 2015-02-28 20:09:49 +00:00
frosch
a4756c477d (svn r27173) -Fix [FS#6237] (r27134): Use the regular clipping functions in the sprite aligner instead of some magic. 2015-02-28 20:09:49 +00: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
alberth
8f6df8c230 (svn r27086) -Codechange: Simplify opening of windows by always returning a valid window pointer. 2014-12-18 18:22:23 +00:00
alberth
107bf32953 (svn r27086) -Codechange: Simplify opening of windows by always returning a valid window pointer. 2014-12-18 18:22:23 +00:00
peter1138
04c78761b7 (svn r26942) -Codechange: Make sprite aligner useful for people making full-zoom graphics. 2014-09-30 11:35:21 +00:00
peter1138
17cd86d762 (svn r26942) -Codechange: Make sprite aligner useful for people making full-zoom graphics. 2014-09-30 11:35:21 +00:00
peter1138
3911ea1f90 (svn r26941) -Codechange: Make NewGRF sprite aligner work with GUI size. 2014-09-30 11:29:23 +00:00
peter1138
1273ca8e8d (svn r26941) -Codechange: Make NewGRF sprite aligner work with GUI size. 2014-09-30 11:29:23 +00:00
rubidium
b886c8db8c (svn r26506) -Codechange: replace most of vsnprintf with vseprintf 2014-04-24 19:51:45 +00:00
rubidium
e61fe21237 (svn r26506) -Codechange: replace most of vsnprintf with vseprintf 2014-04-24 19:51:45 +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
6bceb8b7ab (svn r25946) -Add: [NewGRF Debuggnig] Inspecting other vehicles in a chain. 2013-11-07 18:17:21 +00:00
frosch
0aae2fd606 (svn r25946) -Add: [NewGRF Debuggnig] Inspecting other vehicles in a chain. 2013-11-07 18:17:21 +00:00
frosch
d4a5a50ad4 (svn r25945) -Codechange: Use member function of NewGRFInspectWindow to resolve FeatureIndex. 2013-11-07 18:15:32 +00:00
frosch
b0c2ab4501 (svn r25945) -Codechange: Use member function of NewGRFInspectWindow to resolve FeatureIndex. 2013-11-07 18:15:32 +00:00
frosch
af71445e1b (svn r25943) -Fix: NewGRF inspect window in RTL mode. 2013-11-06 15:10:17 +00:00
frosch
df10f7b9f9 (svn r25943) -Fix: NewGRF inspect window in RTL mode. 2013-11-06 15:10:17 +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
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