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

388 commits

Author SHA1 Message Date
tmrdja
826a5f56db Added responsive view for LevelEditor 2014-04-21 21:15:22 +02:00
George Saines
71ee31ef49 styling the community page 2014-04-18 13:02:07 -07:00
Nick Winter
a88089b7fc Sass don't like that. 2014-04-18 09:54:27 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Scott Erickson
7ccaa8c843 Fixed a bug, colored a badge. 2014-04-17 14:39:52 -07:00
Scott Erickson
cdaf2ebfaf Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
Scott Erickson
781a8ec913 Fixed the play and save buttons. 2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
Scott Erickson
6057bd94b9 Refactored how the editor sets up its special nav through base.jade. 2014-04-17 11:27:20 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Nick Winter
03df078d5a Couple job profile fixes. 2014-04-15 08:39:18 -07:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00
Nick Winter
7b14215339 Fixed footer background color on LevelView. 2014-04-13 16:06:47 -07:00
dpen2000
ec3c292b72 Implement simulators leaderboard 2014-04-13 02:35:58 +01:00
Nick Winter
08616def10 Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available. 2014-04-12 14:53:09 -07:00
Nick Winter
059b5e9b66 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 23:08:26 -07:00
Nick Winter
a4284e6209 Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization. 2014-04-11 23:07:48 -07:00
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
308adec7c7 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:00 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Nick Winter
97d4017869 Hacky way to get play background to fit with new loading image. 2014-04-11 16:15:26 -07:00
Scott Erickson
177dd2c8cd Set up Bootstrap 3 glyphicons. 2014-04-11 15:37:04 -07:00
Scott Erickson
bbb9fb7a64 Added a patches view. 2014-04-11 14:19:17 -07:00
Nick Winter
b330e783bf Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons 2014-04-11 13:28:11 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -07:00
Scott Erickson
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128 Added some autocompleters for job profile Treema. Projects are now entirely links. 2014-04-10 11:58:51 -07:00
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Scott Erickson
5629284c76 Added text diff library to delta view. 2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e Fixing some recruitment profile bugs. 2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10 Implemented George's jobs page design. 2014-04-09 13:14:52 -07:00
Aditya Raisinghani
495d1be620 Added social buttons to Sign up modal 2014-04-10 01:01:30 +05:30
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
Nick Winter
b96bca8c18 Finished most of basic features for job profiles. 2014-04-07 17:58:02 -07:00
Nick Winter
9af6694054 More work on the job profiles. 2014-04-07 15:21:05 -07:00
Aditya Raisinghani
7cc9d22254 Moved nanoscroller to bower components and related fixes. 2014-04-08 03:04:36 +05:30
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07:00
Aditya Raisinghani
634ed82938 Fixed the background for spectate view 2014-04-07 01:00:35 +05:30
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Michael Schmatz
2411269f2b Added rank/number of sessions text 2014-04-04 14:55:55 -07:00
Michael Schmatz
0684bcff9c Improved styling on graphs 2014-04-04 14:22:30 -07:00
Michael Schmatz
06f164525f Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
 2014-04-04 13:48:39 -07:00
Michael Schmatz
7019bb6dea Added score histogram to ladder tab 2014-04-04 13:38:36 -07:00
Scott Erickson
978c84bc89 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0 Set up a new loading/progress system for views. 2014-04-03 18:43:29 -07:00
Michael Schmatz
9bb109dd7d First iteration of mobile styling! 2014-04-03 15:10:24 -07:00
Aditya Raisinghani
1c3117836f Shifted nanoscroller to vendor. 2014-04-04 00:13:09 +05:30
Michael Schmatz
75b278b333 Fixed table overflow, added wrapper for histogram 2014-04-03 09:57:35 -07:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
Nick Winter
8c013c1192 Fixed 101: added level completion status to /play. 2014-03-31 15:48:22 -07:00
Nick Winter
cb27124285 Fixed #135. 2014-03-30 17:24:07 -07:00
Nick Winter
b0b37aa9d8 Made play/pause and scrubber look even more disabled when disabled. 2014-03-27 15:07:37 -07:00
Nick Winter
c076bb1da8 Tweaking some styles; perhaps fixed #6. 2014-03-27 13:15:22 -07:00
Aditya Raisinghani
deb3ddeece Longer modals are now scrollable. 2014-03-27 12:31:29 +05:30
Scott Erickson
781b33092c Added a google plus connect button. 2014-03-26 14:19:05 -07:00
Aditya Raisinghani
6208e8e324 Additional fixes for double scrollbars of modals. 2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9 Fixed issue with two scroll bars appearing. 2014-03-25 16:36:24 +05:30
Scott Erickson
bf039ed485 Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema) 
Select dependents when a extant component is selected.
 2014-03-24 09:31:27 -07:00
