codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-18 11:32:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
7864 commits 27 branches 0 tags 134 MiB
Commit graph

6171 commits

Author SHA1 Message Date
Ryan Marren
b16c44da63 Merge remote-tracking branch 'upstream/master' 2015-02-21 17:31:30 -05:00
Ryan Marren
320e8c401a level indicator code cleanup 2015-02-21 17:30:32 -05:00
Nick Winter
40ff7d4116 Harmonized enter shortcut for PlayHeroesModal. 2015-02-21 14:22:51 -08:00
Matt Lott
ecd9abc3b6 Merge pull request #2366 from rmarren1/master 
Clarified level indicator for #2351
Fixes #2351
 2015-02-21 11:41:35 -08:00
Ryan Marren
f850409dbe made "level" display in other languages 2015-02-21 14:29:40 -05:00
Nick Winter
e3d13f6dd0 Merge pull request #2363 from ChaosCat/patch-1 
Update he.coffee
 2015-02-21 09:21:41 -08:00
Ryan Marren
a7dadc34aa Added level indicator 2015-02-20 23:50:42 -05:00
Nick Winter
0e135ac07f Fixed blank language selector row. 2015-02-20 15:20:44 -08:00
Shady Kamal
f32572e94c Update he.coffee 
+Another update for "he.coffe" file
 2015-02-20 20:38:30 +02:00
Leonardo
de7f216d22 translation 
translation.
 2015-02-20 15:35:37 -02:00
enricpc
e113c7accb Update ca.coffee 2015-02-20 08:51:29 +01:00
Nick Winter
ab252adf90 Better detection and error handling of unsupported WebGL context creation failures. 2015-02-19 19:57:10 -08:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
sohalya
a3ce088657 Update fr.coffee 
Some translations and french grammar corrections.
 2015-02-19 17:21:46 +01:00
Shady
928748ff5f Update he.coffee 
a minor update for he.coffee
 2015-02-19 14:16:23 +02:00
Nick Winter
8355ba5a6d Replayable level awards now count up from where they were last time instead of from 0. 2015-02-18 18:01:22 -08:00
Nick Winter
f2a5c4bc5a Merge pull request #2353 from amankr/sound 
Volume bug fix #2202
 2015-02-18 13:36:59 -08:00
Nick Winter
a81663f06a CampaignView shouldn't use localStorage backups unless it's in editor mode. 2015-02-18 13:35:47 -08:00
Imperadeiro98
227a8edffa Merge pull request #2350 from vampirelower/patch-2 
Update uk.coffee
 2015-02-18 20:45:49 +00:00
Aman Kumar
e4a3890f39 fixed volume bug #2202 2015-02-19 02:05:41 +05:30
Aman Kumar
a74c2a58e2 fixed volume bug #2202 2015-02-19 01:58:24 +05:30
Shady
a7bff7a011 Update he.coffee - 2 
second update done
 2015-02-18 22:16:12 +02:00
Edward Litvinchyck
ff4487d79f Update uk.coffee 2015-02-18 21:10:33 +02:00
Nick Winter
178082d4e8 Fixed bug with dragging an item to unequip it not updating rest of state. 2015-02-18 09:57:03 -08:00
Imperadeiro98
0a332073e9 Merge pull request #2347 from divyanshu013/patch-1 
Update hi.coffee
 2015-02-18 17:35:37 +00:00
Imperadeiro98
35284a3d18 Uncommented some translations from last commit 2015-02-18 17:35:15 +00:00
Imperadeiro98
8b0a9a5c68 Merge pull request #2346 from ChaosCat/patch-2 
Update he.coffee
 2015-02-18 17:32:12 +00:00
Imperadeiro98
639da031fc Uncommented an header for last commit 2015-02-18 17:31:15 +00:00
Imperadeiro98
04daa08a97 Merge pull request #2345 from wakeup/patch-2 
Update tr.coffee
 2015-02-18 17:28:46 +00:00
