Commit Graph

246 Commits (b0284c8d9e33e3a96cacd1724fbc36f192ea18f0)

Author SHA1 Message Date
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison d1a287d73c Merge branch 'save_ext' into jgrpp 7 years ago
peter1138 0d13f793f2 (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 7 years ago
peter1138 02b6c533aa (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 7 years ago
Jonathan G Rennison a6168dd2f0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/company_sl.cpp
7 years ago
frosch 2bb80d280c (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 7 years ago
frosch ce32ca4dc6 (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 7 years ago
frosch a56e2bccd0 (svn r27756) -Codechange: Add StringTab enum 7 years ago
frosch 49b940f69c (svn r27756) -Codechange: Add StringTab enum 7 years ago
frosch f4da8ece0c (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 7 years ago
frosch b54a79f13e (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 7 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
frosch 1a92b0c7c3 (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 8 years ago
frosch 2be42dadea (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 8 years ago
frosch b25afb239a (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 8 years ago
frosch 9145e5d2b5 (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 8 years ago
Jonathan G Rennison 20a090b077 Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
frosch 8d8c06ce86 (svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing. 10 years ago
frosch 9119ebe2ce (svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing. 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
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 10 years ago
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 10 years ago
frosch 968ba79de2 (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch e9c22ef16f (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch 3a1fcd76dd (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 11 years ago
frosch 00e7ceeca4 (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 11 years ago
frosch bc53bbb8b6 (svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars. 11 years ago
frosch 4f419b8f84 (svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars. 11 years ago
frosch 7b238142b8 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 11 years ago
frosch ba1779b978 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 11 years ago
frosch 9215fd3c96 (svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it. 11 years ago
frosch 477c15383d (svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it. 11 years ago
rubidium 49eaa397ab (svn r26065) -Fix: possible dereference of NULL for texts from game scripts 11 years ago
rubidium c29f18f357 (svn r26065) -Fix: possible dereference of NULL for texts from game scripts 11 years ago
rubidium 73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium b3e93d6520 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium 2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 7c0f34130c (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
yexo 491aee463f (svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble 13 years ago
yexo f917ac0a0f (svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble 13 years ago
yexo 3557d5a784 (svn r23812) -Fix [FS#4977] (r23804): custom ActionB messages were broken 13 years ago
yexo fab78a7bf2 (svn r23812) -Fix [FS#4977] (r23804): custom ActionB messages were broken 13 years ago
yexo 215447b4e8 (svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used 13 years ago
yexo 15292fa080 (svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used 13 years ago
rubidium c591589818 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 13 years ago
rubidium b8866be093 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 13 years ago