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

928 commits

Author SHA1 Message Date
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
Aidan Matzko
b69fe85134 Silly error names 2014-02-23 15:30:33 -05:00
Nick Winter
11f742ff0f Included Hour of Code explanation in play footer. 2014-02-23 11:48:34 -08:00
Nick Winter
60eb0db1aa A few fixes for IE, anonymous errors, and cast button overflow. 2014-02-23 11:23:26 -08:00
Nick Winter
5f4d5afe4f Sped up CoordinateDisplay hover based on Russ's feedback. 2014-02-23 09:55:40 -08:00
Nick Winter
2aa103dd87 Merge pull request #402 from Vic020/master 
Update zh-HANS.coffee
 2014-02-23 09:47:00 -08:00
Nick Winter
d27925d862 Merge pull request #401 from sikandar47/patch-1 
Update es-ES.coffee
 2014-02-23 09:43:52 -08:00
Nick Winter
34b2c6dba8 Merge pull request #394 from OviiiOne/patch-1 
Update es.coffee
 2014-02-23 09:39:04 -08:00
Vic___
fb9a424146 Update zh-HANS.coffee 
Translated wizard_settings and  editor page ,and fix up some Inaccurate words.
 2014-02-24 01:11:11 +08:00
sikandar47
b3fe74e2a2 Update es-ES.coffee 2014-02-23 18:08:41 +01:00
Nick Winter
d8d514849f Merge pull request #400 from M-r-A/patch-1 
Update ru.coffee
 2014-02-23 08:34:55 -08:00
Nick Winter
0a334b310f Merge pull request #398 from jmr0/master 
fixing language selection disappearance when showing cached home view
 2014-02-23 08:32:27 -08:00
M-r-A
01a1d9e871 Update ru.coffee 2014-02-22 18:50:47 -08:00
jmr0
f00d9b2acc changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender 2014-02-22 21:06:37 -05:00
Nick Winter
43c1240a03 Fixed cast button moving around due to anticipated errors early. 2014-02-22 18:02:58 -08:00
Nick Winter
c21952646a Stop cast button progress overlay before cast settings gear. 2014-02-22 17:50:45 -08:00
Nick Winter
0d9213ad44 Faded Contact link until hover. 2014-02-22 17:45:24 -08:00
Nick Winter
f88cbba262 Got rid of some unnecessary scrolling behavior on /play/level due to footer when aspect ratio is cramped. 2014-02-22 17:40:38 -08:00
Nick Winter
8565e3f315 Adding the button, not just the shortcut, for beautification. 2014-02-22 17:18:58 -08:00
Nick Winter
9eb8bb97f5 Trying out a Ctrl+Shift+B code beautifier option. 2014-02-22 16:58:54 -08:00
jmr0
1562b02fd1 still need this for rendering after a language switch 2014-02-22 19:32:43 -05:00
jmr0
34df232d4f fixing language selection disappearance when showing cached home view 2014-02-22 19:32:43 -05:00
Nick Winter
b3009ae909 Fixed #7 with a nice cast-end sound (just reverse of cast sound). 2014-02-22 15:26:38 -08:00
Nick Winter
702eca5c81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-22 12:04:10 -08:00
Nick Winter
72cfcf96ed Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels. 2014-02-22 12:01:05 -08:00
Scott Erickson
90ec07fc75 Fixed the camera to properly follow thangs again. Also tweaked the camera to center around the torso rather than the feet. 2014-02-22 11:31:31 -08:00
Scott Erickson
5c85f227c6 Removed the hover playback control. 2014-02-21 17:11:16 -08:00
Scott Erickson
90ea365dc6 Fixed the background to match the footer so that there's no white at the bottom of the screen when playing full screen. 2014-02-21 17:07:31 -08:00
Nick Winter
a60a3fa796 Fixed a syntax problem with the tr merge. 2014-02-20 17:47:38 -08:00
Gediz
822405f3f5 Just updated Turkish translation 
I've translated a little part. And planning to translate the rest of document tomorrow. I'm not so sciential about GitHub, do I have to do anything else after I propose it?
 2014-02-21 03:37:27 +02:00