Nick Winter
1795891933 Added new pow function for simulated ladder games achievement. 2015-02-18 09:06:32 -08:00
Nick Winter
1a44b3ff5a Merge pull request #2344 from laituan245/master 
Fix issue #1832 (Equipping with little equip button doesn't update big equip button)
 2015-02-18 08:58:36 -08:00
Divyanshu Maithani
e55d3251bc Update hi.coffee 2015-02-18 21:26:36 +05:30
ChaosCat
0b1b28ff8e Update he.coffee 
some updates to he.coffee
 2015-02-18 17:33:19 +02:00
Volkan Gezer
375a61fcc6 Update tr.coffee 2015-02-18 16:13:35 +01:00
Imperadeiro98
055922a967 Some fixes to last merge 2015-02-18 12:06:38 +00:00
Imperadeiro98
30f451985d Merge pull request #2340 from ChaosCat/patch-1 
Fixed errors and added more translations to he.coffee
 2015-02-18 12:05:24 +00:00
Imperadeiro98
993ca19da2 Removed blank line from names.coffee 2015-02-18 12:02:17 +00:00
laituan245
0cf16e157c Fix issue #1832 2015-02-18 16:12:19 +09:00
Nick Winter
5bc99d7c0d Merge pull request #2338 from Raxerz/patch-1 
Added more ninja names for #53
 2015-02-17 15:28:14 -08:00
Nick Winter
dc703c40b0 Merge pull request #2336 from divyanshu013/master 
Added some Hindi localizations for hi.coffee
 2015-02-17 15:26:41 -08:00
Imperadeiro98
ef8f3cff1a Couple fixes to pt-PT 2015-02-17 22:33:14 +00:00
ChaosCat
589ab03438 תיקון שגיאות והוספת מידע 
חלק מהתרגומום שונו לנוסח רשמי\ברור יותר
נא לתקן במידת הצורך
 2015-02-17 23:37:20 +02:00
Imperadeiro98
697e5a0ab3 Uncommented an header for last commit 2015-02-17 20:09:47 +00:00
Imperadeiro98
59aa6e257a Merge pull request #2337 from laituan245/master 
Update ko.coffee
 2015-02-17 20:09:12 +00:00
Nick Winter
f308379453 Fixed typo in LevelSession busting readyToRank check. 2015-02-17 11:51:52 -08:00
divyanshu013
d8716ed40b Added CodeCombat navigation from /play to / for #2044 2015-02-17 23:49:34 +05:30
Nick Winter
7d582b5cfa Better targeting of multiplayer sessions for user profile completed levels view. 2015-02-17 09:49:56 -08:00
Nick Winter
ae07a25657 Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical. 2015-02-17 09:29:21 -08:00
Rajath
31c6d9069b Added more ninja names for #53 
Added 'Itachi', 'Madara' and 'Obito' to the set of ninja names.
 2015-02-17 21:52:20 +05:30
Tuan Manh Lai
e09d6fd709 Update ko.coffee 2015-02-17 22:07:13 +09:00
Tuan Manh Lai
b1e280ccd3 Update ko.coffee 2015-02-17 21:44:41 +09:00
Imperadeiro98
5c91c7a237 Merge pull request #2334 from Kyezil/patch-1 
Update ca.coffee
 2015-02-17 11:00:27 +00:00
Tuan Manh Lai
f99239c11a Update ko.coffee 2015-02-17 15:36:51 +09:00
divyanshu013
82b3221e0d Added some Hindi localizations 2015-02-17 11:28:38 +05:30
Nick Winter
141e11f918 Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master 2015-02-16 17:13:24 -08:00
Louis Clergue
7f128f6773 Update ca.coffee 2015-02-17 00:26:58 +01:00
Imperadeiro98
158560f42d Merge pull request #2331 from vampirelower/patch-1 
Update uk.coffee
 2015-02-16 23:20:02 +00:00
