Melanie 8c5445b774 Merge branch 'master' into careminster ...

Conflicts:
	ThirdParty/SmartThreadPool/SmartThreadPool.cs

2013-05-01 21:39:49 +01:00

..

Api/Runtime

Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.

2013-01-17 23:39:09 +00:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Resources

Add the XML manifests needed to get the new style modules to load.

2009-04-15 23:59:15 +00:00

Tests

refactor: rename XEngineTest to more descriptive XEngineBasicTests

2013-01-22 00:35:56 +00:00

EventManager.cs

Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so that these can be triggered by future code (not yet implemented).

2013-01-26 03:57:51 +00:00

ScriptEngineConsoleCommands.cs

Add "show script timers" command to show script timers. For debug purposes.

2013-01-10 00:57:49 +00:00

XEngine.cs

Merge branch 'master' into careminster

2013-05-01 21:39:49 +01:00

XWorkItem.cs

Update SmartThreadPool to latest version 2.2.3 with a major and minor change.

2013-05-01 19:01:43 +01:00