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

1095 commits

Author SHA1 Message Date
George Saines
3ea4439fc1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-04 10:24:23 -08:00
Nick Winter
2f653c966e Simulator now swaps in empty methods when code doesn't compile. 2014-03-04 08:30:50 -08:00
Ruben Vereecken
d43ff5d217 Added an anonymous check on the Fork button 2014-03-04 11:24:38 +01:00
George Saines
33e2571934 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 18:04:01 -08:00
George Saines
113c71e141 adding new hud icons 2014-03-03 18:03:54 -08:00
Scott Erickson
1f091b93b8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 17:15:54 -08:00
Scott Erickson
246bbefc91 Made the file uploading just overwrite files with the same name. 2014-03-03 17:14:13 -08:00
Nick Winter
65d9186ef1 Fixed actions showing up under dialogue bubbles on repeated toggling. 2014-03-03 16:55:36 -08:00
Scott Erickson
1b257252f9 Merge branch 'production' 2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47 HUD properties now flow into columns more evenly, have max styling. 2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661 Reworked the victory modal styling a bit. 2014-03-03 16:39:56 -08:00
Nick Winter
873c560a06 Added Alexandru's Bubble Sort Bootcamp Battle to /play. 2014-03-03 16:22:50 -08:00
Nick Winter
c944e78271 Ladder views now show level descvription content if present. 2014-03-03 14:59:39 -08:00
Scott Erickson
e231952fcf Added the jquery minicolors image. 2014-03-03 14:17:36 -08:00
Ruben Vereecken
b7fbf67e89 Enabled Fork button again. Previous commits solve issue #455 2014-03-03 22:52:37 +01:00
Ruben Vereecken
0aa8e7bb7d Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet 2014-03-03 22:21:56 +01:00
Scott Erickson
d66a9d6be0 Set up a generic choose tab for root views so hash->tab behavior is baked in. 2014-03-03 13:21:05 -08:00
Nick Winter
461d66c795 Typo in my matches team ranking. 2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b Multiplied visible scores by 100 for more awesome. 2014-03-03 12:27:32 -08:00
Ruben Vereecken
05b4f536c1 Fixed a link to point correctly 2014-03-03 21:22:04 +01:00
Nick Winter
0c45b6c0e3 Fixes for ladder refreshing. 2014-03-03 12:21:59 -08:00
Ruben Vereecken
ee920afea9 Disabled buttons for non-owners in Article Editor 2014-03-03 21:13:02 +01:00
Michael Schmatz
a5864c4f0c Live leaderboard updating 2014-03-03 12:10:27 -08:00
Scott Erickson
1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
 2014-03-03 12:08:11 -08:00
Scott Erickson
fb75ad36e7 Added team icons to the ladder play view. 2014-03-03 12:04:31 -08:00
Ruben Vereecken
942b69ea9f Created hasWriteAccess on Cocomodel, used it for level access 2014-03-03 20:41:35 +01:00
Scott Erickson
65d39e658d Removed the old team view cruft. 2014-03-03 11:15:46 -08:00
Scott Erickson
ff3f3e5a07 Removed a link to the old team view. 2014-03-03 11:11:27 -08:00
Scott Erickson
c5521a1311 Level now uses the universal wizard thang type. 2014-03-03 11:04:03 -08:00
Scott Erickson
0d054bec8e Refactored the universal wizard loading to happen silently when you import ThangType. 2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98 Made the wizard icons colored based on user settings. 2014-03-03 10:21:51 -08:00
Scott Erickson
d3b6836a06 Fixed some bugs with the new ladder view when you haven't played before. 2014-03-03 09:20:14 -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
Karthig
357ef45cb0 - insert random error image into 404 page 2014-03-03 10:58:33 -05:00
Nick Winter
20fb9ba5b4 Merge pull request #461 from rubenvereecken/master 
Localization centred patches and additions
 2014-03-03 07:37:46 -08:00
