codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-11 00:02:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
8914 commits 27 branches 0 tags 134 MiB
Commit graph

2789 commits

Author SHA1 Message Date
Scott Erickson
210235553e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-30 12:19:44 -08:00
Scott Erickson
5429e8ad2a Cleaning up editors in the systems and components tabs. 2014-01-30 12:19:25 -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
827b5a3756 Fixed the world select modal. 2014-01-30 11:55:46 -08:00
Scott Erickson
ed1b5c6560 Fixed slowness to editing settings for large levels. 2014-01-30 11:40:24 -08:00
Scott Erickson
65f74e9587 Improved the navbars in the level editor. 2014-01-30 11:37:40 -08:00
Nick Winter
067d3abd75 Improved handling of spawning Programmables in Tome after the fact. 2014-01-29 16:26:08 -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
f065406cf5 Merge branch 'feature/bootstrap3' 2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d Fixed naming. 
Improved tome updating of programmable spell thangs.
 2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b Improvements to SpellDebugView hover. 2014-01-29 08:38:37 -08:00
Nick Winter
c3f5c1c334 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -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
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
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -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
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -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
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
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
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
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
Nick Winter
af6abda7cd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 10:56:54 -08:00
Nick Winter
3b7a908dcd Handled a couple errors. 2014-01-22 10:56:49 -08:00
Scott Erickson
00a7de12c9 Fixed a selection bug. 2014-01-21 10:54:59 -08:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
GlenDC
b2ddde96cd Merge https://github.com/codecombat/codecombat 2014-01-21 18:05:14 +01: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
GlenDC
c12e232ec1 Merge https://github.com/codecombat/codecombat 2014-01-21 18:01:58 +01:00
Scott Erickson
68567c1366 Fixed level editor preview. 2014-01-20 23:14:34 -08:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
4b1b72627c Reenabled projecting on the search views. 2014-01-20 22:38:36 -08:00
Scott Erickson
2cf19a4781 Renamed canvases to spritesheets in the edit thang view. 2014-01-20 22:37:47 -08:00
Scott Erickson
514adb2159 Improved the speed of placing down thangs in levels with lots of extant thangs. 2014-01-20 21:19:54 -08:00
Scott Erickson
222fa6100b Set up the level editor to lazily load thang types. 2014-01-20 17:20:04 -08:00
GlenDC
262a523458 Merge branch 'FixThangScroll' of https://github.com/phansch/codecombat 2014-01-20 23:50:19 +01:00
Scott Erickson
7f4f268ff8 Improved the refresh rate for the color tab, and made it work with containers. 2014-01-20 12:57:29 -08:00
Philipp Hansch
2c6c60307b Disable body scrolling in Thang List 
This overwrites the native scrolling behavior for the
thangs-list div by manually setting the value of
@scrollTop
 2014-01-20 12:15:20 +01:00
Nick Winter
f87c3a37e8 More progress on debugger. 2014-01-19 09:14:42 -08:00
GlenDC
6c46dc3fda Tracked down common used i18n tags and applied it already on the nl.coffee file 2014-01-19 17:00:41 +01:00
Nick Winter
0a8d64046a Starting work on time-travel debugging interface. 2014-01-19 07:08:28 -08:00
GlenDC
abbd576b4d Added the else statement. This can be used to make pull request #253 more advanced. 2014-01-19 14:08:32 +01:00
dristic
7f39693d70 Save latest level played to local storage. Change play link when latest level is available on home page. 2014-01-18 23:15:59 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Nick Winter
053927eaec Fixed home page wizard scale. 2014-01-16 16:27:34 -08:00
Nick Winter
5267febd8f Couple fixes for small errors when running with no Programmables. 2014-01-16 14:29:57 -08:00
GlenDC
553ad833ed Merge https://github.com/codecombat/codecombat 2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2 Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable. 2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60 Hotfix for previous commit, forgot to uncommit some stuff 2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f Resolved issue #160 2014-01-16 22:18:38 +01:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -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
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading 
Also using the level:session-will-save callback
 2014-01-16 17:13:14 +01:00
