Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp ...

# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h

2019-03-04 01:18:25 +00:00

..

api

Merge branch 'master' into jgrpp

2019-03-04 01:18:25 +00:00

script_config.cpp

Fix #6892: [Script] CONFIG_RANDOM did not use the full parameter range (#6902)

2018-09-20 22:31:38 +02:00

script_config.hpp

Change: Allow AI companies to start immediately.

2019-02-02 16:37:11 +00:00

script_fatalerror.hpp

…

script_info_dummy.cpp

Fix: Remove various dead or unnecessary assignments

2018-10-31 12:41:49 +01:00

script_info.cpp

…

script_info.hpp

…

script_instance.cpp

(svn r26785) -Fix [Squirrel]: loading a value saved as boolean caused it to be of type integer instead of boolean

2014-09-07 09:30:57 +00:00

script_instance.hpp

…

script_scanner.cpp

Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32

2018-12-27 18:09:16 +01:00

script_scanner.hpp

…

script_storage.hpp

…

script_suspend.hpp

…

squirrel_class.hpp

…

squirrel_helper_type.hpp

…

squirrel_helper.hpp

…

squirrel_std.cpp

(svn r26782) -Fix (r26781): was in the wrong folder when commiting

2014-09-06 20:22:59 +00:00

squirrel_std.hpp

…

squirrel.cpp

Fix 6accbf9: Silence warnings about unused fread() result

2019-01-05 17:16:53 +01:00

squirrel.hpp

…