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

1355 commits

Author SHA1 Message Date
Nick Winter
b895db3da2 Merge pull request #1831 from Rubiconline/patch-1 
Update fr.coffee
 2014-12-04 14:09:28 -08:00
nixel2007
7179236caa Update ru.coffee 
G+ commands, skill_docs, about - team blocks, thangs and small fixes.
 2014-12-05 01:00:50 +03:00
Lirai
324a749149 Update de-DE.coffee 
uncommented...
 2014-12-04 20:28:56 +01:00
Lirai
bde08dd24b Update de-DE.coffee 
Checked for errors and better translations.
 2014-12-04 19:34:28 +01:00
Matt Lott
7537817081 Update subscribe parent copy 2014-12-04 09:57:01 -08:00
Nick Winter
f48468c474 Merge pull request #1834 from ebirkenes/translation 
Bunch of norwegian translations
 2014-12-04 07:40:10 -08:00
Maks Lyashuk
22fe41fd70 Fix another indent 2014-12-04 14:19:37 +02:00
Maks Lyashuk
8479f94ecb Fix indent 2014-12-04 14:13:46 +02:00
Maks Lyashuk
f12d9b5598 New translation in uk.coffee 2014-12-04 13:14:19 +02:00
Nick Winter
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -08:00
Erlend Birkenes
4c4c263bb8 Fixed indentation error 2014-12-03 22:43:45 +01:00
Nick Winter
6e57cbfb66 LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it). 2014-12-03 12:04:12 -08:00
Nick Winter
0ac9b3758b Fixed bug with subscriptions not working. Added subscription status text to the world map. 2014-12-03 11:19:10 -08:00
Erlend Birkenes
861cb64fec More norwegian translations 2014-12-03 20:01:00 +01:00
Matt Lott
898b22723e Update subscribe copy 2014-12-03 11:00:45 -08:00
Nick Winter
f82ccfc4cb The sky darkened. 2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7 SubscribeModal is in. 2014-12-03 09:14:14 -08:00
Erlend Birkenes
5d4d631ae6 More norwegian translations. 
Conflicts:
	app/locale/nb.coffee
 2014-12-03 16:36:04 +01:00
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -08:00
Rubiconline
e1326f1698 Update fr.coffee 2014-12-02 21:25:58 +01:00
Johan
06dcb8c48b Update sv.coffee 2014-12-02 17:03:33 +01:00
Imperadeiro98
6036d2bd74 Update pt-PT.coffee 2014-12-01 20:45:29 +00:00
Imperadeiro98
1e4d6b3bd5 Update pt-PT.coffee 2014-12-01 20:27:52 +00:00
Björn Kimminich
4d1130a9c6 Update de-DE.coffee 2014-12-01 14:00:36 +01:00
Nick Winter
88849d6dfb Propagated i18n. 2014-11-30 18:13:30 -08:00
Björn Kimminich
5432be27f5 added some german translations 2014-12-01 03:11:28 +01:00
Nick Winter
77a4cea387 Improvements for mobile layouts and mobile and iPad browser detection. 2014-11-30 12:27:34 -08:00
Nick Winter
ad913024c0 Merge pull request #1817 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-11-29 15:57:59 -08:00
Dmitry
52311bd256 update RU translation 2014-11-30 01:24:19 +03:00
Imperadeiro98
abf75281ca Update pt-PT.coffee 2014-11-29 21:25:46 +00:00
Imperadeiro98
8d9c7cf0be Update pt-PT.coffee 2014-11-29 21:22:06 +00:00
Nick Winter
98199ac72e Propagated i18n. 2014-11-29 10:38:55 -08:00
ewertonorg
4b7fc0322c Update pt-BR.coffee 2014-11-29 11:53:27 -02:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Erlend Birkenes
6efb03ec40 Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little. 2014-11-28 19:30:41 +01:00
Erlend Birkenes
5f7f1c2b65 Translated the entire contributing page plus some other stuff to norwegian. 2014-11-27 20:17:33 +01:00
Erlend Birkenes
37601efa17 More norwegian translations. 
Conflicts:
	app/locale/nb.coffee
 2014-11-27 16:11:13 +01:00
Nick Winter
4e51289de8 Merge pull request #1800 from ShadowTrainer/patch-2 
Update tr.coffee
 2014-11-26 19:20:10 -08:00
