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

12451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
566c9e6c9d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636 Fix for no Camera for creating Marks in the Thang Editor. 2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a Playback is now disabled during casting. Also cleaned out some remaining hover logic. 2014-03-16 21:43:14 -07:00
Nick Winter
155211ef0b Merge branch 'master' into production 2014-03-16 21:34:07 -07:00
Nick Winter
af57e88a1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0 Improved next game routing and speed. Hid that catastrophically dangerous reset all games button. 2014-03-16 21:33:46 -07:00
Scott Erickson
661c60ec50 Merge branch 'adi2412-simulator-teardown' 2014-03-16 21:14:56 -07:00
Scott Erickson
e88c79681d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click. 2014-03-16 21:04:36 -07:00
Nick Winter
3dd47ec98e Propagated new multiplayer_launch i18n. 2014-03-16 20:56:48 -07:00
Nick Winter
fc93ede891 Merged some merging in the locales. 2014-03-16 20:54:34 -07:00
Nick Winter
cfab3061f5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 20:52:29 -07:00
Nick Winter
680c12707a Merge pull request #567 from 2xG/patch-1 
Update es-419.coffee
 2014-03-16 20:51:58 -07:00
Nick Winter
f3a76da47c Added i18n for multiplayer launch modal. 2014-03-16 20:50:49 -07:00
Nick Winter
ffb9ec2908 Merged. 2014-03-16 20:36:18 -07:00
Scott Erickson
17af4cec0c Slight tweak. 2014-03-16 20:36:02 -07:00
Scott Erickson
dc32add6cb Merge branch 'simulator-teardown' of https://github.com/adi2412/codecombat into adi2412-simulator-teardown 2014-03-16 20:34:03 -07:00
Nick Winter
9a64fb5dac Work on /multiplayer modal. 2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6 Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play. 2014-03-16 20:28:02 -07:00
Scott Erickson
a3df986567 Added a tween for size changes. 2014-03-16 19:27:48 -07:00
honam bang
41d26f5709 Refactoring ModalView Templates 2014-03-17 11:00:25 +09:00
Scott Erickson
957fdd22e6 Tweaked the rank button to be much larger in the my matches tab. 2014-03-16 18:48:56 -07:00
Dominik Kundel
6a983dcb8c changed name of event triggered when config is changed and introduced new event when language is changed 2014-03-17 02:14:04 +01: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
Darredevil
123de3a997 Update ro.coffee 2014-03-17 02:44:29 +02:00
Scott Erickson
e430a6c2de Added multiplayer launch view. 2014-03-16 17:33:57 -07:00
Scott Erickson
3fa0124d7e Removed wizard loading code from home view, for now anyway. 2014-03-16 17:21:17 -07:00
Scott Erickson
dd8ea18186 Merge remote-tracking branch 'origin/master' 2014-03-16 17:13:18 -07:00
Scott Erickson
f23e3285cd Fixed a bug. 2014-03-16 17:12:55 -07:00
Nick Winter
b550708113 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967 Brawlwood protectAPI on! 2014-03-16 17:07:10 -07:00
Scott Erickson
209a1a3563 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-16 17:00:12 -07:00
Scott Erickson
eee8fbba2c New level page with new artwork. 2014-03-16 16:59:48 -07:00
Nick Winter
1f1802dc38 A couple tweaks for #577. 2014-03-16 16:04:17 -07:00
Nick Winter
753952e519 Merge pull request #577 from IngridMorstrad/templates 
Templates
 2014-03-16 16:00:24 -07:00
IngridMorstrad
dadf0dab86 refactored docs and reload 2014-03-17 02:57:15 +05:30
Nick Winter
aa4f1baf73 Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions. 2014-03-16 13:23:01 -07:00
Glen De Cauwsemaecker
c6493f0769 Merge github.com:glendc/codecombat 2014-03-16 20:43:58 +01:00
U-glendc-vir-env\glendc
6103003234 Merge github.com:codecombat/codecombat 2014-03-16 20:41:38 +01:00
IngridMorstrad
57f24932fb Removed redundant code for close button 2014-03-17 01:10:55 +05:30
U-glendc-vir-env\glendc
1d9c789292 Merge github.com:codecombat/codecombat 2014-03-16 20:36:34 +01:00
IngridMorstrad
52115876bb Refactored docs.jade to use the base template 2014-03-17 01:03:27 +05:30
honam bang
29a88ee128 Merge remote-tracking branch 'codecombat/master' 2014-03-17 02:20:44 +09:00
Nick Winter
125ffa9f43 Merged 2014-03-16 10:06:47 -07:00
honam bang
3940ba23b8 Merge branch 'master' of https://github.com/walkingtospace/codecombat 2014-03-17 01:47:16 +09:00
honam bang
34be8917cb Fixes #546 2014-03-17 01:41:19 +09:00
IngridMorstrad
37e3cd65da User now set to admin at signup instead of login 2014-03-16 21:56:29 +05:30
Nick Winter
3483431642 Merge branch 'master' into production 2014-03-16 09:22:41 -07:00