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 fdd666f66a Merge tag '14.0-beta1' into jgrpp ... # Conflicts: # src/3rdparty/squirrel/squirrel/sqcompiler.cpp # src/aircraft.h # src/animated_tile.h # src/base_consist.h # src/cargotype.h # src/company_gui.cpp # src/console_cmds.cpp # src/core/overflowsafe_type.hpp # src/engine_gui.cpp # src/industry_gui.cpp # src/lang/english.txt # src/music/extmidi.cpp # src/network/core/network_game_info.cpp # src/network/network_server.cpp # src/newgrf.cpp # src/newgrf_industries.cpp # src/order_base.h # src/order_cmd.cpp # src/order_gui.cpp # src/order_type.h # src/os/macosx/misc_osx.cpp # src/os/windows/crashlog_win.cpp # src/rail_gui.cpp # src/rail_gui.h # src/roadveh.h # src/roadveh_cmd.cpp # src/saveload/afterload.cpp # src/saveload/company_sl.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/script/api/script_town.cpp # src/settingsgen/settingsgen.cpp # src/ship.h # src/ship_cmd.cpp # src/smallmap_gui.cpp # src/spritecache.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen.h # src/table/settings/script_settings.ini # src/timetable_cmd.cpp # src/timetable_gui.cpp # src/town.h # src/town_cmd.cpp # src/town_cmd.h # src/town_gui.cpp # src/train.h # src/train_cmd.cpp # src/tree_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui.cpp # src/vehiclelist.cpp # src/waypoint_base.h # src/widget.cpp		4 months ago
..
CMakeLists.txt	…
sqapi.cpp	Merge branch 'master' into jgrpp	5 months ago
sqarray.h	…
sqbaselib.cpp	Merge branch 'master' into jgrpp	5 months ago
sqclass.cpp	Merge branch 'master' into jgrpp	7 months ago
sqclass.h	Merge branch 'master' into jgrpp	7 months ago
sqclosure.h	Merge branch 'master' into jgrpp	7 months ago
sqcompiler.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
sqcompiler.h	Codechange: Simplify error throwing/catching in squirrel compiler.	4 months ago
sqdebug.cpp	Codechange: make SQString::Create that supports std::string and use that	12 months ago
sqfuncproto.h	Merge branch 'master' into jgrpp	7 months ago
sqfuncstate.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
sqfuncstate.h	Codechange: Simplify error throwing/catching in squirrel compiler.	4 months ago
sqlexer.cpp	Codechange: Replace old non-standard attributes with C++17/20 standard attributes.	4 months ago
sqlexer.h	Codechange: Simplify error throwing/catching in squirrel compiler.	4 months ago
sqmem.cpp	…
sqobject.cpp	Codechange: use string/fmt instead of printf for Squirrel's Raise_Error	1 year ago
sqobject.h	Merge branch 'master' into jgrpp	5 months ago
sqopcodes.h	…
sqpcheader.h	…
sqstate.cpp	Merge branch 'master' into jgrpp	5 months ago
sqstate.h	…
sqstring.h	Codechange: Add missing override specifiers to squirrel.	8 months ago
sqtable.cpp	…
sqtable.h	…
squserdata.h	Merge branch 'master' into jgrpp	7 months ago
squtils.h	Remove use of fmt from squtils.h	10 months ago
sqvm.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
sqvm.h	Change: Limit total script ops that can be consumed by a list valuate (#11670)	5 months ago