Nick Winter
980a3b6f21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 07:29:07 -08:00
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Nick Winter
a665aca039 Merge pull request #443 from M-r-A/master 
Finalized Russian translations
 2014-03-03 07:21:49 -08:00
Nick Winter
c858fb5e24 Merge pull request #440 from FinnDS/patch-1 
Update names.coffee
 2014-03-03 07:20:55 -08:00
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
George Saines
94b98a2d46 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 18:21:46 -08:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Nick Winter
ca274f9787 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 16:06:31 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686 Editor tables now load i18n correctly after search. 2014-03-03 00:31:49 +01:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +01:00
Ruben Vereecken
bea002a8d4 Fixed some wrong translations 2014-03-02 22:59:15 +01:00
Scott Erickson
956e2b3c40 Set up the my matches tab in the new ladder view. 2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668 Rearranging the ladder view. 2014-03-02 12:43:21 -08:00
Ruben Vereecken
e4bf752e20 Changed Dutch (NL) ambassador_summary to match the English version 2014-03-02 20:30:18 +01:00
Ruben Vereecken
60f79e261d Patched up tonnes of minor language mistakes (Dutch-Nederlands) 2014-03-02 20:24:14 +01:00
Ruben Vereecken
fb57e634a5 Patched up some grammar mistakes (Dutch-Nederlands). 2014-03-02 18:44:47 +01:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30
Nick Winter
6c48660922 No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit. 2014-03-01 16:57:29 -08:00
YF
2db9fa708b Update zh-HANS.coffee 2014-03-02 07:27:15 +08:00
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Muhammed Thanish
a092557973 Add camera zoomTo(pos) 2014-03-02 02:13:37 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -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
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Tay Yang Shun
47b37426d0 Added Level Editor page breadcrumbs. 2014-03-01 14:52:51 +08:00
Tay Yang Shun
f43dd2f3ff Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages. 2014-03-01 14:47:31 +08:00
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
George Saines
58f2aa6123 adding victory and 404 images 2014-02-28 18:58:40 -08:00
Nick Winter
71ebe7a0aa Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat. 2014-02-28 17:12:23 -08:00
Nick Winter
9a9bc20c68 Merge pull request #442 from Rahazan/patch-1 
Finalized Dutch translations
 2014-02-28 16:57:22 -08:00
Alexei Nikitin
d68ff5a899 Fix diplomat.jade building 2014-03-01 04:54:54 +04:00
Alexei Nikitin
789b49e15f Update diplomat.jade 2014-03-01 03:37:11 +04:00
Alexei Nikitin
9c107f24f8 Finishing ru.coffee 2014-03-01 03:31:36 +04:00
Rahazan
ef6acfe157 Fixed small typos. 2014-02-28 23:33:10 +01:00
Rahazan
22c7f9f690 Fixed line indentation, removed some double entries 2014-02-28 23:09:47 +01:00
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9 Renamed hardcoded project-dotas to brawlwoods. 2014-02-28 13:59:02 -08:00
Nick Winter
b5ff264ad0 Merge pull request #441 from yangshun/level-editor-freeze 
Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439.
 2014-02-28 12:48:56 -08:00
Nick Winter
52903cc0de Using String and Array docs when appropriate now. 2014-02-28 12:43:31 -08:00
Rahazan
d58909a39a Finalized Dutch translations 2014-02-28 21:22:10 +01:00
Nick Winter
6db8051122 Only show action timeline when 'action' is in the hudProperties. 2014-02-28 11:38:41 -08:00
Scott Erickson
2894d4f39c Set up session-repeating scripts. 2014-02-28 11:28:23 -08:00
Nick Winter
9b8eb6a296 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 11:27:36 -08:00
Nick Winter
3cee341887 Big performance improvements for scrubbing between frames; look out for bugs. 2014-02-28 11:27:32 -08:00
Scott Erickson
ef9c0a610f Fixed a bug with the casting screen. 2014-02-28 11:10:56 -08:00
Scott Erickson
d12b923eaf Made a casting progress bar on the canvas to test vs having it shown in the cast button. 2014-02-28 11:05:41 -08:00
Tay Yang Shun
8af62d53cd Redirect to level editor only after modal hidden event is triggered. Fixes #438. 2014-03-01 01:55:30 +08:00
Finn
5b5af5a55a Update names.coffee 
Added the name "Cid" under "Soldier M".
 2014-02-28 12:06:26 +01:00
