Commit graph

5603 commits

Author SHA1 Message Date
Bård Eik-Hvidsten
5159ff56f7 Update nb.coffee 2015-02-03 20:25:05 +01:00
Imperadeiro98
2448be11b3 Small fix 2015-02-03 18:25:13 +00:00
Imperadeiro98
036ae7d7f7 Revert "Update zh-HANT.coffee" 2015-02-03 18:16:32 +00:00
Imperadeiro98
51f55bb376 Merge pull request #2230 from Coderaulic/patch-1
Update ja.coffee
2015-02-03 18:03:47 +00:00
Imperadeiro98
5fb9268603 Merge pull request #2229 from ArthurLu/patch-1
Update zh-HANT.coffee
2015-02-03 18:02:26 +00:00
Nick Winter
86aa265679 Added campaign label banner art. 2015-02-03 09:56:27 -08:00
Pammer
bd5ddab9e9 Update ru.coffee 2015-02-04 01:18:49 +09:00
newmilktea
275fb219a3 Update zh-HANT.coffee 2015-02-03 23:54:13 +08:00
newmilktea
89d4ca6039 Update zh-HANT.coffee 2015-02-03 23:26:17 +08:00
Pammer
641e8d7abf Update ru.coffee 2015-02-03 14:37:58 +09:00
Coderaulic
d8cdb6960c Update ja.coffee
Updated misc translations.
2015-02-02 20:13:58 -08:00
Arthur
d47a04208a Update zh-HANT.coffee
Finish the rest of general
2015-02-03 11:50:55 +08:00
Arthur
752e71f74c Update zh-HANT.coffee
update the part of general
2015-02-03 11:36:21 +08:00
Nick Winter
60d68ca23c Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings. 2015-02-02 18:02:57 -08:00
JKniager
bc48cd8448 Moved 'Steve' to Ogre M 2015-02-02 14:17:06 -07:00
Imperadeiro98
837ad8b5a4 Update pt-PT.coffee 2015-02-02 20:20:41 +00:00
Nick Winter
b3db9962bd Propagated i18n. 2015-02-02 11:51:15 -08:00
Nick Winter
3f78071e5e A few small fixes. 2015-02-02 11:50:25 -08:00
Imperadeiro98
cd61969475 Small fixes for last PR 2015-02-02 19:48:42 +00:00
Imperadeiro98
3d5ae45565 Merge pull request #2201 from Coderaulic/patch-1
Update ja.coffee
2015-02-02 19:44:55 +00:00
Nick Winter
c8a5712d43 Merge pull request #2197 from purenickery/patch-3
Update en.coffee
2015-02-02 09:24:32 -08:00
Nick Winter
730753d67b Merge pull request #2196 from purenickery/patch-2
Update level_loading.jade
2015-02-02 09:24:25 -08:00
Nick Winter
6e9db9f39b Merge pull request #2189 from purenickery/patch-1
Update names.coffee
2015-02-02 09:20:36 -08:00
Nick Winter
59a6d369a3 Merge pull request #2183 from rishiloyola/patch-7
Update hero-victory-modal.sass
2015-02-02 09:00:27 -08:00
Coderaulic
92e779259a Update ja.coffee
Fixed miscellaneous translations from previous.
Updated all of -
game_menu:
inventory:
buy_gems:
choose_hero:
general:
I left in the original English as comments for long translations should there be a need to revisit, unless single words.

Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?
2015-02-01 21:38:38 -08:00
Imperadeiro98
6551395278 A little fix 2015-02-01 19:19:22 +00:00
Imperadeiro98
734a401974 Merge pull request #2199 from nixel2007/master
Update ru.coffee
2015-02-01 19:18:20 +00:00
Imperadeiro98
afe188104b Fixed a typo 2015-02-01 19:16:51 +00:00
nixel2007
f70f1e2896 ru.coffee - teachers block 2015-02-01 21:58:23 +03:00
nixel2007
25190a5dfd Update ru.coffee
Leaderboard block + unlock_help_vidoes
2015-02-01 17:16:12 +03:00
Imperadeiro98
3068f18443 Added a translator 2015-02-01 11:01:18 +00:00
Nick Winter
55bc48c61d Fixed problem with error messages in production. 2015-01-31 18:40:38 -08:00
Nick Winter
415cbceaf9 Disabling particles for now until performance can be fixed. 2015-01-31 16:59:03 -08:00
purenickery
b47bbe5704 Update en.coffee 2015-01-31 17:01:57 -07:00
purenickery
81b69e0c3c Update level_loading.jade 2015-01-31 17:01:43 -07:00
JKniager
99c5d0f604 Added Tips
Added english translations for the tips added to the loading tips.
2015-01-31 16:26:48 -07:00
JKniager
f1145852dd Added Tips
Added tips to the tip list.
2015-01-31 16:25:35 -07:00
JKniager
503575d86b Added More Names 2015-01-31 15:51:27 -07:00
Nick Winter
1e410e0b14 Worked around bug with item portraits disappearing after item purchase. Fixed #1980. 2015-01-31 14:38:54 -08:00
purenickery
b7624c0c58 Update names.coffee
-added new names for #53
2015-01-31 15:26:41 -07:00
Imperadeiro98
1b42dceb4f Last merge fix 2015-01-31 22:02:26 +00:00
Coderaulic
bf54331f21 Update ja.coffee
Updated translation in:
nav:
play:
login:
signup:
recover:
items:
units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same.
play_level:
2015-01-31 13:47:40 -08:00
Imperadeiro98
95b6801dab Update about.jade 2015-01-31 21:43:43 +00:00
Imperadeiro98
128dc55c1d Merge pull request #2187 from SuperPranx/patch-2
Added a few translations
2015-01-31 21:23:08 +00:00
Nick Winter
936ebf67a7 Fixed #2140. 2015-01-31 13:18:32 -08:00
Nick Winter
26ac0c8947 Making sure tooltips are destroyed when their parent views are destroyed. 2015-01-31 12:48:44 -08:00
Nick Winter
4b388f2775 Fixed some memory leaks. Fixed a couple minor bugs. 2015-01-31 12:23:44 -08:00
Ivan Milanov
15939cbc17 Added a few translations 2015-01-31 21:19:23 +01:00
Imperadeiro98
b8214e8b3c Last merge fixes 2015-01-31 19:02:24 +00:00
Imperadeiro98
a0e4a410f7 Merge pull request #2185 from jacobakkerboom/patch-2
Update nl-NL.coffee
2015-01-31 18:53:59 +00:00
Nick Winter
b538a83fd1 Oops, that was just for testing... 2015-01-31 10:37:43 -08:00
Popey Gilbert
ec5d54cc97 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-31 10:10:24 -08:00
Popey Gilbert
8098c76ba5 Changed Particles 2015-01-31 10:08:54 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Jacob
cf76143e60 Update nl-NL.coffee
Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.
2015-01-31 17:28:27 +01:00
Imperadeiro98
55d9731720 Removed Scott's website
It was not working.
2015-01-31 15:04:50 +00:00
Imperadeiro98
850cd99069 i18n of teachers (part 2) 2015-01-31 14:17:24 +00:00
Imperadeiro98
06860f4338 Added teachers strings 2015-01-31 14:06:32 +00:00
Imperadeiro98
bae3053585 i18n of teachers (part 1) 2015-01-31 12:57:32 +00:00
Imperadeiro98
d497a3ac24 Update legal.jade 2015-01-31 12:42:57 +00:00
Imperadeiro98
7cb2a9403b Using .spr and .spl
Also removed an image that was not working
2015-01-31 12:35:02 +00:00
Imperadeiro98
24529d0d7c Update legal.sass 2015-01-31 12:11:09 +00:00
Rishi
106d5f640e Update hero-victory-modal.sass 2015-01-31 17:40:34 +05:30
Imperadeiro98
d99e790df1 Fixed last merge issue 2015-01-31 11:04:11 +00:00
Imperadeiro98
3db3b0790c Merge pull request #2177 from negesti/patch-2
Update de-DE.coffee
2015-01-31 11:03:48 +00:00
sotonin
751ae0fac8 Adding support for hudName property 2015-01-31 00:07:23 -06:00
Nick Winter
e59f2bcc62 Recording scores even for non-real-time-submit levels. 2015-01-30 22:06:22 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
a092444455 Add browser info to level session 2015-01-30 14:45:36 -08:00
Nick Winter
848341dbd1 I guess I'll be finding these for a while. 2015-01-30 11:24:48 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
negesti
1eeeb25315 Update de-DE.coffee 2015-01-30 19:32:50 +01:00
Nick Winter
f78ea3d786 Yaaaaay 2015-01-30 09:40:46 -08:00
Nick Winter
2571b41cca Found another one, missed due to insufficient grep-fu. 2015-01-30 09:24:07 -08:00
Nick Winter
9ca2663e0e Fixed one more instance of the previous bug. 2015-01-30 08:12:34 -08:00
Nick Winter
36fcd1bb79 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-30 07:52:09 -08:00
Nick Winter
77cca7189f Updated a bunch of code that got busted with CoffeeScript 1.9.0. 2015-01-30 07:51:57 -08:00
Imperadeiro98
ad05ddc221 Fixed merge issues 2015-01-30 15:33:53 +00:00
Imperadeiro98
32dc5fdc34 Merge pull request #2176 from jacobakkerboom/patch-1
Update nl-NL.coffee,
2015-01-30 15:30:32 +00:00
Imperadeiro98
cd7f09e626 Merge pull request #2172 from JulR43/patch-1
Update fr.coffee
2015-01-30 15:29:23 +00:00
Jacob
6e08e5406e Update nl-NL.coffee,
Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. 

