dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,555 Commits 1 Branch 0 Tags
5acf18fb37ba1ac6d078aaba18960749661331af
Commit Graph

1874 Commits

Author SHA1 Message Date
Jonathan G Rennison
95b65163e3 Revert back to v2 of house picking/placing patch. 2016-05-12 22:35:39 +01:00
matthijs
53982003ee (svn r27560) -Fix: typos in comments and string 2016-05-11 20:48:46 +00:00
matthijs
91ddd32c20 (svn r27560) -Fix: typos in comments and string 2016-05-11 20:48:46 +00:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
Jonathan G Rennison
330a7327d6 Minor changes to avoid undefined behaviour warnings. 
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
 2016-03-21 20:22:01 +00:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00
frosch
9db36bd87a (svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12. 2016-02-08 21:05:57 +00:00
frosch
f6577b6ad7 (svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12. 2016-02-08 21:05:57 +00:00
Jonathan G Rennison
cbf1ece361 Merge branch 'group_collapse' into jgrpp 2016-01-19 21:16:25 +00:00
frosch
36e66a17dc (svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set. 2016-01-13 21:55:50 +00:00
frosch
df82dcdf35 (svn r27497) -Change: [NewGRF] Allow static NewGRF to enable the second rocky tile set. 2016-01-13 21:55:50 +00:00
Jonathan G Rennison
69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
 2015-12-09 01:03:37 +00:00
Jonathan G Rennison
a93714a720 Add setting to show restricted electric signals using the default sprites. 
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
 2015-12-09 01:01:37 +00:00
Jonathan G Rennison
ecf5943954 Fix some undefined behaviour: signed overflow and over shift left. 
Caught by UndefinedBehaviourSanitizer.
 2015-11-22 23:16:09 +00:00
patch-import
8f5ef2ae01 Import and rebase Max NewGRFs patch 
Fix trailing whitespace, clean up code a bit

http://www.tt-forums.net/viewtopic.php?p=894743#p894743
 2015-08-02 22:17:35 +01:00
frosch
00981908d0 (svn r27138) -Fix: [NewGRF] Negative positions in industry layouts were interpreted incorrectly; however since the wrong behaviour is saner, define as the correct behaviour for GRFv8. 2015-02-06 21:56:50 +00:00
frosch
c655847235 (svn r27138) -Fix: [NewGRF] Negative positions in industry layouts were interpreted incorrectly; however since the wrong behaviour is saner, define as the correct behaviour for GRFv8. 2015-02-06 21:56:50 +00:00
frosch
e5a8f6e7d4 (svn r27119) -Fix: Action 7/9 condition 0A failed for present, but disabled, NewGRF. 2015-01-17 15:00:02 +00:00
frosch
f79ead7125 (svn r27119) -Fix: Action 7/9 condition 0A failed for present, but disabled, NewGRF. 2015-01-17 15:00:02 +00:00
peter1138
2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
peter1138
253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
rubidium
d17a4e0918 (svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height 2014-09-21 12:02:03 +00:00
rubidium
ddfc8372ee (svn r26884) -Change: scale the NewGRF's snow line level according to the configured maximum map height 2014-09-21 12:02:03 +00:00
rubidium
6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +00:00
rubidium
2361aaf601 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +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
rubidium
101b982263 (svn r26475) -Fix: potentially undefined shifts in NewGRF code 2014-04-20 15:47:50 +00:00
rubidium
bbed2ff956 (svn r26475) -Fix: potentially undefined shifts in NewGRF code 2014-04-20 15:47:50 +00:00
planetmaker
c10662e4cc (svn r26458) -Doc: Correct a few spelling mistakes (__ln__) 2014-04-12 15:59:56 +00:00
planetmaker
ba42bcdf49 (svn r26458) -Doc: Correct a few spelling mistakes (__ln__) 2014-04-12 15:59:56 +00:00
frosch
cc0d263d96 (svn r26245) -Codechange: No need for a map, if a vector suffices. 2014-01-12 18:01:50 +00:00
frosch
ee5c115950 (svn r26245) -Codechange: No need for a map, if a vector suffices. 2014-01-12 18:01:50 +00:00
frosch
3a1fcd76dd (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 2014-01-12 18:01:16 +00:00
frosch
00e7ceeca4 (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 2014-01-12 18:01:16 +00:00
rubidium
a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 2013-11-26 16:08:58 +00:00
rubidium
d2ba772f6a (svn r26130) -Codechange: add some guards against using invalid image indices 2013-11-26 16:08:58 +00:00
rubidium
5eb7aea386 (svn r26069) -Fix: missing break in NewGRF object handling 2013-11-23 18:10:06 +00:00
rubidium
cf130ce9d8 (svn r26069) -Fix: missing break in NewGRF object handling 2013-11-23 18:10:06 +00:00
rubidium
5b6a15f879 (svn r26067) -Fix: possible NULL dereference when getting NewGRF version 2013-11-23 18:08:15 +00:00
rubidium
c035a9531b (svn r26067) -Fix: possible NULL dereference when getting NewGRF version 2013-11-23 18:08:15 +00:00
rubidium
8d97a5498b (svn r25961) -Fix [FS#5779]: [NewGRF] A powered rail type implies it is compatible as well, but some NewGRF didn't state that causing the path reservation code to bail out in some cases because there wasn't a compatible path 2013-11-09 10:45:05 +00:00
rubidium
ca7dce1fc2 (svn r25961) -Fix [FS#5779]: [NewGRF] A powered rail type implies it is compatible as well, but some NewGRF didn't state that causing the path reservation code to bail out in some cases because there wasn't a compatible path 2013-11-09 10:45:05 +00:00
planetmaker
5f9b8e4e8e (svn r25878) -Feature: [NewGRF] Object property 0x18 to allow specifying the number of objects of that type being placed upon map creation 2013-10-17 21:45:40 +00:00
planetmaker
ed54d39201 (svn r25878) -Feature: [NewGRF] Object property 0x18 to allow specifying the number of objects of that type being placed upon map creation 2013-10-17 21:45:40 +00:00