Jonathan G Rennison 035f5622b9 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h

2018-07-24 18:30:42 +01:00

..

api

Merge branch 'master' into jgrpp

2018-07-24 18:30:42 +01:00

script_config.cpp

(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)

2014-04-25 15:40:32 +00:00

script_config.hpp

(svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written

2014-04-24 04:41:54 +00:00

script_fatalerror.hpp

…

script_info_dummy.cpp

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

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

script_info.cpp

(svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD

2014-09-06 17:30:33 +00:00

script_info.hpp

(svn r26057) -Fix: a number of possibly uninitialised variables

2013-11-23 13:12:19 +00:00

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

(svn r25342) -Add: StoryPage data structures and GS API

2013-06-09 12:19:09 +00:00

script_scanner.cpp

(svn r26617) -Fix [FS#5973]: [Script] Loading/parsing of info .nuts was done in the same VM, causing e.g. constants to break the loading of info of other scripts

2014-05-25 19:53:46 +00:00

script_scanner.hpp

(svn r26617) -Fix [FS#5973]: [Script] Loading/parsing of info .nuts was done in the same VM, causing e.g. constants to break the loading of info of other scripts

2014-05-25 19:53:46 +00:00

script_storage.hpp

(svn r26057) -Fix: a number of possibly uninitialised variables

2013-11-23 13:12:19 +00:00

script_suspend.hpp

…

squirrel_class.hpp

…

squirrel_helper_type.hpp

…

squirrel_helper.hpp

(svn r26774) -Cleanup [Squirrel]: remove _SC macro

2014-09-06 17:46:56 +00:00

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

(svn r26797) -Codechange: rewrite the UTF8 reading code to make use of already existing functions instead of partially trying to implemented them

2014-09-07 16:03:41 +00:00

squirrel.hpp

(svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD

2014-09-06 17:30:33 +00:00