Imperadeiro98
3f9169a18f Uncommented an header 2015-02-16 23:18:23 +00:00
ptsoumaki
ef5363c1cb Update el.coffee 2015-02-17 00:21:38 +02:00
Ryan Marren
b2d881807a Merge branch 'master' of https://github.com/rmarren1/codecombat 2015-02-16 17:12:38 -05:00
Ryan Marren
1a60b004a7 added achievement editor for #2304 2015-02-16 17:12:05 -05:00
Edward Litvinchyck
8ffe11fd05 Update uk.coffee 2015-02-17 00:10:58 +02:00
divyanshu013
036b72ca19 Font size tweak for #2324 
Also reduced the size for tbody data to fit properly
 2015-02-17 00:44:08 +05:30
Nick Winter
de11743df9 Merge pull request #2326 from laituan245/master 
Add type (warrior/ranger/wizard)  to hero selector modal (Issue #2307)
 2015-02-16 10:29:26 -08:00
Nick Winter
5645f7779b Changed isMultiplayer check to fix #2325. 2015-02-16 10:24:00 -08:00
Imperadeiro98
a73ccbc037 Changed language specific style in home.sass 
So that it only affects pt-BR instead of pt-PT.
 2015-02-16 18:23:42 +00:00
Nick Winter
83c25efa40 Merge pull request #2317 from rmarren1/master 
added famous computer scientist names for #53
 2015-02-16 09:33:49 -08:00
Nick Winter
c0f738d736 Fixed bug with Campaign i18n not showing fullNames properly. 2015-02-16 09:21:59 -08:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Imperadeiro98
f0619e08f3 Merge pull request #2323 from ZeAntwan/patch-2 
FR Translations and corrections
 2015-02-16 13:49:41 +00:00
Imperadeiro98
d575bb2992 Small spacing fix 2015-02-16 13:33:44 +00:00
ZeAntwan
1d332f2afe FR Translations and corrections 
Categories Translated :
- contact
- classes

Corrections :
(Note aux français) : Il faut différencier les "Subscribe" des "Sign Up". Subscribe équivaut à l'abonnement payant !
- legal > page-title

ATTENTION :
- (417) parent_button : The translation is out of box, text size need to be reduced to around 21px to fit.
 2015-02-16 14:15:17 +01:00
Imperadeiro98
b29bb787d8 Merge pull request #2320 from laituan245/laituan245-patch-1 
Update vi.coffee
 2015-02-16 11:48:58 +00:00
Imperadeiro98
6ff6d11323 Merge pull request #2322 from ZeAntwan/patch-1 
Update fr.coffee
 2015-02-16 11:46:28 +00:00
ZeAntwan
91313a0015 Update fr.coffee 
Translated following strings : 
share_progress_modal 
(309) tip_reticulating
(326) tip_superpower
(329) tip_code_never_lies
(335) : tip_move_forward
(337) : tip_adding_evil (Traduction approximative de "evil" vers "mechanceté")
subscribe (lots of things)

Correction 427 (ecriVant pas ecriSant)
 2015-02-16 03:47:57 +01:00
Tuan Manh Lai
6377484db5 Update vi.coffee 2015-02-16 01:38:58 +09:00
Tuan Manh Lai
f01b0d1b9a Update vi.coffee 2015-02-15 05:41:06 +09:00
Tuan Manh Lai
5421c4ec46 Update vi.coffee 2015-02-15 05:35:57 +09:00
Tuan Manh Lai
377d8a768d Update vi.coffee 2015-02-15 05:21:31 +09:00
Ryan Marren
0a961b03c5 added famous computer scientist names for #53 2015-02-14 11:07:24 -05:00
Barney
dd40a07fc0 Update zh-HANT.coffee 2015-02-14 21:22:02 +08:00
Barney
00242f5767 Merge remote-tracking branch 'upstream/master' 2015-02-14 16:03:22 +08:00
Nick Winter
7f2e5c4404 Achievements list now shows proper amount of gems and exp for repeatable achievements. 2015-02-13 18:55:23 -08:00
Nick Winter
c29bb432e1 Merge pull request #2314 from laituan245/master 
A small fix to the PR #2313
 2015-02-13 13:46:45 -08:00
Matt Lott
81678e81d9 Merge pull request #2315 from amankr/autocomplete2 
Autocomplete bug fix #2233 - method 2

Thanks @amankr!
 2015-02-13 13:12:22 -08:00
Aman Kumar
85a024546b Autocomplete bug fix #2233 2015-02-14 02:21:54 +05:30
Aman Kumar
224213ccb0 Autocomplete bug fix #2233 2015-02-14 02:11:00 +05:30
Imperadeiro98
8b978c0047 Removed unused string 2015-02-13 20:39:03 +00:00
laituan245
93bbedd02d A small fix to the PR #2313 2015-02-14 05:27:58 +09:00
Aman Kumar
80fb124772 Autocomplete bug fix #2233 2015-02-14 01:56:05 +05:30
Barney
140ba5f9e0 Update zh-HANT.coffee 2015-02-14 03:57:09 +08:00
Barney
248d6dd1ef Merge remote-tracking branch 'upstream/master' 2015-02-14 03:53:47 +08:00
Barney
dde3546564 Update zh-HANT.coffee 2015-02-14 03:53:44 +08:00
Scott Erickson
52e5dc4719 Removed another instance of the old scope, for #2067. 2015-02-13 11:24:06 -08:00
Scott Erickson
9b86e5872f Fixed #2067 2015-02-13 11:18:00 -08:00
Barney
e6008f2a5c Merge remote-tracking branch 'upstream/master' 2015-02-14 02:46:11 +08:00
Nick Winter
574f0b1442 Fixed #2303. Sorry, TBL. 2015-02-13 09:29:18 -08:00
Nick Winter
a9fddb8eb2 Propagated i18n. 2015-02-13 09:13:24 -08:00
Nick Winter
4fec64c3ca Merge pull request #2313 from laituan245/master 
Added a "god mode" button to the local dev environment  (issue #2164)
 2015-02-13 09:08:09 -08:00
Nick Winter
937bbf211c Thang Editor now centers unit better, lists action names in a more useful order. 2015-02-13 09:03:22 -08:00
laituan245
9c754bbd96 Added a "god mode" button to the local dev environment #2164 2015-02-14 01:46:04 +09:00
Barney
ae2d52d31a Merge remote-tracking branch 'upstream/master' 2015-02-13 23:50:25 +08:00
Barney
6f88af50f9 Update zh-HANT.coffee 2015-02-13 23:50:12 +08:00
Gutierri Barboza
74babe01ea more translations pt-br 2015-02-13 13:22:48 -02:00
Imperadeiro98
9ddbf1a102 Fixed i18n in buy-gems-modal.jade 2015-02-13 14:54:19 +00:00
Imperadeiro98
c54cd428ad Removed unused strings 2015-02-13 14:54:04 +00:00
Imperadeiro98
2785d3fa2b Fixed indentation issue in last merge 2015-02-13 14:40:36 +00:00
Imperadeiro98
6bd56e040c Merge pull request #2310 from jimmysvk/patch-3 
Around hundred new lines of Slovak translation
 2015-02-13 14:38:08 +00:00
Imperadeiro98
306c76d41d Merge pull request #2308 from ArthurLu/master 
Update zh-HANT.coffee
 2015-02-13 14:35:54 +00:00
Nick Winter
5cf37d1796 A few tweaks to visuals on PlayHeroesModal hero previews. 2015-02-13 04:09:40 -08:00
jimmysvk
6574a4b978 Around hundred new lines of Slovak translation 
Completed translations of home, nav, diplomat_suggestion, play, common, general, almost whole play_level, buy_gems, skill_docs, versions
 2015-02-13 10:19:13 +01:00
Barney
6917ebc110 Update zh-HANT.coffee 2015-02-13 13:02:47 +08:00
Barney
295ecf53c2 Merge remote-tracking branch 'upstream/master' 2015-02-13 12:34:37 +08:00
Nick Winter
991a374da2 Fixed up SpectateView for hero ladder games. Addd player names to their heroes in spectate and observation mode. Fixed #1679. 2015-02-12 19:47:57 -08:00
Nick Winter
a8dc353f86 Aether now loading all code languages possibly used in a match before the level can begin. Hopefully, this will fix #1943 and fix #1892. 2015-02-12 18:40:38 -08:00
Nick Winter
7000048bee Fixed a few more issues with the headless simulator. 2015-02-12 17:07:29 -08:00
Nick Winter
1aa738b256 Fixed up headless client, I hope. 2015-02-12 16:07:19 -08:00
Matt Lott
c4f46faf25 🐛Fix leaderboard level popup stacked buttons 
CSS initial keyword isn’t supported in IE.

Fixes #2301
 2015-02-12 14:19:19 -08:00
Matt Lott
d937feb3de 🐛Fix share progress title wrap on IE11 
Fixes #2301
 2015-02-12 13:38:55 -08:00
Nick Winter
e01e71d5e8 Fixed #2181, I hope. 2015-02-12 11:59:38 -08:00
Nick Winter
6b9d8161ef Found another place missing cache: false. 2015-02-12 11:17:23 -08:00
Nick Winter
8936d5fa40 Simulator version 2 takes into account flag history when simulating matches. 2015-02-12 10:59:34 -08:00
Imperadeiro98
1f20402bb0 Update pt-PT.coffee 2015-02-12 18:31:01 +00:00
Barney
df0a588870 Update zh-HANT.coffee 2015-02-13 02:21:52 +08:00
Imperadeiro98
42a4ca9299 Uncommented some headers 2015-02-12 17:25:31 +00:00
jimmysvk
03800e4360 Update of SVK translation 
Translated achievments, user, article, save_load, inventory, game_menu, some of play_level, some of general, rest of login, rest of nav
 2015-02-12 18:17:03 +01:00
Imperadeiro98
cf5aa3bc25 Uncommented some headers 2015-02-12 17:02:13 +00:00
Imperadeiro98
ff183b683d Merge pull request #2299 from jimmysvk/patch-1 
Some lines of SVK translation updated
 2015-02-12 17:00:37 +00:00
Nick Winter
a2a4303a83 Fixed #2109. Much less fragile naming of opponents on My Matches tab. 2015-02-12 08:50:55 -08:00
jimmysvk
892ea201eb Some lines of SVK translation updated 
Just for the begining. Looking forward to complete translation ; )
 2015-02-12 16:54:06 +01:00
Imperadeiro98
3188ba15b8 Merge pull request #2297 from laituan245/laituan245-patch-1 
Update vi.coffee
 2015-02-12 14:22:00 +00:00
Imperadeiro98
838363fd63 Uncommented an header 2015-02-12 14:20:13 +00:00
Tuan Manh Lai
cf9da099a5 Update vi.coffee 2015-02-12 17:17:19 +07:00
Tuan Manh Lai
f0ca5d1a5b Update vi.coffee 2015-02-12 17:05:41 +07:00
Melondonut
4f3ae1b73d Update ko.coffee 2015-02-12 16:26:24 +09:00
Barney
b63bbf870b Update zh-HANT.coffee 2015-02-12 13:15:22 +08:00
Nick Winter
63fa2f86d4 Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code. 2015-02-11 20:24:12 -08:00
Nick Winter
2efb6aafbc Fixed #1632. 2015-02-11 16:12:26 -08:00
Nick Winter
5ee6eaf8b4 Fixed audio upload nodes to work in Firefox. Fixed #445. 2015-02-11 15:52:15 -08:00
Nick Winter
3bdede3587 Fixed #141. 2015-02-11 15:13:38 -08:00
Nick Winter
53621f0d5d Merge pull request #2294 from mogsie/i18n-norwegian 
i18n norwegian
 2015-02-11 14:10:07 -08:00
Nick Winter
85ad3f5960 Fixed #2293. 2015-02-11 14:09:00 -08:00
Erik Mogensen (@mogsie)
fc46075b35 Merge remote-tracking branch 'upstream/master' into i18n-norwegian 2015-02-11 23:03:20 +01:00
Erik Mogensen (@mogsie)
102bb50870 i18n/nb: wording, punctuation. 2015-02-11 23:02:59 +01:00
Nick Winter
2a9bb0292d Don't dispatch simulations to old ladders, just new hero-ladder levels. Fixed typo in last cache commit. 2015-02-11 14:01:38 -08:00
Erik Mogensen (@mogsie)
71ff84538e i18n/nb: capitalization, wording. 2015-02-11 22:17:33 +01:00
Nick Winter
d09636306c Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs! 2015-02-11 13:12:54 -08:00
Tuan Manh Lai
01f5ff9d1a Update vi.coffee 2015-02-12 05:49:09 +09:00
Erik Mogensen (@mogsie)
8029ce22f0 i18n/nb: Teacher page grammar, typos, wording. 2015-02-11 21:15:30 +01:00
Erik Mogensen (@mogsie)
5dc4d52c27 Merge remote-tracking branch 'upstream/master' 2015-02-11 20:54:31 +01:00
Erik Mogensen (@mogsie)
762eaca9dc i18n: nb, grammar 2015-02-11 20:53:22 +01:00
nixel2007
f06ed33129 Update ru.coffee. fix comma 2015-02-11 22:45:56 +03:00
nixel2007
a54a9d6016 Update ru.coffee 
Translated new blocks and small fixes with You/you
 2015-02-11 22:42:46 +03:00
Imperadeiro98
9ead6600b0 Enabling translations 2015-02-11 18:58:17 +00:00
Imperadeiro98
c84d744d82 Merge pull request #2290 from laituan245/master 
Update vi.coffee
 2015-02-11 18:55:06 +00:00
Tuan Manh Lai
5e793cbbe5 Update vi.coffee 2015-02-12 01:49:08 +07:00
Tuan Manh Lai
3c67cba78e Update vi.coffee 2015-02-12 01:46:03 +07:00
Matt Lott
af343bfd82 🐛Fix share progress modal i18n 2015-02-11 10:15:03 -08:00
Nick Winter
6ff39ba48a Not showing particles in IE. 2015-02-11 09:34:27 -08:00
Imperadeiro98
10e0cf50ed Enabled some translations 2015-02-11 17:02:36 +00:00
Imperadeiro98
9f6bf3a8d2 Merge pull request #2288 from laituan245/master 
Update vi.coffee
 2015-02-11 17:01:21 +00:00
Barney
0341f50ad8 Update zh-HANT.coffee 2015-02-11 20:51:19 +08:00
Tuan Manh Lai
bacf86201a Update ko.coffee 2015-02-11 17:11:18 +09:00
Tuan Manh Lai
405f5921c4 Update vi.coffee 
Translated some words and sentences into Vietnamese
 2015-02-11 16:50:48 +09:00
Barney
bc369b94a4 Update zh-HANT.coffee 2015-02-11 15:20:40 +08:00
Barney
d1bd7b3803 Update zh-HANT.coffee 2015-02-11 14:00:02 +08:00
Melondonut
f1859a7341 Update ko.coffee 2015-02-11 13:41:20 +09:00
Melondonut
217590b930 Update ko.coffee 2015-02-11 12:16:17 +09:00
Melondonut
381c2af331 Update ko.coffee 2015-02-11 12:06:48 +09:00
Imperadeiro98
c35b925cb1 Update pt-PT.coffee 2015-02-10 22:32:52 +00:00
Matt Lott
9bda187f90 Add terrain to loaded world map event 2015-02-10 14:20:18 -08:00
Nick Winter
76f03790fd Propagated i18n. 2015-02-10 14:14:14 -08:00
Nick Winter
413edb3b4c Deleted no.coffee in favor of nb.coffee and nn.coffee as discussed in #2284. 2015-02-10 14:13:15 -08:00
Erik Mogensen (@mogsie)
36d5f132cc Norwegian translation: Some typos and punctuation. 2015-02-10 22:44:12 +01:00
Erik Mogensen (@mogsie)
ab8346c6b2 Better tanslation from @matifol. 2015-02-10 22:31:02 +01:00
Erik Mogensen (@mogsie)
427aea9457 Fix speling. 2015-02-10 22:29:14 +01:00
Popey456963
da64bea348 Revert "Remove Hour of Code References from teachers.jade" 
This reverts commit b30c0d059a.
 2015-02-10 21:14:34 +00:00
Popey456963
b30c0d059a Remove Hour of Code References from teachers.jade 2015-02-10 21:13:06 +00:00
Nick Winter
b03d6fb3d4 Merged nb.coffee. 2015-02-10 12:54:25 -08:00
Nick Winter
a610bac948 Merge pull request #2261 from mogsie/master 
More norwegian translations.
 2015-02-10 12:50:18 -08:00
Nick Winter
106ba5acda Fixed #2280. 2015-02-10 12:49:28 -08:00
Nick Winter
afe94afd08 Merge pull request #2278 from laituan245/master 
Added more names for #53
 2015-02-10 12:47:11 -08:00
Nick Winter
86fa8dd59d Merge pull request #2281 from divyanshu013/master 
Fixed the issue with the Leaderboard view to fit properly for #2254
 2015-02-10 12:45:54 -08:00
Erik Mogensen (@mogsie)
62baa53ec0 Fix missing " 2015-02-10 21:45:17 +01:00
Nick Winter
00c8c9016c Merge pull request #2277 from AnirudhGP/patch-3 
Added some quotes for #710
 2015-02-10 12:43:57 -08:00
Nick Winter
4c716eb12a Merge pull request #2276 from AnirudhGP/patch-2 
Added some quotes for #710
 2015-02-10 12:43:44 -08:00
Nick Winter
3a80fffa15 Merge pull request #2275 from AnirudhGP/patch-1 
Added more names for #53
 2015-02-10 12:43:04 -08:00
Martin Folkeseth
1fb2771d24 Edited nb.coffee 2015-02-10 21:39:04 +01:00
Imperadeiro98
c37398b2c1 Small fix to last merge 2015-02-10 19:57:34 +00:00
Nick Winter
db2b0c29fe Merginated. 2015-02-10 11:54:57 -08:00
Barney
201ef800bc Merge remote-tracking branch 'upstream/master' 2015-02-11 03:38:47 +08:00
Barney
31c5ce30cd Update zh-HANT.coffee 2015-02-11 03:38:43 +08:00
Imperadeiro98
92b8e2354e Small fix to last merge 2015-02-10 19:27:27 +00:00
Imperadeiro98
94cfe2011c Merge pull request #2282 from matifol/patch-1 
Translated share_progress_modal
 2015-02-10 19:25:56 +00:00
Imperadeiro98
d8eea3923f Small fix to last commit 2015-02-10 19:09:11 +00:00
Imperadeiro98
92b80b591d Merge pull request #2283 from ArthurLu/master 
Update zh-HANT.coffee
 2015-02-10 19:07:26 +00:00
Imperadeiro98
8264048f31 Merge pull request #2271 from jhoon/translations-es-419 
Translating share_progress_modal section
 2015-02-10 18:58:32 +00:00
Barney
2e4c261ada Update zh-HANT.coffee 2015-02-11 02:27:54 +08:00
Martin Folkeseth
28f6c5dc38 Translated share_progress_modal 
Kept all the old strings for future reference.
 2015-02-10 19:06:51 +01:00
divyanshu013
2b090a9841 Fixed the issue with the Leaderboard view to fit properly for #2254 
The leaderboard view fits properly while scrolling down.
 2015-02-10 23:27:23 +05:30
Barney
2546082eaf Update zh-HANT.coffee 2015-02-11 01:02:37 +08:00
laituan245
70ec7996c2 Added more names for #53 2015-02-10 23:26:02 +09:00
Anirudh GP
b422508f2d Added some quotes for #710 2015-02-10 14:41:04 +05:30
Anirudh GP
ada239b50d Added some quotes for #710 2015-02-10 14:41:03 +05:30
Anirudh GP
9184588969 Added more names for #53 2015-02-10 14:32:02 +05:30
Barney
6b8e9ad808 Update zh-HANT.coffee 2015-02-10 14:04:43 +08:00
Barney
60ff41ccf4 Merge remote-tracking branch 'upstream/master' 2015-02-10 13:12:11 +08:00
Barney
16708aacc8 Update zh-HANT.coffee 2015-02-10 13:12:09 +08:00
FedericoTomas
fa5134d09b Actualizando(Update) 
Actualice un poco.
 2015-02-10 01:18:25 -03:00
Jhoon Saravia
f2534e2098 Translating leaderboard section and some tips 2015-02-09 18:22:52 -05:00
Jhoon Saravia
c9c8c3e755 Translating share_progress_modal 2015-02-09 18:08:59 -05:00
Matt Lott
c4620a7b2d Refactor analytics event logging 
Clean up property slimming.
Save explicit identity traits in properties.
 2015-02-09 15:03:04 -08:00
Martin005
44fb8281bf Update cs.coffee 
Finally done all translations :)
 2015-02-09 23:22:04 +01:00
