33 commits

Author	SHA1	Message	Date
Scott Erickson	dbbf9ce8b3	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master ... Conflicts: app/styles/editor/level/thangs_tab.sass app/templates/editor/level/thangs_tab.jade app/views/editor/level/thangs_tab_view.coffee	2014-03-20 11:22:23 -07:00
Jayant Jain	80f53d2c6b	Adds search bar for adding thangs in level editor	2014-03-19 00:41:03 +05:30
kvasnyk	5216432bf9	Fix for #272 bug.	2014-03-18 05:47:53 +01:00
Scott Erickson	f3489a6c2f	Added a 'stop' button for viewing end animations on thang types.	2014-02-12 16:18:25 -08:00
Scott Erickson	6728712064	Fixed the thang components edit view in both locations now.	2014-02-05 15:39:08 -08:00
Scott Erickson	88beb4db5f	Fixed the positioning of the thang components view in the thang editor.	2014-02-05 14:39:56 -08:00
Scott Erickson	371bd9f41c	Tweaked tab styling on level editor.	2014-01-30 15:22:01 -08:00
Scott Erickson	5f81eb670b	Some styling fixes, removed commented out stuff.	2014-01-30 14:37:33 -08:00
Scott Erickson	231e8582fa	Added some basic control tips to the thang components edit view.	2014-01-30 12:07:01 -08:00
Scott Erickson	56576dd1a5	Fixed the styling for editing components in the level editor.	2014-01-30 12:01:43 -08:00
Scott Erickson	65f74e9587	Improved the navbars in the level editor.	2014-01-30 11:37:40 -08:00
Nick Winter	e0108a3166	A few fixes for the Bootstrap 3 migration. Fixed #280.	2014-01-29 12:18:37 -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	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	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -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	01a43bb3d7	Added filters to the extant thangs column.	2014-01-21 10:42:09 -08:00
Scott Erickson	e61d31f48c	Level editor displays thangs in a more orderly fashion.	2014-01-20 23:02:23 -08:00
Scott Erickson	2cf19a4781	Renamed canvases to spritesheets in the edit thang view.	2014-01-20 22:37:47 -08:00
GlenDC	556149f756	Resolved issue #162	2014-01-16 00:08:35 +01:00
Nick Winter	4a702176a6	Updated i18n, added /employers.	2014-01-13 22:29:58 -08:00
Scott Erickson	be80858648	Added wizard color setting.	2014-01-12 11:54:50 -08:00
Scott Erickson	1a3c6498e8	Built the thang editor colors tab.	2014-01-10 16:48:28 -08:00
Scott Erickson	f0147e8f7c	More tweaks to the thang editor.	2014-01-06 19:33:36 -08:00
Scott Erickson	ddbf45b50c	Made the thang editor a little more organized.	2014-01-06 19:09:43 -08:00
Scott Erickson	94cb6ea4e1	Fixed up the search optimization and installed thang portraits into the level editor.	2014-01-06 17:11:57 -08:00
Scott Erickson	f656a4f4cf	Set up portrait uploading for thangs.	2014-01-06 12:37:35 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00