Scott Erickson 3dc3f62473 Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee		2014-04-25 14:31:58 -07:00
..
modal	Fixed #913, I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
tome	Fixed #913, I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
control_bar_view.coffee	Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11.	2014-03-28 12:22:53 -07:00
dialogue_animator.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00
goals_view.coffee	Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.	2014-03-13 09:02:19 -07:00
gold_view.coffee	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
hud_view.coffee	Fixed #46.	2014-03-28 15:23:12 -07:00
level_chat_view.coffee	Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.	2014-03-24 14:42:56 -07:00
level_loading_view.coffee	Merge branch 'master' into feature/loading-views	2014-04-19 01:15:04 -04:00
playback_view.coffee	Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.	2014-04-22 11:11:08 -07:00
thang_avatar_view.coffee	More memory fixes.	2014-02-11 14:58:45 -08:00