Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp ...

town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h

2015-08-05 21:54:11 +01:00

..

api

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

2015-08-05 21:54:11 +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

(svn r23358) -Codechange: move AI_FatalError to Script_FatalError (and to its own file)

2011-11-29 23:21:13 +00:00

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

(svn r23360) -Codechange: move AIInstance to ScriptInstance, making it reusable by other script API instances

2011-11-29 23:21:33 +00:00

squirrel_class.hpp

(svn r23651) -Feature: [NoGo] GSText now accepts string arguments as parameters to the constructor

2011-12-21 14:55:28 +00:00

squirrel_helper_type.hpp

(svn r22406) -Document: some more "random-ish" tidbits

2011-05-01 19:51:52 +00:00

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

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

2013-01-08 22:46:42 +00:00

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