You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 9e946d4c5d Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/command.cpp # src/console_cmds.cpp # src/group_gui.cpp # src/lang/catalan.txt # src/lang/czech.txt # src/lang/danish.txt # src/lang/greek.txt # src/lang/hungarian.txt # src/lang/irish.txt # src/lang/japanese.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/traditional_chinese.txt # src/lang/turkish.txt # src/lang/ukrainian.txt # src/lang/vietnamese.txt # src/network/network.cpp # src/network/network_client.cpp # src/network/network_func.h # src/network/network_internal.h # src/network/network_server.cpp # src/network/network_server.h # src/saveload/afterload.cpp # src/saveload/newgrf_sl.cpp # src/saveload/saveload.h # src/script/script_instance.cpp # src/toolbar_gui.cpp # src/toolbar_gui.h # src/vehicle_gui.cpp # src/widgets/rail_widget.h # src/widgets/vehicle_widget.h # src/window.cpp		3 years ago
..
api	Merge branch 'master' into jgrpp-beta	3 years ago
CMakeLists.txt	…
script_config.cpp	Codechange: move script settings to std::string	3 years ago
script_config.hpp	Change: Use gender-neutral pronouns	3 years ago
script_fatalerror.hpp	Change: [Script] Let Script_FatalError use std::string instead of const char *	3 years ago
script_info.cpp	Codechange: move casting a "const char *" to "char *" to the caller	3 years ago
script_info.hpp	Codechange: Use std::string in file scanners.	4 years ago
script_info_dummy.cpp	Change: Use gender-neutral pronouns	3 years ago
script_instance.cpp	Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)	3 years ago
script_instance.hpp	Merge branch 'jgrpp' into jgrpp-beta	3 years ago
script_scanner.cpp	Cleanup: remove some unneeded c_str() calls	3 years ago
script_scanner.hpp	Codechange: Use std::string in file scanners.	4 years ago
script_storage.hpp	…
script_suspend.hpp	…
squirrel.cpp	Merge branch 'master' into jgrpp-beta	3 years ago
squirrel.hpp	Merge branch 'master' into jgrpp-beta	3 years ago
squirrel_class.hpp	Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)	3 years ago
squirrel_helper.hpp	Cleanup: [Script] Use nullptr instead of 0 or NULL	3 years ago
squirrel_helper_type.hpp	…
squirrel_std.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
squirrel_std.hpp	…