Nick Winter
26f11f40a9 Fix for destroying level. 2014-02-20 17:21:15 -08:00
Nick Winter
4e5ecb0c9e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:21:03 -08:00
Scott Erickson
bf80b806c6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 17:06:25 -08:00
Scott Erickson
da0238ceba Switched the level view to grab opponent code from submittedCode instead of code. 2014-02-20 16:53:08 -08:00
Scott Erickson
7261f9960c Tweaked the name column size in the ladder view. 2014-02-20 16:52:46 -08:00
Nick Winter
06f1e284c9 Added comment highlighting icon. 2014-02-20 16:14:31 -08:00
George Saines
c8669d1f19 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 15:32:51 -08:00
George Saines
c11e1b897f adding comment text color 2014-02-20 15:32:40 -08:00
Nick Winter
edcb7f45b6 Merge pull request #395 from tips48/master 
Block Ctrl-S while playing
 2014-02-20 15:29:16 -08:00
George Saines
10b14e3d65 adding comment color 2014-02-20 15:28:20 -08:00
Scott Erickson
367b1c2007 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 15:13:44 -08:00
Scott Erickson
d9b86b84dc Fixed a bug with the coloring of avatars in the hud. 2014-02-20 15:13:15 -08:00
Scott Erickson
eccabd2dc5 Apparently you shouldn't boldify text in ACE. 2014-02-20 15:12:57 -08:00
Aidan Matzko
e3ab7a4d7e Block Ctrl-S while playing 2014-02-20 18:11:20 -05:00
Oviii_One
fc662f7f98 Update es.coffee 2014-02-20 23:57:19 +01:00
Oviii_One
e9c460c642 Update es.coffee 2014-02-20 23:56:22 +01:00
Nick Winter
91a641d3ab Updated Diplomat instructions and related locale files. 2014-02-20 14:52:42 -08:00
Scott Erickson
9c30b9f0d0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:49:17 -08:00
Scott Erickson
7ea9f8549f Fixed some scroll bars from appearing when they shouldn't. 2014-02-20 14:45:54 -08:00
Nick Winter
67e1959341 Merge pull request #393 from daegren/master 
Misaligned social share buttons
 2014-02-20 14:42:24 -08:00
Nick Winter
54276c2bca Merge pull request #389 from liyinkan/master 
Translate and refine Chinese simplified
 2014-02-20 14:39:39 -08:00
Nick Winter
81d3702b49 Merge pull request #388 from jcvno/patch-1 
Update names.coffee
 2014-02-20 14:38:43 -08:00
Nick Winter
02ca5db1d6 Merge pull request #387 from EagleTA/patch-1 
first step of translation
 2014-02-20 14:38:17 -08:00
Scott Erickson
48cf9a1443 Added a link to the tutorial level. 2014-02-20 14:31:33 -08:00
Scott Erickson
0198bd1ec5 Gave the tome popovers a bit of margin on the right so the scroll bars don't hang off the side. 2014-02-20 14:31:04 -08:00
Scott Erickson
8bbce727ee Made the goals view a little more opaque. 2014-02-20 14:26:04 -08:00
Scott Erickson
5bda4d5e5f Fixed the camera to not move around when the world is reset and being cast. 2014-02-20 14:25:39 -08:00
Nick Winter
3c651abe20 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8 Tweaks for ladder views. 2014-02-20 13:58:35 -08:00
Oviii_One
245fa11811 Update es.coffee 
Chanched a lot of words
 2014-02-20 22:26:37 +01:00
Nick Winter
284576521f Added fullscreen toggle to play with. 2014-02-20 13:19:49 -08:00
George Saines
7d4431d2f2 adding youtube link for instructional vid 2014-02-20 12:41:04 -08:00
Scott Erickson
63ef2860d6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02 Upgrading docs return value schema. Added button template for tutorial and screencast on ladder. 2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30 Merge branch 'production' 2014-02-20 11:47:02 -08:00
Scott Erickson
8184d0b9d3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:43:46 -08:00
Scott Erickson
6b2e0bc364 Changed how the goal manager handles arriving at goals and figuring out the how many requirement. 2014-02-20 11:43:35 -08:00