Michael Schmatz 7110f023f2 Merge branch 'feature/hover-debugger-performance' ... Conflicts: app/lib/God.coffee app/views/play/level/tome/spell_debug_view.coffee		2014-05-07 11:37:03 -07:00
..
ladder	Some fixes for my accidental merge of #970.	2014-05-06 09:49:04 -07:00
level	Merge branch 'feature/hover-debugger-performance'	2014-05-07 11:37:03 -07:00
ladder_view.coffee	Migrated and fixed the rest of the views using the new loading system.	2014-04-28 11:52:04 -07:00
level_view.coffee	+ Merged Simulators	2014-05-06 05:07:34 +02:00
spectate_view.coffee	Stop bobbing and more marks when world ended.	2014-05-06 11:02:53 -07:00