Commit graph

395 commits

Author SHA1 Message Date
Nick Winter
c19c8f3912 Fix for LevelLoader, selection udpating, and non-documentation tome popovers. 2014-02-16 18:29:24 -08:00
Nick Winter
e3824d7698 Many improvements to the spell palette. 2014-02-16 15:30:00 -08:00
Scott Erickson
9bea226677 Fixed the ladder table. 2014-02-13 15:57:07 -08:00
Nick Winter
aa282c3a35 Updates for formatting palette docs. 2014-02-13 11:18:20 -08:00
Scott Erickson
850942b895 Fixed the chat layout. 2014-02-13 10:10:20 -08:00
Nick Winter
9ac0939bb8 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
Scott Erickson
f3489a6c2f Added a 'stop' button for viewing end animations on thang types. 2014-02-12 16:18:25 -08:00
Nick Winter
d2a7bfd11c Added GoldView. 2014-02-11 12:02:27 -08:00
Nick Winter
22433b14ae Tweaked about avatar formatting. 2014-02-08 10:30:28 -08:00
Nick Winter
2e7a1fd0ef Working on the contribute pages -- #314. 2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e Starting to add contributor avatars. 2014-02-07 18:38:17 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -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
25e2895b64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3 Improvements to how Tome subviews manage Thang updates. 2014-02-05 15:16:59 -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
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Nick Winter
068f798d58 Fixed bugs in Tome spell views swapping. 2014-02-02 10:26:42 -08:00
Nick Winter
f8f3bdd1e3 Improved error alert space usage. 2014-02-01 13:56:55 -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
Nick Winter
bd45930071 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 14:22:06 -08:00
Nick Winter
7dcbbb983f Added missing mixins and indoor wall handling. 2014-01-30 14:21:58 -08:00
Scott Erickson
210235553e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:19:44 -08:00
Scott Erickson
231e8582fa Added some basic control tips to the thang components edit view. 2014-01-30 12:07:01 -08:00
Nick Winter
b09d1b1c74 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:03:35 -08:00
Nick Winter
a6bfb6770c Matched gradient background colors in HUD to ThangAvatarView. 2014-01-30 12:03:33 -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
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
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
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
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Nick Winter
d262dfaca7 A few visual tweaks to the spell view flow. 2014-01-24 17:48:11 -08:00
Nick Winter
6fa38bd889 Several improvements to hover debugging. 2014-01-24 13:03:04 -08: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
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
Nick Winter
24c4051442 Merge branch 'feature/time-travel-debugger' 2014-01-21 09:04:09 -08:00
Nick Winter
6ea4f645f8 Added spell toolbar view. Made many time-travel debugger improvements. 2014-01-21 09:03:04 -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
Nick Winter
f87c3a37e8 More progress on debugger. 2014-01-19 09:14:42 -08:00
Nick Winter
0a8d64046a Starting work on time-travel debugging interface. 2014-01-19 07:08:28 -08:00
GlenDC
882302d66e Resolved issue #149 2014-01-19 15:59:33 +01:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors'
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
GlenDC
556149f756 Resolved issue #162 2014-01-16 00:08:35 +01:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
2014-01-15 20:58:39 +01:00
Scott Erickson
bf4011044f Initially working on using team colors, but it's not working yet. 2014-01-14 13:16:30 -08:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Nick Winter
1041ce4b17 Added GitHub stars button. 2014-01-13 18:19:28 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Nick Winter
027cddd151 Increased matching bracket highlighting visibility. 2014-01-09 18:02:16 -08:00
Michael Schmatz
faac70bee9 Merge pull request #125 from p-buse/master
Fix "Contact" link in footer not properly changing cursor to pointer
2014-01-09 14:18:15 -08:00
Paul Buser
7af5804e29 Fix "Contact" link in footer not properly changing cursor to pointer 2014-01-09 15:31:56 -05:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Ronald Cheng
81eed31714 Create notification that esc can skip dialogs
If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.
2014-01-08 14:23:36 -08:00
Gabriel Cebrian
74bcc4ec1b Increase element padding to avoid cutting words off 2014-01-07 14:05:39 -05:00
Gabriel Cebrian
ad12680ce9 Make language options menu right aligned instead of left aligned
Remove horizontal scrollbar that is shown when vertical scrollbar is shown
Changed top property to improve look
2014-01-07 13:27:46 -05:00
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -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
Nick Winter
8b4ec9b263 Merged and cleaned up #79. 2014-01-06 15:18:40 -08:00
Tom Steinbrecher
60c4b360d5 Added ContribueClassView, which all contribute pages are now based off of.
Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages.

Fixed other small bugs.
2014-01-06 17:30:35 -05:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
Tom Steinbrecher
75894d1160 Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before 2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14 2014-01-06 00:41:31 -05:00
Chloe Fan
5a9b55342e Aligning intro to rest of the page 2014-01-05 15:55:36 -08:00
Chloe Fan
b7ecab102e Issue 13. Pushed header and image down to compensate for fixed top bar 2014-01-05 15:51:46 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00