Commit graph

4840 commits

Author SHA1 Message Date
Darredevil
c9a56048ca Update GoalManager.coffee 2014-03-09 20:35:33 +02:00
Nick Winter
9e56540cee Uncommented out some headers in uk.coffee localization. 2014-03-09 11:03:21 -07:00
Nick Winter
802454bbb9 Merge pull request #504 from gorodsb/patch-1
Update uk.coffee
2014-03-09 08:55:11 -07:00
gorodsb
6be9ff2bb7 Update uk.coffee 2014-03-09 17:54:08 +02:00
Nick Winter
59314bcb3c Merge pull request #500 from M-r-A/i18n
Update i18n
2014-03-09 08:19:02 -07:00
Nick Winter
1321a5eaa0 Merge pull request #501 from Darredevil/patch-5
More than half done
2014-03-09 08:17:39 -07:00
Nick Winter
1292ae4bbd Merge pull request #502 from Darredevil/patch-6
Changed description of "Get to Locations"
2014-03-09 08:16:32 -07:00
gorodsb
adc8c8eddf Update uk.coffee 2014-03-09 16:47:48 +02:00
Darredevil
af2b43a309 Changed description of "Get to Locations" 2014-03-09 15:09:22 +02:00
Nick Winter
82857fd080 Was able to send out some emails. 2014-03-08 21:29:41 -08:00
Darredevil
ed93b2bbe5 More than half done 2014-03-09 05:53:22 +02:00
Nick Winter
f05e8432a9 Starting work on ladder update emails. 2014-03-08 18:49:09 -08:00
Alexei Nikitin
59318678ba Update ru 2014-03-09 05:06:53 +04:00
Alexei Nikitin
bcaa801f88 Sync en i18n 2014-03-09 05:04:11 +04:00
Alexei Nikitin
81084a24c6 Add admin i18n 2014-03-09 04:36:48 +04:00
Alexei Nikitin
f6d6805534 Add password i18n 2014-03-09 04:31:15 +04:00
Alexei Nikitin
bfebd0b47a Add revert i18n 2014-03-09 04:13:30 +04:00
Nick Winter
39c4657204 Fixed HUD showing actions backwardly. Added rank numbering to leaderboard. 2014-03-08 15:43:56 -08:00
Nick Winter
b3964571e1 Fixed bug importing animations into existing ThangTypes that had only containers. 2014-03-08 15:04:11 -08:00
Nick Winter
5bde534757 Fixed parsing for ThangTypes that don't have lib.properties. 2014-03-08 14:53:17 -08:00
Nick Winter
be12d38e34 Taking into account null rects and library width/height subtraction on sprite parsing. 2014-03-08 14:38:35 -08:00
Scott Erickson
57f1588dea Fixed another bug related to the race condition fix. 2014-03-08 14:34:25 -08:00
Scott Erickson
afbe2200a6 Fixed a bug with the new race condition fix. Moving the schemas to the application would be good. 2014-03-08 13:52:34 -08:00
Scott Erickson
ad6317434d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 13:07:12 -08:00
Scott Erickson
2861f62248 Simple fix for a race condition where the user schema might load after /auth/whoami, overwriting /auth/whoami's cookie. 2014-03-08 13:06:04 -08:00
Nick Winter
b0238d74a4 Let's just show 200 leaderboard entries for now until we have paging. 2014-03-08 11:50:10 -08:00
Nick Winter
c3c5782fd9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-08 11:37:37 -08:00
Nick Winter
1c44e3df1e Fixed bug with linking to #my-matches tab. 2014-03-08 11:37:33 -08:00
Nick Winter
cd79403736 Merge pull request #494 from M-r-A/patch-3
Fix l18n tags
2014-03-08 11:27:00 -08:00
Nick Winter
027643fd2a Merge pull request #493 from M-r-A/patch-2
Update ru.coffee
2014-03-08 11:26:18 -08:00
Nick Winter
161a02755f Merge pull request #498 from liyinkan/master
Update : employers for Chinese simplified
2014-03-08 08:20:12 -08:00
Yinkan Li
bfad68b03b refine skip_tutorial
refine skip_tutorial
using Chinese ()
2014-03-09 00:01:13 +08:00
Yinkan Li
452857e66c update Chinese Simplified
update
legal
concat
2014-03-08 23:56:05 +08:00
Yinkan Li
bcd8c837b4 Update : employers for Chinese simplified
Update : employers for Chinese simplified
2014-03-08 23:53:47 +08:00
Nick Winter
68099bbd7c Victory modal for ladder games takes you back to the ladder matches. 2014-03-07 21:20:09 -08:00
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -08:00
Michael Schmatz
2f378106ca Added checking level ladder status before submitting 2014-03-07 18:16:50 -08:00
Scott Erickson
2fa40fb2db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-07 17:37:19 -08:00
Scott Erickson
fe2ced1a67 Gave the health bar a border, made it a little more high res. 2014-03-07 17:37:11 -08:00
Nick Winter
ba5518eda6 Merge pull request #497 from M-r-A/master
Update article model
2014-03-07 17:20:01 -08:00
Alexei Nikitin
98b36d299c Update article model 2014-03-08 05:05:35 +04:00
Nick Winter
b6ae73ef29 Merge pull request #492 from Shrihari/issue464
Fixed Spell Debug View width bug
2014-03-07 16:14:57 -08:00
Nick Winter
ec86a07906 Changed Camera min/max zoom. 2014-03-07 15:20:54 -08:00
Scott Erickson
8fa9c9c410 Set up the level play view to show the guide on startup based on the showGuide property. 2014-03-07 15:18:56 -08:00
Scott Erickson
13b9a9cb58 Added dungeon arena tutorial to a few hardcoded places. 2014-03-07 15:16:13 -08:00
Scott Erickson
990a2e34e5 Utilizing the new level type property in the level handler. 2014-03-07 15:15:49 -08:00
Scott Erickson
2f68e64dc5 Almost forgot to add to the level handler the new properties. 2014-03-07 13:14:27 -08:00
Scott Erickson
17231bce06 Added showsGuide and type properties to level. 2014-03-07 13:13:58 -08:00
Scott Erickson
be03485538 Set up the ladder play modal to be more forthright getting new players to play the tutorial. 2014-03-07 12:58:17 -08:00
Alexei Nikitin
683c578dcb Fix lolwtf deleting 2014-03-07 12:36:17 -08:00