Nick Winter
dbeb3d445b Give focus back to spell view on palette click. 2014-03-23 16:48:30 -07:00
Nick Winter
5e311cdefa Fixed css for IE warnings. 2014-03-22 10:54:35 -07:00
Scott Erickson
6445924598 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
	app/views/play/ladder/ladder_tab.coffee
 2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce Added facebook friends to the ladder page. 2014-03-21 19:50:54 -07:00
Ting-Kuan
0db309f526 Select dependents when a extant component is selected. 2014-03-21 12:19:47 -04:00
Nick Winter
a3dadd6a40 Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks 2014-03-21 07:25:33 -07:00
Mikhail Koltsov
096c59b6cf fix some assymetry 2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e Thang editor: components tab finally looks good and does not overlay other tabs 2014-03-21 15:40:32 +04:00
Scott Erickson
22555790b5 Set up a trimmed down leaderboard showing just top players and your rank. 2014-03-20 14:40:17 -07:00
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
Mikhail Koltsov
a6523719e4 Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks 
Conflicts:
	app/locale/ru.coffee
 2014-03-20 09:07:11 +04:00
Nick Winter
b7e8f2ecb5 Merge pull request #605 from kvasnyk/master 
Fix for #272 bug.
 2014-03-19 18:31:20 -07:00
Mikhail Koltsov
c9a08a0b25 thang editor: added i18n binding to 'Save' button 2014-03-19 01:43:27 +04:00
Mikhail Koltsov
62a1701063 even better positioning 2014-03-19 01:26:41 +04:00
Mikhail Koltsov
1cc3e79db9 fixed thang editor appearance: components view was overlapping with tabs. 
Now looks neat, but still unclickable.
 2014-03-19 01:21:11 +04: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
Nick Winter
287bf0398e Embedded new video in multiplayer launch modal. 2014-03-17 03:18:13 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f More tweaks to the video. 2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0 Added a border to the home view video. 2014-03-16 22:46:57 -07:00
Nick Winter
ffb9ec2908 Merged. 2014-03-16 20:36:18 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Scott Erickson
5cb42fa92c Tweaked the video on the home page. 2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22 Removed the new button from the home view. 2014-03-16 17:48:16 -07:00
Scott Erickson
eee8fbba2c New level page with new artwork. 2014-03-16 16:59:48 -07:00
Nick Winter
2e2c9459d8 Even better-looking loading background. 2014-03-15 16:06:35 -07:00
George Saines
417ff1e48d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-15 15:12:09 -07:00
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
George Saines
c00c7ed56b adding the new website background images 2014-03-14 15:24:36 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -07:00
Dominik Kundel
0392f630cc including i18n support for new editor config and minor styling changes 2014-03-14 03:26:53 +01:00
Nick Winter
42a8862fa9 Merge pull request #541 from dkundel/master 
Easy use of coordinates as discussed in #10 and minor fixes
 2014-03-13 18:05:04 -07:00