Nick Winter
12253fc472 Resolved nb.coffee merge conflicts. 2014-11-26 19:19:30 -08:00
Nick Winter
167595789d Merged tr.coffee. 2014-11-26 19:09:39 -08:00
Nick Winter
7a7d82e8e4 Merge pull request #1792 from ccdarkness/patch-1 
Update zh-HANS.coffee
 2014-11-26 16:51:07 -08:00
Nick Winter
6e7e11a884 Merge pull request #1791 from nadian/patch-1 
Update id.coffee
 2014-11-26 16:50:50 -08:00
Erlend Birkenes
c8a34e78e8 Lots of translations to norwegian bokmål 2014-11-27 01:00:02 +01:00
Nick Winter
2c0bf2fef1 Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed. 2014-11-26 08:53:06 -08:00
Nick Winter
3f9aa1ba79 Changed 'Your Skills' to 'Help' for hero level spell palette. 2014-11-26 07:39:13 -08:00
ShadowTrainer
28acb28912 Update tr.coffee 2014-11-25 21:23:43 +02:00
Scott Erickson
426202d80a Added a simple payments page. 2014-11-25 11:09:29 -08:00
Scott Erickson
bb766e9610 Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit. 2014-11-25 10:39:53 -08:00
Nick Winter
98f1eec10c Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs. 2014-11-25 09:28:50 -08:00
Imperadeiro98
77c7381e40 Update pt-PT.coffee 2014-11-24 19:55:12 +00:00
Imperadeiro98
6cd32857ac Update pt-PT.coffee 2014-11-24 19:35:07 +00:00
Nick Winter
9accd0cb04 You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more. 2014-11-24 10:51:20 -08:00
Aase Mestad
5a10ec8a23 Some norwegian updates 2014-11-24 18:18:40 +01:00
ccdarkness
1ce776f9e2 Update zh-HANS.coffee 2014-11-24 12:54:38 +08:00
nadian
b429e5f26a Update id.coffee 2014-11-24 08:45:21 +07:00
Nick Winter
294a37e2a2 Propagated i18n. 2014-11-23 12:54:42 -08:00
Nick Winter
f248de0dc5 Adding i18n to skill docs. 2014-11-23 12:52:34 -08:00
Scott Erickson
cfcd09c112 Set up the new Heald-designed site chrome. 2014-11-22 17:41:13 -08:00
ShadowTrainer
48a0be91d8 Update tr.coffee 2014-11-23 01:32:59 +02:00
Dmitry
41b3d066d6 update RU translation 2014-11-22 19:58:05 +03:00
iAladdin
0fcffc9736 improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-21 00:16:45 +08:00
iAladdin
55f725de93 fixed error 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-20 11:13:47 +08:00
iAladdin
883a58ed2d improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-20 08:22:10 +08:00
iAladdin
42997c4bb2 improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-20 07:42:35 +08:00
iAladdin
d24db06e0e improved Chinese Localization 
Signed-off-by: iAladdin <ialaddin@me.com>
 2014-11-19 12:51:39 +08:00
iAladdin
43f56c7ff7 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-19 11:19:41 +08:00
iAladdin
5f1f02f8e8 improved Chinese localization 2014-11-19 11:19:31 +08:00
Nick Winter
b3119e300d Resolved merge conflicts. 2014-11-18 18:16:17 -08:00
iAladdin
4bd578c18e improved Chinese localization 2014-11-19 09:45:15 +08:00
Matt Lott
05cc9c2f46 Move sync pvp status UI to control bar 
Replaces level name UI for hero-ladder levels.
 2014-11-18 09:01:07 -08:00
Dloach
d9b4a63584 Update zh-HANS.coffee 2014-11-18 23:22:55 +08:00
Nick Winter
1a470a5745 Merge pull request #1762 from MountainWang/patch-1 
Update zh-HANS.coffee
 2014-11-18 07:03:12 -08:00
Nick Winter
daa4d63dcf Merge pull request #1761 from Dloach/patch-1 
Update zh-HANS.coffee
 2014-11-18 07:03:00 -08:00
Nick Winter
6ef9532b1d Fixed missing colon in bg.coffee. 2014-11-18 06:50:13 -08:00
Nick Winter
96e57a7520 Merge pull request #1759 from igornishka/patch-1 
A couple of translations added :)
 2014-11-18 06:49:26 -08:00
