Commit graph

6243 commits

Author SHA1 Message Date
Nick Winter
440e1700b1 Using aiSource now for enemy AIs in multiplayer, separate from sample code source. 2014-10-19 12:44:58 -07:00
Nick Winter
bbd75b1d43 Merge branch 'master' into production 2014-10-19 12:44:18 -07:00
Nick Winter
754f7128bd Merge pull request #1691 from Imperadeiro98/master
Update pt-PT.coffee
2014-10-19 11:43:19 -07:00
Imperadeiro98
9fc4498ace Update pt-PT.coffee 2014-10-19 19:16:13 +01:00
Nick Winter
0f6bfddd57 Propagated i18n. 2014-10-19 08:34:15 -07:00
Nick Winter
b7143c32f7 A bit of housekeeping for the last few i18n pull requests in perspicacious preparation for proper propagation. 2014-10-19 08:33:30 -07:00
Nick Winter
51be5f354c Merge pull request #1689 from AbnerZheng/patch-3
Update zh-HANS.coffee
2014-10-19 08:29:02 -07:00
Nick Winter
edc24f78e3 Merge pull request #1688 from Imperadeiro98/patch-1
Fix for #1676
2014-10-19 08:26:37 -07:00
Li Ma
c0c35cafe5 Update zh-HANS.coffee
添加一些零散翻译
2014-10-19 23:00:45 +08:00
AbnerZheng
c722c4cea7 Update zh-HANS.coffee
由于前面有人把stats翻成"成就",为保持一致性,也翻译成"成就"
2014-10-19 22:47:17 +08:00
Imperadeiro98
84c05109ea Update en.coffee 2014-10-19 12:51:50 +01:00
Imperadeiro98
d4f9078980 Update WorldMapView.coffee 2014-10-19 12:50:58 +01:00
Imperadeiro98
d9a32895c7 Update MainPlayView.coffee 2014-10-19 12:49:57 +01:00
Matt Lott
3fd24a28ce Eliminate unjoined file brunch warnings
By specifying the directories that should be watched/built (i.e.
exclude `test/server`)

Checking this fix in from @es128
2014-10-18 22:11:39 -07:00
Nick Winter
9f216e3361 Preserving opponent flags. 2014-10-18 18:57:33 -07:00
Nick Winter
66c728210b Fixing flag coloring in new WebGL rendering. 2014-10-18 18:18:12 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
9ce8ebaf25 Merge pull request #1686 from rafajaques/master
Translation done and spell check
2014-10-18 15:57:11 -07:00
Rafael Jaques
e32787d25c Translation done and spell check 2014-10-18 19:17:07 -03:00
Nick Winter
4278863c34 Merge branch 'master' into production 2014-10-18 14:56:27 -07:00
Nick Winter
9c8a0e83af Fixed an indentation typo in pt-BR.coffee. 2014-10-18 14:54:04 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Nick Winter
91db158c5e Merge pull request #1685 from kerradus/master
some translates
2014-10-18 13:53:57 -07:00
Dmitry
441b1351aa some translates 2014-10-19 00:45:56 +04:00
Nick Winter
08da130598 Merge pull request #1684 from rafajaques/master
Almost done
2014-10-18 08:03:14 -07:00
Rafael Jaques
cf64112d95 Almost done! 2014-10-18 11:29:43 -03:00
Michael Schmatz
4aff89d60a Fixed spell palette changes for iPad 2014-10-18 09:46:08 -04:00
Rafael Jaques
d56b2207da Update pt-BR.coffee 2014-10-18 10:39:44 -03:00
Nick Winter
9b62f2c7bf Merge branch 'master' into production 2014-10-17 20:47:46 -07:00
Nick Winter
2e539debbb Added signup poke to HeroVictoryModal. 2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e More blingstrositization for the HeroVictoryModal. 2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54 First set of fixes to HeroVictoryModal. 2014-10-17 18:00:13 -07:00
Matt Lott
f75ff8a236 Don't save duplicate user code problems 2014-10-17 15:53:00 -07:00
Nick Winter
64db50e122 Merge branch 'master' into production 2014-10-17 15:46:23 -07:00
Nick Winter
a65dabad04 Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay. 2014-10-17 15:25:31 -07:00
Nick Winter
cc1d247014 Merge pull request #1682 from rafajaques/master
pt-BR translations
2014-10-17 14:26:52 -07:00
Rafael Jaques
7ec54720ca Update pt-BR.coffee 2014-10-17 17:01:51 -03:00
Rafael Jaques
b8d59ed78a Update pt-BR.coffee 2014-10-17 16:59:33 -03:00
Rafael Jaques
a3c8621584 Update pt-BR.coffee 2014-10-17 16:13:20 -03:00
Nick Winter
c4207873d7 Merge pull request #1681 from Imperadeiro98/patch-1
Update cast_button.jade
2014-10-17 10:11:40 -07:00
Rafael Jaques
34dd1dadca Update pt-BR.coffee 2014-10-17 13:56:44 -03:00
Scott Erickson
0dc050abca Added i18nCoverage backend support. 2014-10-17 12:12:06 -04:00
Imperadeiro98
3b9feebee8 Update cast_button.jade
Internationalized "Submit".
2014-10-17 17:06:25 +01:00
Nick Winter
7f60701daa Merge pull request #1678 from yjw9012/master
#1668: moved the question above the dropdown
2014-10-17 08:50:42 -07:00
Nick Winter
005b4991cd Merge pull request #1680 from Imperadeiro98/patch-1
Update level_loading.jade
2014-10-17 08:48:47 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Imperadeiro98
f496823bb5 Update level_loading.jade
Removed an unused tip.
2014-10-17 16:38:21 +01:00
Scott Erickson
36ea415dbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-17 10:11:33 -04:00
Scott Erickson
092997bffe Added i18n coverage logic to the CocoModel. 2014-10-17 10:11:26 -04:00
yjw9012
30b261e40a Merge remote-tracking branch 'upstream/master' 2014-10-16 23:27:50 -07:00