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