MountainWang
3615bc87e9 Update zh-HANS.coffee 2014-11-18 21:32:42 +08:00
iAladdin
d09c8c155b improved Chinese localization 2014-11-18 18:43:37 +08:00
Dloach
f659240061 Update zh-HANS.coffee 2014-11-18 18:03:03 +08:00
Ehnydeel
fcb5f4246c Add some more german translations 
Add some more german translations
 2014-11-18 10:50:41 +01:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
igornishka
3abe0db1e5 A couple of translations added :) 2014-11-18 01:00:28 +02:00
Nick Winter
736fbaa474 Merged de-DE. 2014-11-17 12:43:31 -08:00
Matteo Canu
b8abeed60c Added more translations 2014-11-16 18:15:24 +01:00
Imperadeiro98
eb23438f6a Update en.coffee 
Updated achievements titles. Don't know if lines 750-752 are needed or not, as they do not display in the website.
 2014-11-15 22:01:06 +00:00
Imperadeiro98
2da1b7d65e Update pt-PT.coffee 2014-11-15 19:05:04 +00:00
Imperadeiro98
0a0b3b2041 Update pt-PT.coffee 2014-11-15 19:02:51 +00:00
Nick Winter
74aefa42b9 Merged in sunxb10's translations. 2014-11-15 07:42:57 -08:00
Nick Winter
e28f6bf994 Propagated i18n. 2014-11-15 07:40:58 -08:00
Nick Winter
b7c2a33ddc Fixed some i18n on the PlayHeroesModal, and started showing special hero skills. 2014-11-15 07:40:10 -08:00
Nick Winter
61308feca7 Merge pull request #1745 from LuSilf/master 
Some translation in ru.coffee
 2014-11-15 07:32:15 -08:00
Ehnydeel
d23cf5c725 Added some german translations 
Added some german translations
 2014-11-14 22:27:24 +01:00
Scott Erickson
36305cde97 Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window. 2014-11-14 11:04:24 -08:00
Nick Winter
5fde9e6a64 Merge pull request #1740 from ann304/patch-1 
Update vi.coffee
 2014-11-14 06:59:17 -08:00
sunxb10
1c560511c3 Simplified Chinese translation (zh-HANS) 2014-11-14 18:01:51 +08:00
Scott Erickson
5b034194ee Put in the new BuyGemsModal design. 2014-11-12 17:17:24 -08:00
Anton Alexanin
db71f9b528 tab 2014-11-12 21:15:45 +03:00
Anton Alexanin
4a5a4bc305 Some RU translation and fixes. 
Added and translated "awaiting_levels_adventurer*".
 2014-11-12 21:09:38 +03:00
Scott Erickson
ad35109878 Built the BuyGemsModal stub. 2014-11-12 09:40:55 -08:00
Anton Alexanin
af6d4638d0 Uncommented translated lines 2014-11-12 19:28:46 +03:00
Anton Alexanin
990fd0d4e7 Some translation in ru.coffee 2014-11-12 11:55:40 +03:00
Matteo Canu
ebc35ae0cb Translated more strings 
Also modified Wizard translation from "stregone" to "mago"
 2014-11-11 20:23:52 +01:00
gorechi
f776295944 Update ru.coffee 2014-11-11 17:57:53 +03:00
An Nguyen
86f0910258 Update vi.coffee 2014-11-11 10:37:36 +01:00
Nick Winter
ce04541d3a Working on tying item purchasability to player level, plus other small tweaks to the item store. 2014-11-10 22:07:55 -08:00
Scott Erickson
f21f54cd19 Refactored, mostly redesigned inventory view, modeled after the Heald item store design. 2014-11-10 15:31:32 -08:00
Imperadeiro98
ae61a9d78e Update pt-PT.coffee 2014-11-10 19:49:53 +00:00
Nick Winter
85471badaa Added callout to become an Adventurer on disabled levels. 2014-11-09 21:27:03 -08:00
Nick Winter
9b68f03f75 Propagated i18n. 2014-11-09 20:20:01 -08:00
Nick Winter
44d4d13c93 A few tweaks to the GameMenuModal. 2014-11-09 20:19:12 -08:00
Nick Winter
982e85da52 Linked to new i18n page from Diplomat page. 2014-11-09 20:06:55 -08:00
Nick Winter
65017a8d58 Merge pull request #1736 from mcaeiror/master 
Galician translation complete!
 2014-11-09 15:19:13 -08:00
Manuel Caeiro Rodríguez
e3df3f50bb Update gl.coffee 
Galician translation complete!
 2014-11-10 00:11:47 +01:00