Scott Erickson
f230e8983c Fixed the level preview view. 2014-01-15 18:37:47 -08:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master 
Issue #30 is resolved + Added Dutch Translations + Hotfixes
 2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
Nick Winter
172d97ed83 Fixed #87 I hope; at least, dramatically reduced memory leakage. 2014-01-15 13:04:48 -08: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
GlenDC
d5907059ed Resolved issue #30 2014-01-15 01:58:37 +01:00
GlenDC
92416dc4f2 Created view versions for components, systems and thangs (fix #30) 2014-01-15 01:33:24 +01:00
GlenDC
4633ced78d Created superclass & common templates for article & level (fix for #30) 2014-01-15 01:12:21 +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
Scott Erickson
f4a2209d6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-14 12:53:18 -08:00
Scott Erickson
83e7a98869 Fixed the versions pages. 2014-01-14 12:53:06 -08:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Nick Winter
d6f2f41cf8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:24:24 -08:00
Scott Erickson
c4028a8036 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:06:48 -08:00
Nick Winter
1572228aa5 Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master 2014-01-12 12:01:56 -08:00
Nick Winter
8ab997680e Turned off A/B test for Break the Prison. 2014-01-12 12:00:38 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
GlenDC
683b72f67a First big fix for issue #23. The issue is as good as fixed besides some details I think. 2014-01-11 17:25:04 +01:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
1f9c531938 Got rid of a bunch of logs. 2014-01-10 16:57:38 -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
a6f1ce53ba Merged #152, and slightly improved update interval handling. 2014-01-10 16:36:36 -08:00
dristic
21915f358c Add clear timers to not have timer running in the background on home page. 2014-01-10 16:18:39 -08:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
69df0079af Fixed bug returning to normal selection from talking portrait in HUD. 2014-01-09 18:30:18 -08:00
Scott Erickson
2d5ca50e89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 14:04:53 -08:00
Scott Erickson
3c3e38b585 Set up thang avatar views with the new db portraits. 2014-01-09 14:04:46 -08:00
Nick Winter
98245d0fb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-09 11:28:14 -08:00
Nick Winter
3a954ff91c A bit more CoffeeScript-y. 2014-01-09 11:28:08 -08:00
Scott Erickson
4e34b38c83 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/level/hud_view.coffee
 2014-01-09 11:05:51 -08:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Nick Winter
e2414f7c5a Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded. 2014-01-09 10:49:34 -08:00
Ronald Cheng
278b4d8754 If you have pressed esc, do not get prompted about it 2014-01-08 23:09:58 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Nick Winter
03a5614a18 Fixed #96. 2014-01-08 19:18:23 -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
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
Scott Erickson
250b7322a9 Fixed #56 2014-01-06 21:25:18 -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
59ec63c041 Fixed #60. 2014-01-06 18:12:57 -08:00
Scott Erickson
aeaeb84fe5 Fixed general articles showing up in the guides. 2014-01-06 18:03:17 -08:00
Scott Erickson
a9c70f9a7d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 17:15:24 -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
1297126abd Added back lang val instead of attr setting. 2014-01-06 16:58:50 -08:00
Scott Erickson
fe984d7c73 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 15:36:50 -08:00
Scott Erickson
27e7b6c240 Tweaks for thang portraits. 2014-01-06 15:36:35 -08:00
Nick Winter
8b4ec9b263 Merged and cleaned up #79. 2014-01-06 15:18:40 -08:00
Nick Winter
f53f20a6ad Fixed #86. 2014-01-06 14:53:21 -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
Nick Winter
316b382d81 Fix for announcement duplicates. 2014-01-06 10:33:52 -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
Nick Winter
1185731fd0 Fixed two bugs with the CLA. 2014-01-05 15:07:30 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7 Allowed access to character class emails by prompting for signup on check. 2014-01-05 14:20:48 -08:00
Nick Winter
1d223f790b Trying to force soft tabs and Unix newlines. 2014-01-04 16:41:25 -08:00
Nick Winter
01cfcbedc7 Updated some $attr, $val, and $prop calls. 2014-01-04 15:49:13 -08:00
Scott Erickson
c4bfcd5c2d Refactored portraits to be built in sprite sheets separately. 2014-01-04 08:55:12 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00