I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.
2015-01-30 12:42:27 +01:00
Nick Winter
39ad9b8e35 Show hero unlocks in campaign editor, too. 2015-01-29 19:29:37 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
fd0e7a8c44 Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players. 2015-01-29 18:19:03 -08:00
Matt Lott
92f070ecca Fix help video events
Removing the protocol broke the video player event hooks.
2015-01-29 16:45:18 -08:00
Nick Winter
5addacddf0 First draft of ParticleMan particle emitters for showing hidden levels in CampaignView. 2015-01-29 16:11:13 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
JulR43
0c1897bbb3 Update fr.coffee
Several translates
2015-01-29 16:56:37 +00:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Imperadeiro98
239b72dd01 Merge pull request #2169 from scenix007/patch-1
add some translation for tips
2015-01-29 16:17:34 +00:00
Jhoon Saravia
8325d522fb Finished translations on tips 2015-01-29 08:57:29 -05:00
Long Shao
14af5c309d add some translation for tips
Update zh-HANS.coffee : add some translation for tips
2015-01-29 18:13:10 +08:00
Nick Winter
a6043ca1be Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-28 17:59:11 -08:00
Nick Winter
22070ddff2 Identifying lastLevel to Segment. Added Ogre Headhunter names. 2015-01-28 17:58:56 -08:00
Nick Winter
f9d2a06379 Merge pull request #2168 from yaur/master
Fix windows build
2015-01-28 17:52:49 -08:00
Matt Lott
8b51c3cb5d Stop subscribe modal A/B test
Group A (original) wins.
2015-01-28 16:20:10 -08:00
yaur
dc39a55cf8 remove logging 2015-01-28 18:37:07 -05:00
yaur
30f9188090 Remove the scheme from help videos so that they maintain the scheme of the
calling page
2015-01-28 18:33:28 -05:00
nixel2007
1ff5832436 fix ru.coffee 2015-01-28 22:07:19 +03:00
nixel2007
d086555fb7 Update ru.coffee 2015-01-28 21:50:16 +03:00
Imperadeiro98
354a7cb71b Merge pull request #2160 from rsiwady29/spanish_translations
Update es-419.coffee
2015-01-28 18:18:35 +00:00
Imperadeiro98
8cf424f7ef Update pt-PT.coffee 2015-01-28 18:16:34 +00:00
Nick Winter
bf3c997d9d Merge pull request #2139 from katemamba/long-name
#2125 Long player names overflow
2015-01-28 08:56:26 -08:00
Richard Siwady
8d001a6281 Update spanish translations for es-419 2015-01-28 00:12:40 -06:00
Richard Siwady
7cb6791a58 Fixed lua_blurb es-419 translation. 2015-01-27 23:16:08 -06:00
Nick Winter
5f8ec2b21b Propagated i18n. 2015-01-27 20:36:40 -08:00
Nick Winter
7cb92136cc Added some Skeleton names. 2015-01-27 18:04:07 -08:00
divyanshu013
cfdbabb576 Added some quotes for #710 2015-01-27 21:53:37 +05:30
Nick Winter
2e09a94736 Asking for feedback when cancelling subscriptions. 2015-01-26 16:48:32 -08:00
Matt Lott
019406a341 Update campaign analytics
Increase line graph dots for larger hover targets.
Update missing day data handling to fill in graph points for any
missing day, not just most recent end days.
Fix level completion div0 bug.
2015-01-26 14:58:38 -08:00
Nick Winter
e41652730d Don't warn about missing misc System. 2015-01-26 14:51:04 -08:00
Matt Lott
24f8029aff 🐛Fix campaign editor analytics
Line graph checkboxes need their own labels.
2015-01-26 13:36:07 -08:00
Matt Lott
48a8ed109d Update campaign editor analytics
Add line graphs to level view.
2015-01-26 13:19:10 -08:00
divyanshu013
59df5a2a8c Added some names for #53 2015-01-27 01:21:04 +05:30
Imperadeiro98
462b60191f Don't force https 2015-01-25 18:56:30 +00:00
Imperadeiro98
19c03952e1 Merge pull request #2129 from chess9876543210/patch-1
Propagated i18n.
2015-01-25 18:34:44 +00:00
Pavan Kate
2004e91e38 #2125 Long player names overflow 2015-01-25 06:03:41 +05:30
Imperadeiro98
8acb5a5ac8 Update teachers.jade 2015-01-24 12:44:06 +00:00
jmigual
5e58986e75 Added some translations 2015-01-23 22:12:18 +01:00
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Nick Winter
e3bf8f74ab Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all. 2015-01-22 12:26:37 -08:00
Imperadeiro98
0d00917ca0 Fixed order 2015-01-22 19:28:17 +00:00
Imperadeiro98
ca792b1edc Merge pull request #2133 from nixel2007/master
Update ru.coffee
2015-01-22 19:26:49 +00:00
Nick Winter
64008276c2 Finally translating level names and descriptions in the campaign view. 2015-01-22 11:22:35 -08:00
nixel2007
6b5c69f889 ru.coffee - small fix 2015-01-22 22:16:37 +03:00
nixel2007
44c97428e3 Update ru.coffee 2015-01-22 22:14:56 +03:00
Imperadeiro98
bb0a820638 Update pt-PT.coffee 2015-01-22 19:04:41 +00:00
Nick Winter
e49a70a62e Fixed mountain map background ratio. 2015-01-22 10:48:41 -08:00
Nick Winter
9e496fa9d0 Propagated i18n. 2015-01-22 10:45:51 -08:00
Nick Winter
9b1923d943 Merge pull request #2119 from AdnanZahid/patch-2
Added 6 new tips for the loading screen
2015-01-22 10:44:32 -08:00
Nick Winter
d24469d8ce Merge pull request #2118 from AdnanZahid/patch-1
Added 6 new tips for the loading screen
2015-01-22 10:44:22 -08:00
Nick Winter
ccf4f0180e Resolved ca.coffee merge conflicts. 2015-01-22 10:42:04 -08:00
Imperadeiro98
76906a15fc Uncommented an header 2015-01-22 16:28:27 +00:00
Imperadeiro98
4a45b5290e Merge pull request #2132 from z3t1/patch-1
Translation of several pharses
2015-01-22 16:27:31 +00:00
Imperadeiro98
45f4ae9e42 Merge pull request #2131 from probil/patch-1
Update Ukrainian l18n
2015-01-22 16:24:25 +00:00
z3t1
1e5ef588d8 Translation of several pharses 2015-01-21 20:56:13 -05:00
Matt Lott
3f40364616 Update campaign editor analytics
Add date range picker to level view.
2015-01-21 16:03:50 -08:00
Maks Lyashuk
82bc526bd7 Update Ukrainian l18n
Translated some new lines
2015-01-22 00:17:03 +02:00
Matt Lott
e49c74259b Update campaign editor analytics
Adding shown and purchased subscription counts.
Locking down analytics to admin-only.
2015-01-21 13:41:38 -08:00
Matt Lott
6b271799be Update level loading view sub event data
Sending level slug instead of name.
2015-01-21 13:41:38 -08:00
chess
a118a7cf75 i18 update
old non abonement text replaced with new version
2015-01-21 21:28:53 +01:00
Nick Winter
7dd128780f Unlocking all audition levels in Auditions campaign. 2015-01-21 11:49:56 -08:00
Matt Lott
3c36d1cc06 Update campaign editor analytics
Adjust level completion line graph stroke-weight based on daily started
count in campaign overview.
2015-01-20 16:04:02 -08:00
Matt Lott
d51eddef29 Update campaign editor analytics
Double-click level row in overview to open level details view.
2015-01-20 15:02:24 -08:00
Matt Lott
ffb59d5cec Disable prod admin internal analytics tracking 2015-01-20 14:18:31 -08:00
Imperadeiro98
25f01db701 Merge pull request #2116 from McGiogen/patch-1
Added some simple translations all over the file
2015-01-20 20:40:17 +00:00
Matt Lott
f38a67b96a Update campaign editor analytics
Add playtime bar graphs.
2015-01-20 11:43:13 -08:00
Matt Lott
d368e3ffd8 Fix campaign editor analytics
Dividing by zero for level completion spark lines in campaign overview
analytics modal.
2015-01-20 11:14:50 -08:00
Matt Lott
7fda59ee2d Update campaign editor analytics
Adding help click counts and help videos start counts to level view
analytics.
2015-01-20 10:43:02 -08:00