Manuel Caeiro Rodríguez
602b0e4ce9 Update gl.coffee 2014-11-09 23:54:16 +01:00
Manuel Caeiro Rodríguez
9eef4e8951 Update gl.coffee 2014-11-09 22:05:54 +01:00
Manuel Caeiro Rodríguez
9702466f1f Update gl.coffee 2014-11-09 20:45:43 +01:00
Manuel Caeiro Rodríguez
fcf4aa8ac0 Update gl.coffee 2014-11-09 20:18:03 +01:00
Manuel Caeiro Rodríguez
bf872f2a96 Update gl.coffee 2014-11-09 15:40:58 +01:00
Manuel Caeiro Rodríguez
012c5d72c3 Update gl.coffee 
Some more translations
 2014-11-09 09:50:20 +01:00
Matt Lott
0d2fe9b6e2 Update error code line background 
Add title to problem alert dialog
 2014-11-08 21:51:58 -08:00
Manuel Caeiro Rodríguez
7f2680de78 Update gl.coffee 
Some more translations
 2014-11-08 21:50:20 +01:00
Nick Winter
1b94868197 Added new LevelDialogueView. Messed around with dimming a bit more. 2014-11-08 11:39:04 -08:00
Manuel Caeiro Rodríguez
506109864b Update gl.coffee 2014-11-08 16:51:53 +01:00
Nick Winter
cfff09b01e Merged big .executing arrow. 2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things. 2014-11-07 16:04:35 -08:00
Nick Winter
fbc2799211 Startd to implement new code editor design. Fixed #1732. 2014-11-07 09:09:13 -08:00
Dmitry
98a0173bad Update ru.coffee 2014-11-06 21:40:44 +03:00
Dmitry
546b74ae67 update RU translation 2014-11-06 21:36:54 +03:00
Nick Winter
26f065370c Finished adding Galician. 2014-11-06 07:26:00 -08:00
Nick Winter
f48fce2fdf Merge pull request #1726 from mcaeiror/master 
To be checked
 2014-11-06 07:22:22 -08:00
Imperadeiro98
eb96cc8d86 Update pt-PT.coffee 2014-11-06 15:13:40 +00:00
Nick Winter
fe7e96ab4e Started restricting common items with APIs that will make it impossible to win certain dungeon campaign levels. 2014-11-05 20:56:17 -08:00
Scott Erickson
c660053dea Set up the PlayHeroesModal, and hooked it into the world map. 2014-11-05 19:04:14 -08:00
Nick Winter
c48b155413 Allow rerun of level without a code change. 2014-11-05 18:06:21 -08:00
Nick Winter
189c3d202c Goals now show status: 'Running...' while the world is simulating. 2014-11-05 14:42:55 -08:00
Nick Winter
fd36dc9d79 Propagated i18n. 2014-11-05 14:35:02 -08:00
Nick Winter
a73b7df179 Added i18n for some more inventory screen strings. 2014-11-05 14:33:56 -08:00
Imperadeiro98
8121ce9704 Update pt-PT.coffee 2014-11-05 19:12:04 +00:00
mcaeiror
c2f2bbcd41 gl.coffee 
Minor edition
 2014-11-05 16:22:25 +01:00
mcaeiror
e9b966de83 Update gl.coffee 
Some more translations into Galician language
 2014-11-05 09:17:58 +01:00
mcaeiror
0937dbe75c Update gl.coffee 
First edition of the galician translation. To be checked!
 2014-11-04 17:31:24 +01:00
mcaeiror
bb7e516521 Create gl.coffee 
Translation into Galician
 2014-11-04 17:28:47 +01:00
Igzok
98cf74e375 Update fr.coffee 
Corrections & translations
 2014-11-04 12:32:18 +01:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
6db298f03c Merge pull request #1719 from newick/patch-1 
corrected incomplete translation
 2014-11-03 10:03:04 -08:00
Nick Winter
9ac06fc781 Merge pull request #1718 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-11-03 10:02:33 -08:00
Nick Winter
dd8654f325 Fixed fr merge. 2014-11-03 10:02:01 -08:00
Nick Winter
aa0dda7886 Fixed nb merge. 2014-11-03 09:59:55 -08:00
newick
6ac4edcb12 corrected incomplet translation 2014-11-03 13:39:55 +01:00
Nick Winter
ad2fdb9dde Working on new Fully Illustrated designs for level play view and iPad interface. 2014-11-02 14:51:01 -08:00
Igzok
499851f878 Update fr.coffee 2014-11-02 17:17:17 +01:00