Commit graph

5884 commits

Author SHA1 Message Date
TJ Ledwith
292e679cc6 Update level_loading.jade 2015-02-09 07:08:33 -05:00
Nick Winter
38c6d6f531 Merge pull request #2263 from divyanshu013/master
Improved upon the Buy Gems Window for #2238
2015-02-08 21:44:57 -08:00
divyanshu013
4269f6a652 Improved upon the Buy Gems Window for #2238
Added the header and close button for the Buy Gems Window.
2015-02-09 02:31:03 +05:30
Imperadeiro98
983d8c761a Merge pull request #2262 from ArthurLu/master
Update zh-HANT.coffee
2015-02-08 19:55:00 +00:00
Imperadeiro98
2bca3e1733 Merge pull request #2255 from tutosfaciles48/patch-1
Update fr.coffee
2015-02-08 19:47:43 +00:00
TJ Ledwith
a7b7d61c08 Update en.coffee 2015-02-08 14:06:25 -05:00
Barney
245de23aff Update zh-HANT.coffee 2015-02-08 21:21:32 +08:00
Barney
5f0adfae0c Update zh-HANT.coffee 2015-02-08 20:56:23 +08:00
Barney
c88ccd7d8f Update zh-HANT.coffee 2015-02-08 20:41:20 +08:00
Erik Mogensen (@mogsie)
00f4e1e894 lint complained 2015-02-08 12:47:49 +01:00
Erik Mogensen (@mogsie)
eab4174f78 More norwegian translations. 2015-02-08 12:38:17 +01:00
Imperadeiro98
d876c81c97 Made #back-button a button 2015-02-07 22:33:48 +00:00
tutosfaciles48
6ccba1b1a9 Update fr.coffee
changement d'une phrase encore en anglais.
2015-02-07 22:23:09 +01:00
Imperadeiro98
8b721a7c47 Better indentation 2015-02-07 10:47:31 +00:00
Matt Lott
d5ac001a55 Restrict share progress prompt to named players 2015-02-06 19:49:13 -08:00
Nick Winter
3e07e45766 Merge pull request #2246 from h3yduck/master
Fix bug: cannot upload profile picture
2015-02-06 18:15:15 -08:00
Nick Winter
cf09f01b03 Some style fixes to prettify the new background image avatars in user dropdown for #2247. 2015-02-06 18:10:12 -08:00
Nick Winter
9a29f898a9 Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug 2015-02-06 18:01:25 -08:00
Nick Winter
8ab6f36364 Crude initial version of ASCII representation for blind players. 2015-02-06 16:54:55 -08:00
Matt Lott
972c3d0d6f Share progress modal
Shown after forgetful-gemsmith
2015-02-06 14:49:50 -08:00
Nick Winter
e311eb2700 Fixed preloading of level sessions before starting a level. 2015-02-06 13:04:15 -08:00
Imperadeiro98
d2f0f3d1fc Update pt-PT.coffee 2015-02-06 20:49:51 +00:00
Nick Winter
0f7b7c7a9c Propagated i18n. Fixed #2253. 2015-02-06 12:08:31 -08:00
Imperadeiro98
b30de2bfa8 Small fix to last commit 2015-02-06 20:04:44 +00:00
Imperadeiro98
5b04bdcaba Merge pull request #2252 from JulR43/patch-3
Update fr.coffee
2015-02-06 20:04:14 +00:00
Nick Winter
2bd7c86638 Added bottom footer background texture. 2015-02-06 11:17:48 -08:00
Nick Winter
3da36ccc5d Added new level loading bar art. Using illustrated Start Level button. 2015-02-06 10:26:38 -08:00
JulR43
ef2f610ba2 Update fr.coffee
Translations
2015-02-06 19:06:10 +01:00
Matt Lott
f6bcc94bf8 Fix oneTimes email schema
Changing ‘targetEmail’ field to ‘email’.
2015-02-06 09:47:06 -08:00
Imperadeiro98
b3d432d3ae Some fixes to last commit 2015-02-06 15:19:05 +00:00
newmilktea
5e0c266094 Update zh-HANT.coffee 2015-02-06 22:14:15 +08:00
newmilktea
5e4a1ba4c8 Update zh-HANT.coffee 2015-02-06 22:08:26 +08:00
newmilktea
cf5b14e2c5 Update zh-HANT.coffee 2015-02-06 21:13:06 +08:00
newmilktea
6f4897da4d Update zh-HANT.coffee 2015-02-06 21:08:39 +08:00
newmilktea
1752f12b32 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/zh-HANT.coffee
2015-02-06 20:52:02 +08:00
newmilktea
cee95397fa Update zh-HANT.coffee 2015-02-06 20:49:09 +08:00
Nick Winter
860868c285 Stopped preloading sessions for now, since it's buggy. 2015-02-05 16:14:32 -08:00
Nick Winter
3cbf11d404 Added a back button to hit campaign selector view. 2015-02-05 15:40:45 -08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
Scott Erickson
b686a7f4a1 Fixed running tests with karma. 2015-02-05 13:58:07 -08:00
Martin005
d7592018a8 Update cs.coffee
Translated almost all new strings. Just want to save it and then will finish by translating rest of "teachers" strings.
2015-02-05 21:35:55 +01:00
Scott Erickson
f9ee100e73 Made Achievements and Campaigns patchable. 2015-02-05 12:01:19 -08:00
Scott Erickson
eafecaf492 Addressing #2173, part 1. It should now be possible to submit changes for non-versioned documents like Campaigns and Achievements. 2015-02-05 11:47:27 -08:00
h3yduck
a3b0a11c94 Update site-chrome.sass 2015-02-05 20:01:18 +01:00
h3yduck
15c6d32639 Update base.jade 2015-02-05 20:00:02 +01:00
Scott Erickson
f7403a6b77 Fixing #1866 2015-02-05 10:56:58 -08:00
Imperadeiro98
b92a029a04 Removed unused strings 2015-02-05 18:48:22 +00:00
Imperadeiro98
2dd90874da Update subscribe-modal.jade 2015-02-05 18:44:07 +00:00
Nick Winter
45dd6fa9a6 Option to choose between ground and floating layer for AOE circles. Fixed cleave AOEs. 2015-02-05 09:36:11 -08:00
h3yduck
3221f71527 Fix bug: cannot upload profile picture
In the code before, onInputChanged function was called manually, but the parameter was not passed. I think it's better to trigger the event, than calling the callback function of the event.
2015-02-05 17:56:51 +01:00
JulR43
1ca3a8d7e1 Update de-DE.coffee
A few translations
2015-02-05 16:16:55 +00:00
h3yduck
29f5307cfd Fix bug: can't upload profile photo
The onInputChanged callback is using the event parameter to get the target DOM element. On #L72 the callback function was called manually, but no parameter was passed. I pass in an object that has a target attribute, so it can get the DOM element.
2015-02-05 07:00:12 -08:00
Imperadeiro98
7433e7a5ca Update pt-PT.coffee 2015-02-05 14:57:21 +00:00
Imperadeiro98
230d2ce727 Merge pull request #2243 from JulR43/patch-1
Update fr.coffee
2015-02-05 14:44:49 +00:00
Imperadeiro98
f9e730ac30 Some fixes to last merge 2015-02-05 14:44:09 +00:00
Imperadeiro98
3ae135ac70 Merge pull request #2242 from Pammer/patch-2
Update ru.coffee
2015-02-05 14:42:50 +00:00
Imperadeiro98
c92caf8fc9 Small fix for last merge 2015-02-05 14:38:55 +00:00
Imperadeiro98
8c849aad18 Merge pull request #2241 from emmanuel-z/patch-2
Update es-419.coffee
2015-02-05 14:37:46 +00:00
Imperadeiro98
461ffecd4f Merge pull request #2240 from emmanuel-z/patch-1
Update es-419.coffee
2015-02-05 14:36:21 +00:00
JulR43
e4553ac5a3 Update fr.coffee
Correction
2015-02-05 08:33:26 +00:00
JulR43
5e1d8f9623 Update fr.coffee
Some translations
2015-02-05 08:31:49 +00:00
Pammer
dc4f1c0142 Update ru.coffee
"scores" + new part of  "subcribe" + "parent_email"
2015-02-05 12:43:05 +09:00
Nick Winter
df68c3c108 Propagated i18n. 2015-02-04 16:19:13 -08:00
Emmanuel Zarzosa
fed29c6890 Update es-419.coffee 2015-02-04 21:18:13 -03:00
Imperadeiro98
3bfc7e1a9c Small fix 2015-02-04 23:09:23 +00:00
Emmanuel Zarzosa
51c4ba5d0f Update es-419.coffee 2015-02-04 20:04:38 -03:00
Nick Winter
8f996a44b0 Added replays to the campaign editor level analytics drilldowns for particular sessions. 2015-02-04 14:48:31 -08:00
Matt Lott
c842f45786 Update subscribe modal with parent help button 2015-02-04 13:54:38 -08:00
Nick Winter
35c04974dd Added a difficulty badge when going to play a replayable level. 2015-02-04 13:42:49 -08:00
Nick Winter
11a3316dec Preloading levels and sessions when clicking on a level, before clicking start. 2015-02-04 13:24:22 -08:00
Nick Winter
ac44acb867 Campaign status gets out of the way after four seconds on non-dungeon campaigns. 2015-02-04 13:00:07 -08:00
Nick Winter
46ef93190a Show old difficulty instead of new difficulty when observing a replayable success. This will likely need revisiting when we are using observing for more than just leaderboards. 2015-02-04 11:31:43 -08:00
Nick Winter
18202b6852 Merge pull request #2237 from divyanshu013/master
Fixed Comment Out My Code for infinite loops for #1788
2015-02-04 10:29:13 -08:00
Imperadeiro98
77778c7829 Merge pull request #2231 from Pammer/patch-1
Update ru.coffee
2015-02-04 18:00:18 +00:00
Imperadeiro98
df1018ab53 Uncommented header 2015-02-04 17:58:59 +00:00
divyanshu013
929c89d2ac Fixed Comment Out My Code for infinite loops for #1788
Fixed the issue for incorrect comments by correcting the syntax per language
2015-02-04 21:48:01 +05:30
newmilktea
94499f670c Update zh-HANT.coffee 2015-02-04 22:53:33 +08:00
newmilktea
fd56a0c218 Update zh-HANT.coffee 2015-02-04 22:34:05 +08:00
Nick Winter
5542bd8a89 Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed. 2015-02-03 18:25:38 -08:00
Nick Winter
762192a4a7 A few visual improvements to leaderboadrs. 2015-02-03 17:07:15 -08:00
Nick Winter
d341e59b54 Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master 2015-02-03 12:29:16 -08:00
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
Matt Lott
d0a0c95623 Update campaign editor analytics
Display little level completion line graphs in the level completion
table cells.
2015-01-19 21:59:25 -08:00
Matt Lott
499e7c2999 Update campaign editor analytics
Color in level name based on number of users remaining.
2015-01-19 15:21:42 -08:00
Imperadeiro98
e00e699e6f Update pt-PT.coffee 2015-01-19 20:50:08 +00:00
Imperadeiro98
7e7945fc04 Activated some translations 2015-01-19 20:30:05 +00:00
Marielle Bannink
41239494e5 Update nl-NL.coffee
Added some translations to the file
2015-01-19 20:33:51 +01:00
Adnan Zahid
f46160fff9 Added 6 new tips for the loading screen (Also written in level_loading.jade)
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:12:21 +05:00
Adnan Zahid
375d388fe3 Added 6 new tips for the loading screen
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:06:29 +05:00
Matt Lott
05f028d944 Update campaign editor analytics
Adding ‘left game’ counts to overall campaign view.  This is the number
of players that left the game after playing the given level.
2015-01-18 16:29:47 -08:00
McGio
6473c7e94a Added some simple translations all over the file 2015-01-18 16:56:35 +01:00
nixel2007
19802cd0c5 Update ru.coffee 2015-01-18 00:44:31 +03:00
Imperadeiro98
c12d10a06b Fixed some issues 2015-01-17 18:54:34 +00:00
Shuyu Zhang
1bc4846c5e Update zh-HANS.coffee 2015-01-17 10:14:45 -08:00
Imperadeiro98
165582a55c Some fixes 2015-01-17 10:19:31 +00:00
Imperadeiro98
95d2d36129 Merge pull request #2110 from noiseorigin/patch-1
Update zh-HANS.coffee
2015-01-17 10:17:03 +00:00
Shuyu Zhang
13ad53ee04 Update zh-HANS.coffee 2015-01-17 00:06:04 -08:00
Nick Winter
706b2ca930 Don't includeFlow for Thangs with skipProtectAPI on, because we don't care about their flow anyway (non-read-write custom Programmables). 2015-01-16 18:47:30 -08:00
Matt Lott
d532d9fe6e Add date picker to campaign editor analytics
Only for overall campaign editor analytics.  Still need to add date
pickers to individual level views.
Moving campaign editor analytics to its own modal to support reloading
with new dates.
The date picker widget works poorly, but you can type in dates if
necessary.
Also moving analytics button up into the top right header, with a
little stats glyph icon.
2015-01-16 15:44:28 -08:00
Shuyu Zhang
1039afc85b Update zh-HANS.coffee 2015-01-16 15:03:04 -08:00
Shuyu Zhang
e46c6828b9 Update zh-HANS.coffee 2015-01-16 14:34:24 -08:00
Imperadeiro98
974c9e538d Update add-thang-components-modal.jade 2015-01-16 21:08:32 +00:00
Imperadeiro98
91515ef5a1 Update pt-PT.coffee 2015-01-16 20:58:17 +00:00
Imperadeiro98
699a15919c Update loading-error.jade 2015-01-16 20:55:20 +00:00
Nick Winter
3051dc32fa Propagated i18n. 2015-01-16 12:53:14 -08:00
Imperadeiro98
feae3694f7 Update en.coffee 2015-01-16 20:52:55 +00:00
Imperadeiro98
653263a069 Update save-version-modal.jade 2015-01-16 20:52:47 +00:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Imperadeiro98
08b5f0cc27 Update thang-components-edit-view.jade 2015-01-16 20:37:41 +00:00
Imperadeiro98
5981399a43 Update en.coffee 2015-01-16 20:37:32 +00:00
Nick Winter
fefc962c3c Added Mountain terrain type. 2015-01-15 17:10:52 -08:00
Matt Lott
770d3f5229 Add playtimes to overall campaign editor analytics 2015-01-15 16:07:26 -08:00
Matt Lott
e67532cf5d Mark top3 and bottom3 levels in campaign analytics 2015-01-15 15:19:16 -08:00
Imperadeiro98
5edc8543e5 Update en.coffee 2015-01-15 20:01:11 +00:00
Imperadeiro98
b6cf226a67 Update patch_modal.jade 2015-01-15 20:01:09 +00:00
Nick Winter
d69e9c43df Merge pull request #2105 from Imperadeiro98/master
Update campaign-view.jade
2015-01-15 11:34:07 -08:00
Matt Lott
116c7d0bf2 Update internal analytics
Adding level session ID where applicable.
Slimming down fields for most common events.
2015-01-15 11:04:52 -08:00
Imperadeiro98
f403c9d3e6 Update en.coffee 2015-01-15 18:36:16 +00:00
Imperadeiro98
ea07cfdd62 Update campaign-view.jade 2015-01-15 18:35:38 +00:00
Imperadeiro98
1ab2ea6910 Update pt-PT.coffee 2015-01-15 18:00:00 +00:00
Nick Winter
a329de6d90 Propagated i18n. 2015-01-15 09:37:08 -08:00
Imperadeiro98
e6234b0771 Update en.coffee 2015-01-15 17:34:49 +00:00
Imperadeiro98
fa3d8a2dd0 i18n duplicate strings 2015-01-15 17:34:39 +00:00
Imperadeiro98
ab2d3fbb10 i18n a title 2015-01-15 17:34:14 +00:00
Imperadeiro98
12be17ebd6 Update pt-PT.coffee 2015-01-15 17:11:37 +00:00
Nick Winter
e50b6f508c Propagated i18n. 2015-01-15 09:08:13 -08:00
Nick Winter
38297a1fd7 Fixed problem with levels that don't have next levels in campaign editor. 2015-01-15 09:07:47 -08:00
Imperadeiro98
b0d00ce213 Added generate terrain stuff 2015-01-15 17:07:11 +00:00
Imperadeiro98
16ad0de722 Removed spaces 2015-01-15 17:06:36 +00:00
enricpc
9dc45bdf45 Update ca.coffee 2015-01-15 09:44:27 +01:00
Matt Lott
c5977c00fe Add shortened fields to analytics.log.event
We’ll remove the old long fields after we’ve got enough data to switch
over our analytics queries without complication.
2015-01-14 17:51:34 -08:00
Matt Lott
10dc0c4794 Enable Google+ on login modal for IE 2015-01-14 14:16:08 -08:00
Scott Erickson
3c02f14f95 Reworking PlayHeroesModal to use Lanks and LayerAdapter to control hero animations. 2015-01-14 14:10:33 -08:00
Matt Lott
e79cadc761 Remove analytics.log.event created field
_id field already has created data:
http://docs.mongodb.org/manual/reference/object-id/
Also some misc analytics cleanup.
2015-01-14 13:03:02 -08:00
Matt Lott
140a93b453 Log world map and homepage events internally
Need these for conversion rates.
2015-01-14 11:09:56 -08:00
Matt Lott
3fd5f49220 Analytics data revamp
Add analytics per-day aggregation collection.
Add analytics strings collection.
Add per-day aggregation mongo insertion script.
Update campaign editor to use aggregation collection.
Update queries to use _id instead of created field.
2015-01-14 11:09:01 -08:00
Imperadeiro98
6b46e45526 Merge pull request #2097 from enricpc/patch-4
Update ca.coffee
2015-01-14 17:14:59 +00:00
Imperadeiro98
c9f0a9ec07 Merge pull request #2096 from RubenDjOn/master
Added new es-ES translations
2015-01-14 17:13:23 +00:00
enricpc
6bb3a77dad Update ca.coffee 2015-01-14 15:46:28 +01:00
RubenDjOn
ddec7b7f5a Added new es-ES translations 2015-01-14 00:53:05 +01:00
Scott Erickson
afe590c5cc Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest. 2015-01-13 15:34:06 -08:00
Imperadeiro98
6993f52740 Corrected indentation 2015-01-13 21:45:52 +00:00
Imperadeiro98
68bc4e1c39 Tried to make i18n work 2015-01-13 21:38:34 +00:00
Imperadeiro98
7f645ce019 Update pt-PT.coffee 2015-01-13 21:18:22 +00:00
Nick Winter
268f5a5b0d Propagated i18n. 2015-01-13 13:10:39 -08:00
Imperadeiro98
6491105f68 Update save-campaign-modal.jade 2015-01-13 20:06:53 +00:00
Imperadeiro98
12ada4f30c Update campaign-editor-view.jade 2015-01-13 20:04:49 +00:00
Nick Winter
beb61ba8d4 Merge pull request #2094 from rishiloyola/patch-6
Update spell_palette_entry.sass
2015-01-13 11:06:50 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Rishi
8a4b6eebf4 Update spell_palette_entry.sass 2015-01-13 15:30:37 +05:30
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
38948137b9 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-12 14:43:53 -08:00
Nick Winter
382e10dbb4 Fixed missing ] in names.coffee. 2015-01-12 14:43:33 -08:00
Scott Erickson
5cb8f14065 Fixed the HeroVictoryModal handling of earned achievements which were earned a while ago. Before they were appearing as if achievements were always newly achieved. 2015-01-12 14:43:29 -08:00
Popey456963
9ecb2822c0 Removed Duplicates 2015-01-12 20:18:35 +00:00
Popey456963
8d1ae770cb Added bunch of soldier names to names.coffee
Title pretty much says it all.
2015-01-12 20:04:22 +00:00
Imperadeiro98
8480fe7836 Update names.coffee 2015-01-12 19:35:37 +00:00
Nick Winter
7230f96daa Fixed syntax errors on names.coffee from #2089. 2015-01-12 10:49:55 -08:00
Nick Winter
1f377cf7ee Merge pull request #2089 from popey456963/master
Ordered names by alphabetical order
2015-01-12 10:49:06 -08:00
Popey Gilbert
bd14892cf2 Ordered names by alphabetical order
So that it is easier to see whether the names are in order or not.
2015-01-12 11:58:11 +00:00
Nick Winter
ea2392b2fe Removed buildTime annoyance from level save diffs. 2015-01-11 10:10:55 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Imperadeiro98
a9682a8cbe Update ladder-tab-view.jade 2015-01-10 22:52:41 +00:00
RubenDjOn
a8542d8f7f New es.ES translations 2015-01-10 22:32:50 +01:00
Nick Winter
5c352699b0 buildTime stuff. 2015-01-10 09:33:41 -08:00
Imperadeiro98
b5103aaa49 Merge pull request #2075 from 182mick44/patch-1
File revision.
2015-01-10 11:19:43 +00:00
Ivan Milanov
d8c5ecbbf8 Added new translations 2015-01-09 22:35:00 +01:00
Scott Erickson
82eb47bf5f Fixed #1056. 2015-01-09 12:56:48 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Miguel
f46df1de34 File revision.
There were many errors, attending grammar and ortography. Now everything is more or less correct.
2015-01-09 20:57:19 +01:00
Matt Lott
29c6b7c9f1 Prune internal analytics event data 2015-01-09 09:27:33 -08:00
Imperadeiro98
83efcb5113 Some spacing corrections 2015-01-09 15:00:38 +00:00
Imperadeiro98
3ec86b3e14 Merge pull request #2070 from steveshining/master
I hope this commit could be helpful
2015-01-09 14:59:49 +00:00
Imperadeiro98
2563c5b896 Merge pull request #2074 from nixel2007/master
Update ru.coffee
2015-01-09 14:58:29 +00:00
Imperadeiro98
b8e995c72b Merge pull request #2072 from RubenDjOn/master
Added es-ES translations
2015-01-09 14:55:38 +00:00
Nick Winter
3900af043d Added an es-419 Diplomat. 2015-01-08 20:49:18 -08:00
nixel2007
f65c464eb1 small fix 2015-01-09 05:40:11 +03:00
nixel2007
5b089c29d5 Update ru.coffee 2015-01-09 05:37:16 +03:00
RubenDjOn
6dd39dd99b Added es-ES translations 2015-01-09 01:19:28 +01:00
Matt Lott
8977450fed Add levelID to Saw Victory analytics event 2015-01-08 16:09:39 -08:00
Matt Lott
bc93a2b181 Update campaign editor analytics
Restrict level view completion rates to unique users. Super slow, perf
work to do here.
Increase level view completion rate date range to 2 weeks.
Increase level view average playtimes date range to 2 weeks.
Display player name if available in level view recent sessions.
2015-01-08 16:01:49 -08:00
Scott Erickson
d69c5941b3 Fixed #1968. 2015-01-08 11:57:31 -08:00
Nick Winter
04e0624268 Possible hacky workaround for #2068. 2015-01-08 11:42:42 -08:00
Scott Erickson
d8e89f31b1 Fixed #1967. 2015-01-08 11:29:10 -08:00
Nick Winter
c1d9a5ae13 Merge pull request #2066 from GeetikaBatra/patch-1
Added soldiers,librarian and ninja
2015-01-08 08:13:00 -08:00
Nick Winter
fbcbfc7368 Merged nl-BE.coffee. 2015-01-08 08:04:15 -08:00
izumi
6a6102fd75 I hope this commit could be helpful
Your guys realy do a great job!
2015-01-08 17:09:33 +08:00
Nick Winter
d66243ad75 Beating replayable levels now shows you the proper gems and xp. 2015-01-07 18:36:02 -08:00
Scott Erickson
aeebee891e Added 'submitting...' text to the i18n translation form button to show when a submission is successful. 2015-01-07 16:15:26 -08:00
Scott Erickson
c235b1cc15 The noty error for server errors now shows more detailed info. 2015-01-07 16:02:52 -08:00
Scott Erickson
2a4f997b1d Fixed registration point scaling for vector portraits, so they match their raster versions. 2015-01-07 15:11:43 -08:00
Matt Lott
c54fea929e Update campaign editor analytics
Optimize analytics.log.event user event data find() to use stream()
instead of exec(), which is better for large result sets
Fix startDay formatting bug
Per-level recent sessions to 100
2015-01-07 14:49:24 -08:00
Imperadeiro98
b47fc93912 Update ambassador.jade 2015-01-07 21:45:36 +00:00
Imperadeiro98
3c51d4d014 Update scribe.jade 2015-01-07 21:45:11 +00:00
Imperadeiro98
2a3892a572 Removed unnecessary titles 2015-01-07 21:44:05 +00:00
Nick Winter
1455dc0550 Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet. 2015-01-07 12:25:43 -08:00
Geetika Batra
1480baf000 Added soldiers,librarian and ninja 2015-01-07 22:56:27 +05:30
Imperadeiro98
a0a8b2a961 Merge pull request #2064 from Kindleme/patch-2
Update zh-HANS.coffee
2015-01-07 17:14:04 +00:00
Imperadeiro98
41080daaad Merge pull request #2063 from RubenDjOn/master
Added es-ES translations.
2015-01-07 17:09:43 +00:00
Kindleme
ac46e65ec9 Update zh-HANS.coffee 2015-01-07 18:24:50 +08:00
Nick Winter
4ea2a51ff6 In middle of debugging non-functioning repeatable achievements. 2015-01-06 21:32:58 -08:00