Commit graph

6578 commits

Author SHA1 Message Date
Matt Lott
d17cd6a2c1 No multiplayer in game-menu for non-ladder levels
This is a point fix to prevent single player level sessions from
setting multiplayer=true, which results in a bus.connect() in
playlevelview, which can result in a Firebase blocking error.
2014-12-11 22:05:18 -08:00
Nick Winter
20c8352225 User password hash test accepts production or development salt for convenience. 2014-12-11 20:21:42 -08:00
Nick Winter
194d3ee647 Worked around unstable Zoho mail dependencies by switching password recovery and contact emails to Sendwithus. 2014-12-11 20:15:24 -08:00
Matt Lott
0c81942c71 2nd HoC sub sale 2014-12-11 18:39:03 -08:00
Rubiconline
7736ce3f98 Update fr.coffee 2014-12-11 23:26:49 +01:00
FedericoTomas
ae0917511e Updated..
I check it all on Microsoft World, the archive had a lot of wrong translations... i corrected a lot.
Pd: Someone use google translate to edit the archive, and google translate sucks...(at least long sentences)
2014-12-11 19:09:45 -03:00
Nick Winter
2d7ac81221 Merge pull request #1907 from nykkole/patch-2
Update de-DE.coffee
2014-12-11 12:17:51 -08:00
Nick Winter
34bb14935a Merge pull request #1908 from fcrozetta/patch-2
Update pt-BR.coffee
2014-12-11 12:17:21 -08:00
Nick Winter
8a0874df63 Merge pull request #1909 from jibaigao/patch-1
Update zh-HANT.coffee
2014-12-11 12:16:47 -08:00
jibaigao
759a0675ad Update zh-HANT.coffee 2014-12-11 21:12:50 +01:00
Fernando H. Crozetta
9c4c320542 Update pt-BR.coffee
More text translated to PT-BR
2014-12-11 17:55:10 -02:00
nykkole
6096a4eef3 Update de-DE.coffee
Translated some sentences.
2014-12-11 11:45:49 -08:00
Scott Erickson
0b81796333 Created the Campaign foundation: schema, model, handler. 2014-12-11 11:26:28 -08:00
Nick Winter
59956c57f9 Merge pull request #1905 from Imperadeiro98/master
Update pt-PT.coffee
2014-12-11 07:35:25 -08:00
Imperadeiro98
2a7d9eb934 Update pt-PT.coffee 2014-12-11 15:29:02 +00:00
Nick Winter
1ef58bcfce Propagated i18n. 2014-12-11 07:02:08 -08:00
Nick Winter
ce36fa461f Fixed i18n typo that Imperadeiro98 noticed. 2014-12-11 06:57:58 -08:00
Nick Winter
fc12def6c1 Merge branch 'jonidimo-patch-1' 2014-12-11 06:51:36 -08:00
Nick Winter
0bed8dc460 Merged es-419.coffee. 2014-12-11 06:49:26 -08:00
Nick Winter
1d2ed8e283 Merge branch 'kisik21-patch-1' 2014-12-11 06:42:02 -08:00
Nick Winter
d6d9888811 Merged ru.coffee. 2014-12-11 06:41:49 -08:00
Nick Winter
f0b40cf553 Merge branch 'nykkole-patch-1' 2014-12-11 06:37:11 -08:00
Nick Winter
52400c8f18 Merged de-DE.coffee. 2014-12-11 06:37:01 -08:00
Nick Winter
0e5de952e3 Activated a few translations for #1896. 2014-12-11 06:34:54 -08:00
Nick Winter
629fe6188e Merge pull request #1896 from AtaZh/patch-1
Update uk.locale
2014-12-11 06:31:31 -08:00
Nick Winter
01f31f5007 Merge pull request #1894 from Rubiconline/patch-3
Update fr.coffee
2014-12-11 06:30:10 -08:00
Nick Winter
21870a0ce3 Added some indentation for #1903. 2014-12-11 06:29:33 -08:00
Nick Winter
d129f29d05 Merge pull request #1903 from FedericoTomas/patch-3
Update es-419.coffee
2014-12-11 06:27:34 -08:00
Nick Winter
4cfff26b39 Uncommented some hu.coffee section headers for #1891. 2014-12-11 06:25:44 -08:00
Nick Winter
e7bcc61f76 Merge pull request #1891 from divaDseidnA/patch-5
Update hu.coffee
2014-12-11 06:23:54 -08:00
Nick Winter
0aacce1c05 Merge branch 'nykkole-master' 2014-12-11 06:22:55 -08:00
Nick Winter
9f909f28cf Merged de-DE.coffee 2014-12-11 06:22:47 -08:00
Nick Winter
46b2906151 Merge pull request #1887 from nixel2007/master
ru_RU.coffee. account_profile, ladder_prizes, employers, admin, misc
2014-12-11 06:16:22 -08:00
Nick Winter
bfbcdd4be6 Merge pull request #1886 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-12-11 06:15:44 -08:00
Nick Winter
0e13e25d0a Merge branch 'fcrozetta-master' 2014-12-11 06:15:16 -08:00
Nick Winter
7b9f4bcbc4 Merged pt-BR.coffee. 2014-12-11 06:15:07 -08:00
Nick Winter
ddffe56522 Merge branch 'ericshentw-master' 2014-12-11 06:09:44 -08:00
Nick Winter
f73bf73344 Merged zh-HANS.coffee. 2014-12-11 06:09:23 -08:00
nixel2007
ae1aca8917 update ru.coffee. Line-sync to en, more translation 2014-12-11 13:55:01 +03:00
Nick Winter
e37c1afc17 Properly ended HoC sale price. 2014-12-10 21:24:42 -08:00
Nick Winter
dae39321e2 Properly ended HoC sale price. 2014-12-10 21:21:00 -08:00
Matt Lott
d4cfaac7e5 Sub price test 2014-12-10 16:05:55 -08:00
FedericoTomas
7aae2096de Update es-419.coffee 2014-12-10 19:22:52 -03:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -08:00
Nick Winter
84cdc5d150 Undisabled new adventurer levels. 2014-12-10 11:28:06 -08:00
Scott Erickson
e870de6146 Tweaked SpriteParser to be smarter about finding root MovieClips and shifting their bounds. 2014-12-10 11:22:47 -08:00
Nick Winter
87c34e81c6 Using new border image popover backgrounds. 2014-12-10 11:00:52 -08:00
Scott Erickson
94a400bfd8 Hero icons now show up on the world map on levels where you can unlock them. 2014-12-10 10:45:11 -08:00
Nick Winter
f8661c4a96 Added the lock image, actually. 2014-12-10 10:40:10 -08:00
Nick Winter
239f94697f Fixed IE hero lock image. 2014-12-10 10:37:57 -08:00