Nick Winter
8554de7c4b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5 Fixed several bugs with Thang selection and the SpellView and HUD. 2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2 Merge branch 'master' of github.com:codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c Various changes to spectate view 2014-03-13 15:22:35 -07:00
Jayant Jain
3c1ebc25ca Sass changes for footer and search in editor 2014-03-13 13:30:30 +05:30
Dominik Kundel
c01d29907d try to achieve higher contrast between background and 'executing' line 2014-03-13 03:08:28 +01:00
Dominik Kundel
60214abb41 Change cursor if moving on map with pressed 'shift' 2014-03-13 02:50:09 +01:00
Michael Schmatz
aea9e9d1a6 Spectate view is nearing completion 2014-03-12 17:51:13 -07:00
Michael Schmatz
a6fb2a3994 Various changes to spectate view 2014-03-12 07:32:30 -07:00
Dominik Kundel
dd87215012 Avoid overwriting gutter symbols of error, warning, info 2014-03-12 11:26:56 +01:00
Nick Winter
392534878a Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase. 2014-03-11 16:31:39 -07:00
Michael Schmatz
4062bba245 Created initial spectate level view 2014-03-11 13:12:45 -07:00
Nick Winter
6a71e97204 Improvements to HUD actions. 2014-03-10 09:37:05 -07:00
Nick Winter
b6ae73ef29 Merge pull request #492 from Shrihari/issue464 
Fixed Spell Debug View width bug
 2014-03-07 16:14:57 -08:00
Scott Erickson
be03485538 Set up the ladder play modal to be more forthright getting new players to play the tutorial. 2014-03-07 12:58:17 -08:00
Shrihari
5274f22467 Fixed Spell Debug View width bug 2014-03-08 01:10:12 +05:30
Nick Winter
2d69abf674 Merge pull request #481 from dkundel/master 
Proposed UX improvement for #6
 2014-03-05 13:45:14 -08:00
Dominik Kundel
b0d571c7ad highlight only the executing statement 2014-03-05 22:17:34 +01:00
Scott Erickson
0a8d5b5b97 Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master 2014-03-05 10:35:06 -08:00
Shrihari
f6324807b3 Moved "Skip (esc)" next to Continue button 2014-03-05 23:36:18 +05:30
Dominik Kundel
d16d024782 further changes in design of highlighting lines in code 2014-03-05 17:06:46 +01:00
Dominik Kundel
a0e39480e3 new UI design for executing and executed lines in ACE editor 2014-03-05 02:00:38 +01:00
Nick Winter
4556536df4 Hooked up new HUD icons. 2014-03-04 11:15:31 -08:00
Scott Erickson
619b628661 Reworked the victory modal styling a bit. 2014-03-03 16:39:56 -08:00
Scott Erickson
fb75ad36e7 Added team icons to the ladder play view. 2014-03-03 12:04:31 -08:00
Scott Erickson
65d39e658d Removed the old team view cruft. 2014-03-03 11:15:46 -08:00
Scott Erickson
5bb56ac818 Merge branch 'feature/new-ladder-view' 2014-03-03 09:05:52 -08:00
Scott Erickson
22e80f6d24 Set up a play modal, starting to refactor wizard thang type loading to be shared across the site. 2014-03-03 09:03:44 -08:00
Karthig
b04d63d5bf - create sass file to center 404 image on page 2014-03-03 11:42:07 -05:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Scott Erickson
d0f416f668 Rearranging the ladder view. 2014-03-02 12:43:21 -08:00
Nick Winter
2f130da090 HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing. 2014-03-01 11:06:44 -08:00
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
Scott Erickson
02cb9155c0 Improved a bunch of things with the wizard settings view. 2014-02-27 12:25:59 -08:00
Scott Erickson
ea73d91a6b Made the docs modal larger. 2014-02-26 15:44:46 -08:00
Scott Erickson
f89768d76d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 17:15:01 -08:00
Scott Erickson
02d1dc2445 Added a screen for when playback ends. 2014-02-25 17:14:39 -08:00
Tay Yang Shun
8a24407d3e Redirect to play page for non-existent levels. Fixes issue #396 2014-02-26 04:59:35 +08:00
Scott Erickson
79ce16dbba Hiding most of the ladder page if not logged in. 2014-02-24 14:57:51 -08:00
Scott Erickson
e48bdfa1a7 Added your score to the ladder/team view. 2014-02-24 13:03:04 -08:00
Scott Erickson
953c9064f5 Fixed #407. 2014-02-24 11:20:35 -08:00
Nick Winter
97ebe6dec8 Lightened problem info background highlight color for legibility. 2014-02-24 10:36:00 -08:00
Scott Erickson
d146febb32 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556 Finished up work on the wizard settings modal. 2014-02-24 09:46:40 -08:00