Nick Winter
abbab26d80 Using i18n for achievement descriptions in HeroVictoryModal. 2015-02-09 13:06:00 -08:00
Imperadeiro98
92531e366b Update en.coffee 2015-02-09 20:01:51 +00:00
Imperadeiro98
8718cd280f Added i18n 2015-02-09 20:00:52 +00:00
Imperadeiro98
f062f446d3 Fixed i18n 2015-02-09 19:57:28 +00:00
Imperadeiro98
bebada7f43 Update pt-PT.coffee 2015-02-09 19:50:18 +00:00
Imperadeiro98
8fb8e139b7 Small indentation fix 2015-02-09 19:47:09 +00:00
Nick Winter
19a9d8c9aa Propagated i18n. 2015-02-09 11:31:42 -08:00
Nick Winter
16a8478f97 Merginated. 2015-02-09 11:30:52 -08:00
Nick Winter
5decf7ae36 Workaround for #2259, although I haven't been able to reproduce when it happens. 2015-02-09 11:11:52 -08:00
Nick Winter
7b34f90230 Added rough draft of subscribe button in gem shop. 2015-02-09 09:22:18 -08:00
Nick Winter
c2a4700aa2 Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well. 2015-02-09 08:42:24 -08:00
Nick Winter
61896083a9 Missed my save on that last one. 2015-02-09 08:39:40 -08:00
Nick Winter
1c41c1df91 Merged more tips in en.coffee. 2015-02-09 08:38:29 -08:00
Nick Winter
65c0abd3ab Merged those tips in en.coffee. 2015-02-09 08:35:38 -08:00
Nick Winter
b2dc80b467 Merged those loading tips. 2015-02-09 08:34:13 -08:00
Nick Winter
7ee7269d39 Merge pull request #2191 from JKniager/patch-1 
Added More Names
 2015-02-09 08:32:32 -08:00
Nick Winter
0cee873157 Moved new buy gems background from compiled output to input dir. 2015-02-09 08:31:06 -08:00
Nick Winter
22c2c7df63 Fixed bug with incompletely added levels jamming the campaign editor. 2015-02-09 08:19:59 -08:00
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