codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 18:15:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2014 commits 27 branches 0 tags 134 MiB
Commit graph

163 commits

Author SHA1 Message Date
Scott Erickson
2cdfbf1c48 Merged conflicts. 2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
	app/views/play/ladder/ladder_tab.coffee
 2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce Added facebook friends to the ladder page. 2014-03-21 19:50:54 -07:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -07:00
Nick Winter
9e4908ade2 A couple ladder tweaks. 2014-03-20 19:18:46 -07:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Scott Erickson
22555790b5 Set up a trimmed down leaderboard showing just top players and your rank. 2014-03-20 14:40:17 -07:00
Nick Winter
ff1e64e1f6 Less useless ladder refresh requests. 2014-03-19 18:26:38 -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
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
Nick Winter
1397b63e50 Merged. 2014-03-17 04:37:54 -07:00
Scott Erickson
7555dce172 Tweaked the loading page progress bar. 2014-03-17 00:05:45 -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
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
Nick Winter
6db33fd967 Brawlwood protectAPI on! 2014-03-16 17:07:10 -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
Nick Winter
125ffa9f43 Merged 2014-03-16 10:06:47 -07:00
honam bang
34be8917cb Fixes #546 2014-03-17 01:41:19 +09:00
IngridMorstrad
8d9a8aaf73 Change victory.jade to use the base template 2014-03-16 21:16:00 +05:30
Nick Winter
b2efb1bba5 More work on the loading view. 2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea Working on new loading view design. 2014-03-14 17:06:08 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794 removed unnecessary comment 2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc including i18n support for new editor config and minor styling changes 2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now. 2014-03-13 19:20:22 -07:00
Dominik Kundel
6f2a04c5c0 added new editor config modal 2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32 added button to access new modal for editor config 2014-03-14 00:53:29 +01:00
Nick Winter
c8103154a9 Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n. 2014-03-13 09:02:19 -07:00
Nick Winter
10e4bc737a Merge pull request #534 from Shrihari/fix-grid-toggle 
Fix Grid Toggle consistency
 2014-03-13 06:50:56 -07:00
Shrihari
fb7f64ddb0 Grid toggle consistent with the button and the shortcut 2014-03-13 15:21:00 +05:30
Nick Winter
28d56f526e Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces. 2014-03-12 20:59:19 -07:00
Michael Schmatz
aea9e9d1a6 Spectate view is nearing completion 2014-03-12 17:51:13 -07:00
Ruben Vereecken
b845961218 Clean up 2014-03-12 21:25:14 +01:00
Ruben Vereecken
f4637251be Added i18n to play modal 2014-03-12 21:23:25 +01:00