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
1876 commits 27 branches 0 tags 134 MiB
Commit graph

366 commits

Author SHA1 Message Date
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
Nick Winter
ff1e64e1f6 Less useless ladder refresh requests. 2014-03-19 18:26:38 -07:00
Nick Winter
097c6bc2cd Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed. 2014-03-19 17:25:56 -07:00
Glen De Cauwsemaecker
71a13a5670 Adding missing translations for the Dutch local file 2014-03-20 00:33:50 +01:00
Glen De Cauwsemaecker
e2a7c15776 Merge conflicts resolved from Ruben's branch 2014-03-20 00:05:41 +01:00
Glen De Cauwsemaecker
eab52f45e5 Applied proofread of Julian. 2014-03-19 02:21:45 +01:00
Glen De Cauwsemaecker
f7777ef501 Merge branch 'patch-2' of github.com:feugy/codecombat 2014-03-19 02:16:54 +01:00
Glen De Cauwsemaecker
5dc89529ca Described myself. 2014-03-19 02:10:58 +01:00
Mikhail Koltsov
c9a08a0b25 thang editor: added i18n binding to 'Save' button 2014-03-19 01:43:27 +04:00
Ruben Vereecken
04465eb72c Wrapped up locale files 2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c Merged in old locale 2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333 Ladder i18n refactoring 2014-03-18 10:18:38 +01:00
kvasnyk
5216432bf9 Fix for #272 bug. 2014-03-18 05:47:53 +01:00
Damien
65f148974c Add to french diplomats list 2014-03-17 23:39:36 +01:00
Nick Winter
794b1472f6 Merge pull request #587 from cassiocardoso/patch-1 
Update diplomat.jade
 2014-03-17 08:50:45 -07:00
yangxuan8282
4b2bcc283f Update diplomat.jade 
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
 2014-03-17 23:32:20 +08:00
Cassio Cardoso
2917255193 Update diplomat.jade 
Add my username in brazilian portuguese diplomats list.
 2014-03-17 11:51:55 -03:00
Aditya Raisinghani
b5bef94eb3 Fixed issue with video on multiplayer page modal 2014-03-17 19:52:03 +05:30
Randi Katrine Hillerøe
5cecbeea40 Update diplomat.jade 
Added my name to the contributors list.
 2014-03-17 13:59:48 +01:00
Nick Winter
6c2a78c060 Show videos in HD if possible. Use ready state on level loader. 2014-03-17 05:52:19 -07:00
Nick Winter
36a90de7f9 Last bits of #546. 2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50 Merged. 2014-03-17 04:37:54 -07: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
Scott Erickson
5ddd2b9109 Added a few more tips. 2014-03-16 22:11:21 -07:00
Scott Erickson
dc4252a94d Moved the tips into the level loader screen and gave them i18n. 2014-03-16 22:01:21 -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
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
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
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
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
e430a6c2de Added multiplayer launch view. 2014-03-16 17:33:57 -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
IngridMorstrad
57f24932fb Removed redundant code for close button 2014-03-17 01:10:55 +05:30
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