Nick Winter
e20e9d68cf Construct sprite sheets as ThangTypes load. 2014-02-27 22:15:13 -08:00
Nick Winter
97197bd89d Got rid of potentially unnecessary (and definitely slow) SpriteSheetBuilder _.cloneDeep. Watch out. 2014-02-27 20:54:29 -08:00
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01:27 -08:00
Nick Winter
ad30130814 Merge pull request #437 from M-r-A/master 
Fix indents
 2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3 Update ambassador.jade 2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c Update archmage.jade 2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8 Update ambassador.jade 2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a Update adventurer.jade 2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7 Update artisan.jade 2014-02-27 16:54:22 -08:00
Nick Winter
e64796bba6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:53:05 -08:00
Nick Winter
01845a0175 Some translations weren't done yet. 2014-02-27 16:52:58 -08:00
Scott Erickson
04a0337b92 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:44:54 -08:00
Scott Erickson
df196cc531 Modals now stop the level from starting until they close. 2014-02-27 16:44:11 -08:00
Nick Winter
de4c9cb60d Merge pull request #436 from M-r-A/master 
Fix link in legal.jade
 2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc Fix link in legal.jade 2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0 Improved a bunch of things with the wizard settings view. 2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39 Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu 
Changed English(Au) in two wrong places to Luthanian and Norwegian

Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa

Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess

Update not_found.jade

A couple tweaks to gokul1794's commits.
 2014-02-27 12:07:57 -08:00
Scott Erickson
f991bc3a58 Removed some vestigial wizard coloring code from the settings account view. 2014-02-27 12:02:08 -08:00
Nick Winter
7453ada074 Uncommented some translations that were added. 2014-02-27 11:57:23 -08:00
Nick Winter
ffbef0de5b Merge pull request #428 from Darredevil/patch-1 
Added more names for #53
 2014-02-27 11:50:59 -08:00
Nick Winter
33ff7a48aa Merge pull request #426 from M-r-A/patch-1 
Update ru.coffee
 2014-02-27 11:08:39 -08:00
Nick Winter
190ab6e792 Merge pull request #417 from Vic020/patch-1 
Update zh-HANS.coffee
 2014-02-27 11:08:10 -08:00
Michael Schmatz
5d2c430779 Merge pull request #435 from yangshun/editor-modal-input-focus 
Auto-focus on the modal's input field for creation of new entities in editor.
 2014-02-27 09:21:09 -08:00
Tay Yang Shun
d2a6b3822e Re-added submit form event 2014-02-28 01:17:19 +08:00
Michael Schmatz
53a317df77 Merge pull request #434 from yangshun/play-button 
Deferred saving of latest level
 2014-02-27 09:07:27 -08:00
Michael Schmatz
9deadad99f Merge pull request #427 from yangshun/music-button 
Blur the music button after click so that subsequent space and enter keydown events do not trigger it.
 2014-02-27 09:06:18 -08:00
