Commit graph

1780 commits

Author SHA1 Message Date
Scott Erickson
b6c9b6276c Tweaked logging of sprite building. 2014-03-19 17:11:45 -07:00
Scott Erickson
514d6024e0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-18 13:48:11 -07:00
Scott Erickson
74e068af0b Fixed some bugs from the migration from _.cloneDeep to $.extend 2014-03-18 13:47:51 -07:00
Michael Schmatz
0576389ce2 Lowered ratio requirements 2014-03-18 13:16:35 -07:00
Michael Schmatz
326b39b633 Dramatically raised ratio requirements 2014-03-18 13:14:06 -07:00
Scott Erickson
a461a14d6e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-18 13:08:34 -07:00
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Nick Winter
358d7fa181 Dont' need to load sessions, too. 2014-03-18 11:52:23 -07:00
Nick Winter
4355813d69 Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them. 2014-03-18 11:26:15 -07:00
Nick Winter
a58faa1acd Merged. 2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7 Merge pull request #600 from M-r-A/patch-2
Update ru.coffee
2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e Fixed quoting problem. 2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale 2014-03-17 13:58:11 -07:00
Nick Winter
f87962bc04 Merge pull request #598 from armaldio/patch-3
Update fr.coffee
2014-03-17 13:57:04 -07:00
Björn Kimminich
4ea7d0e9b2 Update de.coffee 2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2 Update de.coffee 2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1 Update ru.coffee 2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588 Added korean locale and modified unnatural translation 2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3 Update fr.coffee 2014-03-17 19:47:44 +01:00
Nick Winter
bf323d59f2 Merge pull request #594 from ahmed80dz/patch-1
Update ar.coffee
2014-03-17 11:09:17 -07:00
Nick Winter
ce0edc17d3 Merge pull request #595 from cassiocardoso/patch-3
Update pt-BR.coffee
2014-03-17 11:08:44 -07:00
Cassio Cardoso
970d5e46a2 Update pt-BR.coffee
Add multiplayer translation
2014-03-17 14:47:22 -03:00
ounis ahmed
aab91057f2 Update ar.coffee 2014-03-17 10:12:24 -07:00
Nick Winter
65a131d072 Merge pull request #593 from BonnieBBS/patch-2
Update zh-HANS.coffee
2014-03-17 09:26:26 -07:00
BonnieBBS
9a9480ea83 Update zh-HANS.coffee
Some words about "Ambassador" have been translated. :D
2014-03-18 00:18:09 +08:00
Nick Winter
5fef126672 Merge pull request #592 from ImmortalJoker/patch-2
Update ru.coffee
2014-03-17 08:51:18 -07:00
Nick Winter
794b1472f6 Merge pull request #587 from cassiocardoso/patch-1
Update diplomat.jade
2014-03-17 08:50:45 -07:00
Nick Winter
df2c1b443e Merge pull request #589 from yangxuan8282/patch-2
Update diplomat.jade
2014-03-17 08:49:30 -07:00
Nick Winter
98025f1ae2 Merge pull request #588 from yangxuan8282/patch-1
Update zh-HANS.coffee
2014-03-17 08:49:21 -07:00
Nick Winter
763f08a05e Merge pull request #590 from ImmortalJoker/patch-1
Update uk.coffee
2014-03-17 08:49:09 -07:00
Krasnov Ehor
c9d916fb7a Update ru.coffee 2014-03-17 17:49:07 +02:00
Nick Winter
f30d649550 Merge pull request #591 from BonnieBBS/patch-1
Update zh.coffee
2014-03-17 08:42:28 -07:00
Krasnov Ehor
172ad1d17a Update uk.coffee 2014-03-17 17:40:51 +02:00
BonnieBBS
abf90cf8f5 Update zh.coffee
Translated some of the words. :D
2014-03-17 23:38:13 +08: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
yangxuan8282
43ecfec28f Update zh-HANS.coffee
a little change,make grammar more idiomatic
2014-03-17 23:27:38 +08:00
Cassio Cardoso
2917255193 Update diplomat.jade
Add my username in brazilian portuguese diplomats list.
2014-03-17 11:51:55 -03:00
Scott Erickson
87b225b061 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-17 07:34:02 -07:00
Scott Erickson
564d267463 Removed a TODO. 2014-03-17 07:33:53 -07:00
Nick Winter
ec9ec83e4d Merge pull request #586 from adi2412/master
Fixed issue with video on multiplayer page modal
2014-03-17 07:26:54 -07:00
Aditya Raisinghani
b5bef94eb3 Fixed issue with video on multiplayer page modal 2014-03-17 19:52:03 +05:30
Nick Winter
1171572bd8 Merge pull request #585 from Silwing/patch-1
Update da.coffee
2014-03-17 06:01:19 -07:00
Randi Katrine Hillerøe
5cecbeea40 Update diplomat.jade
Added my name to the contributors list.
2014-03-17 13:59:48 +01:00
Randi Katrine Hillerøe
a936964434 Update da.coffee
Added a few of the missing translations.
2014-03-17 13:55:58 +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
3d56cc4393 Merge pull request #584 from batista/patch-1
Update pt-PT.coffee for multiplayer
2014-03-17 05:26:57 -07:00
Nick Winter
63535e0d39 Merge pull request #583 from bbeasmile/patch-1
Update hu.coffee
2014-03-17 05:16:10 -07:00
Sérgio Batista
641fa482d8 Update pt-PT.coffee for multiplayer 2014-03-17 13:13:45 +01:00
bbeasmile
03f309a441 Update hu.coffee 2014-03-17 13:01:17 +01:00
Nick Winter
36a90de7f9 Last bits of #546. 2014-03-17 04:44:00 -07:00