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

10763 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Schmatz
ce56e5df03 Merge pull request #415 from codecombat/master 
Merge master into production
 2014-02-24 17:58:02 -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
Scott Erickson
4532de9980 Fixed the dev server script to reload when server_setup.coffee changes. 2014-02-24 10:39:47 -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
26ad981dbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-24 08:59:53 -08:00
Nick Winter
af43f18c23 Fixed selective includeFlow. 2014-02-24 08:59:50 -08:00
Michael Schmatz
92bec1a95c Added pairwise utility route 2014-02-24 07:50:53 -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