Commit graph

368 commits

Author SHA1 Message Date
Scott Erickson
bac4fbcd7d Fixed naming.
Improved tome updating of programmable spell thangs.
2014-01-29 10:14:12 -08:00
Scott Erickson
065a1c4c27 New editor layout. 2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768 Merge branch 'master' into feature/bootstrap3
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299 Merge branch 'master' into feature/bootstrap3
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
2014-01-28 12:46:17 -08:00
Scott Erickson
55ea4d86e4 Made the level editor layout more stretchy. 2014-01-28 12:27:11 -08:00
Scott Erickson
00872f80f9 Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang. 2014-01-28 11:54:16 -08:00
Scott Erickson
e2db421d1c Fixed cloning. 2014-01-28 09:22:23 -08:00
Scott Erickson
9336a637ce Merge branch 'master' into feature/bootstrap3 2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188 Systems part of #266. 2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1 Component part of #266. 2014-01-27 21:06:27 -08:00
Scott Erickson
0b7224e2f4 Tweaked the home page button. #279 2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
43193aab4a Removed a buggy transition. 2014-01-27 18:58:27 -08:00
Scott Erickson
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -08:00
Scott Erickson
a239ba3465 Removed some more .controls from forms. 2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Scott Erickson
096d318e96 Fixed #283 2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5 Fixed #278 2014-01-27 16:59:34 -08:00
Scott Erickson
9c7ac3dfdc Fixed the top nav height. 2014-01-27 16:20:13 -08:00
Scott Erickson
22e6942165 Fixed account settings page. 2014-01-27 16:07:17 -08:00
Scott Erickson
056b81115d Fixed profile page. 2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
fa3ab69dab Level preview now loads from backups so that brunch reloads don't cause the preview to break. 2014-01-27 11:00:36 -08:00
Scott Erickson
36a46a07f2 Updated the names file. 2014-01-27 10:50:58 -08:00
Scott Erickson
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -08:00
Scott Erickson
8768d710ba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-27 10:06:45 -08:00
Scott Erickson
f1518a28e2 Fixed the camera when locked to never go to a new target. 2014-01-27 10:06:34 -08:00
Michael Schmatz
bf6e91883e Fixed es-ES.coffee compilation errror 2014-01-27 09:00:03 -08:00
Michael Schmatz
668ba81e78 Merge pull request #285 from DanielRodriguezRivero/patch-2
Update es-ES.coffee
2014-01-27 08:59:28 -08:00
Michael Schmatz
298057ae58 Merge pull request #288 from atlantisguru/patch-1
Updated hu.coffee
2014-01-27 08:30:22 -08:00
Scott Erickson
692b24dde0 #267 2014-01-26 15:59:33 -08:00
Scott Erickson
26e9dc3b09 Fixed system order in the level view. 2014-01-26 15:37:32 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Scott Erickson
ae2bb625c8 Refactored storage module. 2014-01-26 14:44:08 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Bubori Attila
e8c42b8d2b Updated hu.coffe
Editor section translated to hungarian.
2014-01-25 23:27:44 +01:00
Nick Winter
d262dfaca7 A few visual tweaks to the spell view flow. 2014-01-24 17:48:11 -08:00
Nick Winter
45329df4cd Temp fix for debugger bug on a relevant session. 2014-01-24 13:46:51 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08:00
Nick Winter
9b9df12ea0 Huge Aether performance fix; spells now scroll while debugging. 2014-01-24 08:01:00 -08:00
DanielRodriguezRivero
2acd67f658 Update es-ES.coffee 2014-01-24 13:15:17 +01:00
Scott Erickson
0727e11669 Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3
Conflicts:
	app/templates/play/level/playback.jade
2014-01-23 20:15:36 -08:00
Scott Erickson
9740fe0700 Reworked how sprites flip when rotated. 2014-01-23 20:08:35 -08:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
70d301d1b6 How did this bug not break everything always? 2014-01-23 18:14:25 -08:00
Scott Erickson
0a34bfc7a8 Fixed a couple things with the component versions view. 2014-01-22 18:54:20 -08:00
Scott Erickson
dcaa24ffa9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 17:38:31 -08:00
Scott Erickson
4ff2abc4b0 Refactored a collection into its own file. 2014-01-22 17:38:22 -08:00