Tay Yang Shun
57f896b950 Added newline to end of file. 2014-02-27 15:38:03 +08:00
Tay Yang Shun
947b8766c2 Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379 2014-02-27 15:32:18 +08:00
Tay Yang Shun
04895a9204 Merge branch 'master' into play-button 2014-02-27 14:09:37 +08:00
Tay Yang Shun
514fe358c1 Trigger storage of latest level only after the level is guaranteed to be able to load 2014-02-27 14:08:25 +08:00
Scott Erickson
8d828939b6 Fixed a bug where the jingle wouldn't play during level loading if the audio had been loaded previously. 2014-02-26 20:23:13 -08:00
Scott Erickson
74186b7772 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 19:30:49 -08:00
Scott Erickson
ec7028af60 Fixed uploading images for articles. 2014-02-26 19:30:37 -08:00
Nick Winter
c26995a3a9 Home button on ladder level goes to ladder. 2014-02-26 18:58:25 -08:00
Scott Erickson
4e8c0b65e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 18:49:43 -08:00
Scott Erickson
7052b0600b Made mouse dragging not interrupt selecting units so much. 2014-02-26 18:42:39 -08:00
Nick Winter
48122000ed Gold shows up as an int in the HUD now. 2014-02-26 18:09:09 -08:00
Nick Winter
5c1c17c8dd Green Guide button for attention. 2014-02-26 17:52:08 -08:00
Nick Winter
081274579b Forget old goals. 2014-02-26 17:45:08 -08:00
Nick Winter
0cf20b577d Added a delay to the property documentation on spell debug hover. 2014-02-26 17:23:59 -08:00
Nick Winter
172242d226 Re-denormalize session if things have changed. Removed some logs. 2014-02-26 17:06:21 -08:00
M-r-A
1c675ea2e2 Update ru.coffee 2014-02-26 16:40:51 -08:00
Scott Erickson
0fd1c03b7f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-26 15:56:25 -08:00
Scott Erickson
c86feb13e8 Fixed the region and point choosers for the level editor. 2014-02-26 15:56:05 -08:00
Scott Erickson
ea73d91a6b Made the docs modal larger. 2014-02-26 15:44:46 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Darredevil
55ab142d75 Added more names for #53 2014-02-26 23:21:03 +02:00
Michael Schmatz
a052180250 Improved match scheduling 2014-02-26 12:14:02 -08:00
M-r-A
1a7e1f2384 Update ru.coffee 2014-02-26 10:56:40 -08:00
Tay Yang Shun
b48a9fabc6 Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306. 2014-02-27 02:42:25 +08:00
Michael Schmatz
bb76fb241c Fixed simulator 
The format of something must have suddenly changed?
 2014-02-26 09:21:44 -08:00
M-r-A
ab6fc69e6c Update ru.coffee 2014-02-25 23:49:43 -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
Nick Winter
3c5902a1d2 Trying to get session code merging to work again. 2014-02-25 14:46:48 -08:00
Nick Winter
b86c32c3e2 Merge pull request #422 from yangshun/level-not-found 
Redirect to play page for non-existent levels. Fixes issue #396
 2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff Moved internationalisation of level load error message into template file 2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a Used internationalised strings for level not found message 2014-02-26 05:54:33 +08:00
