LucidCrux 766d3879c7 Merge remote-tracking branch 'origin/master' into state_manager_2 ...

Conflicts:
	script/events.js

2013-07-24 21:01:59 -06:00

..

encounters.js

IE<8 Fixes: Removed trailing commas in string literals and renamed variable char to chara

2013-07-23 23:54:06 -04:00

global.js

refactor Engine.js for use with $SM

2013-07-24 17:41:36 -06:00

outside.js

create StateManager, change all State calls to managed calls

2013-07-23 01:24:47 -06:00

room.js

Merge remote-tracking branch 'origin/master' into state_manager_2

2013-07-24 21:01:59 -06:00

setpieces.js

Merge remote-tracking branch 'origin/master' into state_manager_2

2013-07-24 21:01:59 -06:00