Tay Yang Shun
e3a81137e0 Modified locale messages for "level_load_error" 2014-02-26 05:52:49 +08:00
Scott Erickson
a53498224c Tweaked sprite scripts to use given response buttons even if the script is not skippable. 2014-02-25 13:27:02 -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
1b4699556a Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily. 2014-02-25 12:39:22 -08:00
Scott Erickson
eee434ab51 Tweaked the coordinate display position to be a bit more above the mouse. 2014-02-25 12:38:47 -08:00
Scott Erickson
356d1b55ed Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 11:59:23 -08:00
Scott Erickson
f4084ba5cc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:50:53 -08:00
Scott Erickson
45e6fadfe2 Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 10:50:40 -08:00
Scott Erickson
a1a5d5eea0 Fixed some script handling by not having playback changed when the first world is built. 2014-02-25 10:50:12 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Vic___
547bda9748 Update zh-HANS.coffee 2014-02-25 22:38:01 +08:00
Scott Erickson
168f268d21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 19:49:12 -08:00
Scott Erickson
242342315f Can now drag the mouse to move around the map. 2014-02-24 19:49:05 -08:00
Nick Winter
3472b3da97 Working on different shadow shapes. Fixed bug with palette property ownership. 2014-02-24 17:53:35 -08:00
Nick Winter
4a4a702f1e Fixed a bug where scrubbing playback wouldn't always update sprite existence properly. 2014-02-24 17:01:36 -08:00
Scott Erickson
01b91eb7e2 Lowered the bob height for the wizard a bit. 2014-02-24 16:59:17 -08:00
Scott Erickson
12b28397e0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 16:54:10 -08:00
Scott Erickson
7f738562e9 Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly. 2014-02-24 16:53:55 -08:00
Nick Winter
6e557d354e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 16:42:37 -08:00
Nick Winter
2e2f184485 Not sure why beam behaves differently, but fixed its scaling. 2014-02-24 16:42:34 -08:00
George Saines
d62630d0a7 final tweaks to dialogue text styling 2014-02-24 16:03:56 -08:00
George Saines
8192a6153d fiddling with text formatting 2014-02-24 15:51:10 -08:00
Nick Winter
ab8d63f545 Improved grouping of palette properties. 2014-02-24 15:48:30 -08:00
Scott Erickson
34205a0789 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 14:58:02 -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
052d35afe7 Added a screen darkener for when the spell is casting. 2014-02-24 14:40:28 -08:00
Nick Winter
32c45b80a9 Fixed performance problem with duplicate user code problem annotations. 2014-02-24 14:12:41 -08:00
Scott Erickson
e48bdfa1a7 Added your score to the ladder/team view. 2014-02-24 13:03:04 -08:00
Scott Erickson
43a49b3e6f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 12:52:43 -08:00
Scott Erickson
77f923752f Fixed #411. 2014-02-24 12:52:35 -08:00
Nick Winter
21975bedd2 Fixed #408. 2014-02-24 11:21:51 -08:00
Scott Erickson
953c9064f5 Fixed #407. 2014-02-24 11:20:35 -08:00
Scott Erickson
8138a5b678 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 11:13:21 -08:00
Scott Erickson
2be752ceed Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318. Think this also fixes #406. 2014-02-24 11:12:52 -08:00
Nick Winter
97ebe6dec8 Lightened problem info background highlight color for legibility. 2014-02-24 10:36:00 -08:00
Nick Winter
10e10aa961 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69 Playback and level editor shortcut tweaks. 2014-02-24 09:58:12 -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
Scott Erickson
4d9dd9bd36 Fixing the wizard settings modal. 2014-02-24 09:06:50 -08:00
Scott Erickson
2d6dd36a68 Saturation and lightness was flipped on the spritebuilder. Fixed. 2014-02-24 09:06:22 -08:00
Nick Winter
af43f18c23 Fixed selective includeFlow. 2014-02-24 08:59:50 -08:00
Nick Winter
af965ccb93 Fixes for ThangListEntryView popover hover states. 2014-02-23 17:11:27 -08:00
Nick Winter
3a0ed0af9b Still let people copy out of spell palette entries while suppressing selection color. 2014-02-23 16:49:25 -08:00
Nick Winter
b3eadef818 Merge pull request #404 from tips48/master 
Change spell palette colors
 2014-02-23 16:34:28 -08:00
Nick Winter
933bcf9e6b Showing property documentation when hovering in code in addition to clicking on palette entries. 2014-02-23 16:34:03 -08:00
Aidan Matzko
8bef99e394 Make spell palette prettier 2014-02-23 18:10:03 -05:00
Nick Winter
68497b2cf3 Added arg names or ... for functions which take arguments in spell palette entries. 2014-02-23 13:27:02 -08:00
Nick Winter
a156edc0a2 Merge pull request #403 from tips48/master 
Silly error names
 2014-02-23 12:32:08 -08:00
Nick Winter
5b88b58a75 Fixed application of a few i18n tags in wizard/picture settings. 2014-02-23 12:31:41 -08:00