nixel2007
d74a86d06a
Merge remote-tracking branch 'upstream/master'
2014-12-24 15:19:43 +03:00
Nick Winter
f361674fb4
Enabling new levels for playtesting.
2014-12-23 17:14:59 -08:00
Nick Winter
f0826c865e
Preparing new campaign levels for migration to new campaign editor.
2014-12-23 17:14:35 -08:00
Nick Winter
f17b3bd03b
Fixed indentation and punctuation for superpower tip.
2014-12-23 07:57:07 -08:00
Nick Winter
48603e5bc8
Merge pull request #1985 from osanseviero/patch-3
...
New tip
2014-12-23 07:56:19 -08:00
Omar S.
9a30c35a3b
New tip
...
Added superpower tip
2014-12-23 09:54:57 -05:00
Omar S.
f48c2b0def
New tip
...
Added superpower tip
2014-12-23 09:54:31 -05:00
Scott Erickson
96c8e035cf
Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema.
2014-12-23 09:42:24 -05:00
Scott Erickson
b567e737cd
Tweaked campaign editor styling.
2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443
Tweaked campaign editor styling.
2014-12-23 09:19:08 -05:00
Scott Erickson
1bb76d5902
Fixed shadow placements.
2014-12-23 09:12:41 -05:00
Imperadeiro98
31ed540964
Merge pull request #1983 from tpai/patch-1
...
Update zh-HANT.coffee
2014-12-23 09:06:33 +00:00
tonypai
30eb96f151
Update zh-HANT.coffee
2014-12-23 16:01:33 +08:00
Nick Winter
5e3ae981d7
Merge pull request #1981 from Lynxbob/master
...
Added 3 new name lists and 10 new names
2014-12-22 17:40:51 -08:00
Branden Webb
eb3e0621f2
Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F.
2014-12-22 20:07:22 -05:00
Omar S.
3ed3dd00fa
Added two names
2014-12-22 18:19:57 -05:00
Scott Erickson
d18260c20c
Merge branch 'master' into feature/campaign-editor
2014-12-22 16:39:07 -05:00
Scott Erickson
0bdec68cfc
Set up a save button.
2014-12-22 16:21:57 -05:00
George Saines
116feb5bea
turning off realtime playback on the riddling kithmaze
2014-12-22 11:11:43 -08:00
Imperadeiro98
72e426c0e0
Fixed another link
2014-12-22 18:16:06 +00:00
Scott Erickson
0dd2d9efbd
Handled merge conflict.
2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889
Set up the CampaignEditorView to trigger the CampaignView to re-render when things change.
2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236
When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView.
2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d
Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView.
2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0
Hooked up the CampaignView to show adjacent campaigns based on the data.
2014-12-22 10:29:29 -05:00
Rishi
364f40274d
Update SpellView.coffee
...
hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .
2014-12-22 18:06:32 +05:30
Imperadeiro98
2bca94161e
Fixed a link
2014-12-22 11:22:06 +00:00
Nick Winter
e153a7ecce
Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking.
2014-12-21 21:38:12 -08:00
Matt Lott
e7c626656e
No-cache User fetch in hero victory
...
After earning achievements. On IE, this call results in a cache hit,
so the User object was never updated with the sweet sweet loot you just
earned. Like a sword you need for True Names.
2014-12-21 21:14:38 -08:00
Imperadeiro98
8da578e106
Update en.coffee
2014-12-21 21:46:45 +00:00
Imperadeiro98
393860ffa4
Update en.coffee
2014-12-21 21:30:15 +00:00
Imperadeiro98
0c00f9f0c1
Delete contribute_nav.jade
2014-12-21 21:09:52 +00:00
Imperadeiro98
5d9e303fb1
Added Martin005
2014-12-21 20:53:43 +00:00
Imperadeiro98
2b0757810c
Merge pull request #1973 from uaMithril/patch-3
...
Update uk.coffee
2014-12-21 20:11:47 +00:00
Imperadeiro98
0cbf76bc36
Merge pull request #1972 from uaMithril/patch-2
...
Update uk.coffee
2014-12-21 20:09:58 +00:00
Imperadeiro98
81eb028025
Merge pull request #1971 from tpai/patch-1
...
Update zh-HANT.coffee
2014-12-21 20:09:14 +00:00
Imperadeiro98
0c01a4ed8c
Merge pull request #1964 from Martin005/patch-5
...
Update cs.coffee
2014-12-21 20:02:27 +00:00
Mithril
837b62ee9d
Update uk.coffee
2014-12-21 13:51:18 +02:00
Mithril
7ad505252b
Update uk.coffee
2014-12-21 13:03:48 +02:00
tonypai
e815dff1de
Update zh-HANT.coffee
...
Hi, I've already sign the CLA, and this is my PR. :)
2014-12-21 16:13:40 +08:00
Nick Winter
e8d185a860
Embedding level completion checklist inside the level editor.
2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5
Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings.
2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b
Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level.
2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a
Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699 . Fixed #57 . Colored collision overlays according to collision categories.
2014-12-20 13:39:51 -08:00
Martin005
eed3043a6d
Update cs.coffee
2014-12-20 19:00:56 +01:00
Imperadeiro98
a52bf08792
Fixed links
2014-12-20 09:32:59 +00:00
Imperadeiro98
6ebf25ad15
Linked community page to new i18n
2014-12-20 09:28:56 +00:00
Imperadeiro98
bd5184c23b
Update pt-PT.coffee
2014-12-20 09:12:31 +00:00
Nick Winter
08cb87c84d
Automatically take screenshots when submitting contact form from level view.
2014-12-19 18:37:42 -08:00
Nick Winter
0041ffe423
Propagated i18n.
2014-12-19 15:36:16 -08:00
Nick Winter
2df1318e1b
Hooked up i18n for redesigned contribute view.
2014-12-19 15:35:18 -08:00
Scott Erickson
0cd85d7aba
Got the CampaignView mostly off the hardcoded data.
2014-12-19 16:46:01 -05:00
Imperadeiro98
4ca342c389
Fixed spacing
2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44
Merge pull request #1940 from uaMithril/patch-1
...
Update uk.coffee
2014-12-19 20:45:19 +00:00
David Nagy
0c88f9f39c
Update hu.coffee
2014-12-19 20:18:08 +00:00
Scott Erickson
a742772b8f
Also added campaign view jade and sass file clones.
2014-12-19 13:06:20 -05:00
Scott Erickson
23da22a559
Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data.
2014-12-19 13:04:04 -05:00
Scott Erickson
59318b2f78
Merge branch 'master' into feature/campaign-editor
2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce
Separating contact emails into premium subscriber support and basic general support.
2014-12-18 20:35:14 -08:00
George Saines
31fb5fe80e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1
redesigned the contribute page
2014-12-18 16:31:30 -08:00
Matt Lott
f853259304
Updating help videos
...
Moving dungeons-of-kithgard to Vimeo
Adding original style for haunted-kithmaze
2014-12-18 14:04:48 -08:00
Matt Lott
f2835a998a
Add second kith maze help video
2014-12-18 12:05:10 -08:00
Matt Lott
7c87dc0c3a
Make spell palette help label a button
2014-12-18 00:19:40 -08:00
Matt Lott
70cd8aa20d
Update Vimeo embed player params
2014-12-17 23:59:59 -08:00
Matt Lott
9d4c3cc163
A/B Test video tutorial styles
2014-12-17 23:55:11 -08:00
Scott Erickson
b63b4d64da
More work on the CampaignEditorView. Data gets saved to models now.
2014-12-17 22:53:04 -08:00
Matt Lott
d494dc9c79
Add video tutorials to game guide
2014-12-17 22:26:36 -08:00
Nick Winter
fe0c89e433
Reverting 1167655f
and 30ed0a0e
to re-enable the analytics log handler.
2014-12-17 21:54:56 -08:00
Nick Winter
1b584ae72c
Some fixes for desert campaign options.
2014-12-17 19:37:57 -08:00
nemoyatpeace
0496c9338d
Update SpellView.coffee
...
Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy
2014-12-18 09:10:07 +08:00
Nick Winter
da72991260
A few misc tweaks for the new desert level options.
2014-12-17 12:42:42 -08:00
nixel2007
97cdb76b82
Fixed i18n-coverage bug
...
Added analysis of the translation of all available properties
2014-12-17 23:21:54 +03:00
Imperadeiro98
d1e4a98981
Merge pull request #1947 from Martin005/patch-4
...
Update cs.coffee
2014-12-17 15:42:48 +00:00
Martin005
821f31f02e
Update cs.coffee
2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493
Update pt-BR.coffee
2014-12-17 08:56:31 -02:00
Nick Winter
a98deb1ff8
Making item requiring smarter about which slots can be required for non-warriors.
2014-12-16 18:57:54 -08:00
Scott Erickson
1cc6a97e43
Added basic campaign view, working on campaign handlers.
2014-12-16 17:46:24 -08:00
Nick Winter
6e6ce6cd27
Added Minesweeper original.
2014-12-16 16:40:14 -08:00
Matt Lott
1167655faf
Disable internal event tracking
...
Tracking down a server CPU issue.
2014-12-16 16:38:17 -08:00
Nick Winter
688a8dc624
Thangs can now respect custom Component colorization.
2014-12-16 12:59:39 -08:00
Imperadeiro98
31953660f4
Fixed some commented translations
2014-12-16 20:16:42 +00:00
Martin005
50058147ed
Update cs.coffee
...
Adding some translations again, hopefully will do them all.
2014-12-16 21:05:50 +01:00
George Saines
9d72c37876
removing gradient
2014-12-16 11:41:07 -08:00
Nick Winter
17db7c111c
Merged zh-HANS.coffee again.
2014-12-16 10:49:01 -08:00
Nick Winter
79b3d8d1a2
Merged zh-HANS.coffee.
2014-12-16 10:47:48 -08:00
nixel2007
fcc5fb7537
Update ru.coffee
...
problem_alert_help
2014-12-16 15:28:02 +03:00
Eric Shen
ec00b74c92
Update zh-HANS.coffee - account profile & employer
2014-12-16 15:57:23 +08:00
Matt Lott
f1d7fb5fbd
Add help button to problem alert
2014-12-15 15:11:27 -08:00
Mithril
6554800fbd
Update uk.coffee
...
Added some translations
2014-12-16 00:38:55 +02:00
Matt Lott
eadde0590e
Turn off fast hero victory modal A/B test
...
Didn’t make a difference in level completion, opting for no delay in
showing the modal buttons.
2014-12-15 14:05:37 -08:00
Matt Lott
c76662c967
Log analytics events internally
2014-12-15 11:45:12 -08:00
Matt Lott
5817553d54
Remove virtual page view tracking
...
Wasn’t useful, and distorts our GA real page view analytics.
2014-12-15 10:28:40 -08:00
Rubiconline
52853a31b5
Update fr.coffee
...
Only minor corrections
2014-12-14 21:06:06 +01:00
Igzok
d6642d83d2
Update fr.coffee
2014-12-14 18:48:42 +00:00
Rubiconline
37476e7849
Update fr.coffee
2014-12-14 19:30:44 +01:00
Nick Winter
72d4cad858
Fixed analytics tracking a whole level instead of just its name in one case. Fixed a Sarven typo.
2014-12-14 07:54:50 -08:00
Nick Winter
68678a6057
Add upcoming desert levels to the world map.
2014-12-13 19:43:12 -08:00
Nick Winter
3b2bebf427
Ended HoC sale.
2014-12-13 09:00:33 -08:00
nixel2007
6d480820f3
Update ru.coffee
2014-12-13 17:45:24 +03:00
Nick Winter
dec11d77f5
Uncommented some zh-HANT section headers.
2014-12-13 06:32:59 -08:00
Nick Winter
62ad7a3d10
Merge pull request #1927 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-13 06:30:52 -08:00
jibaigao
77202c9bd7
Update zh-HANT.coffee
2014-12-13 13:13:35 +01:00
Imperadeiro98
2c6756675d
Update pt-PT.coffee
2014-12-13 08:58:45 +00:00
Nick Winter
4d347e0d5f
Propagated i18n.
2014-12-12 16:13:18 -08:00
Nick Winter
719ca503fb
Merge pull request #1925 from jibaigao/patch-1
...
Update zh-HANT.coffee
2014-12-12 16:12:09 -08:00
Nick Winter
25b91f900d
Merge pull request #1926 from Imperadeiro98/master
...
Internationalized more stuff
2014-12-12 16:11:03 -08:00
Scott Erickson
b0de331a10
Shored up stripe transaction payment defences to try and fix #1906 .
2014-12-12 15:27:58 -08:00
Imperadeiro98
a6653501e5
Update en.coffee
2014-12-12 22:35:22 +00:00
Imperadeiro98
f98469122a
Update i18n-edit-model-view.jade
2014-12-12 22:35:16 +00:00
Imperadeiro98
9c911ce149
Update thang-type-edit-view.jade
2014-12-12 22:32:19 +00:00
Imperadeiro98
e609ea7c5c
Update edit.jade
2014-12-12 22:25:17 +00:00
jibaigao
023f150b5a
Update zh-HANT.coffee
2014-12-12 23:16:30 +01:00
Imperadeiro98
3ab5ee22c9
Update versions-modal.jade
2014-12-12 22:15:10 +00:00
Imperadeiro98
72485eb5a9
Update patches.jade
...
Couldn't figure out how to handle "Pending", "Accepted", etc.
2014-12-12 22:04:21 +00:00
Imperadeiro98
237b022147
Update edit.jade
2014-12-12 21:43:20 +00:00
Scott Erickson
e5c5f0ba04
Fixed Karma client test runner.
2014-12-12 13:12:35 -08:00
Nick Winter
71ad9248ca
Merge pull request #1923 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-12 10:01:31 -08:00
Imperadeiro98
93e8691291
Update pt-PT.coffee
2014-12-12 16:55:08 +00:00
nixel2007
050de32163
Update ru.coffee
2014-12-12 19:51:49 +03:00
Nick Winter
f04bb3d030
Propagated i18n.
2014-12-12 08:40:57 -08:00
Imperadeiro98
091f80daff
Update en.coffee
2014-12-12 16:33:16 +00:00
Imperadeiro98
a793339ee1
Update contact.jade
2014-12-12 16:28:56 +00:00
Nick Winter
b897055618
Added translation key for subscription status label.
2014-12-12 07:27:28 -08:00
Nick Winter
5d030a96ac
Fixed some indentation typos in es-419.coffee.
2014-12-12 06:59:44 -08:00
Nick Winter
d90fb60eb2
Merge pull request #1910 from FedericoTomas/patch-5
...
Updated..
2014-12-12 06:58:01 -08:00
Nick Winter
ea22264d68
Fixed some indentation typos in de-CH.coffee.
2014-12-12 06:57:13 -08:00
Nick Winter
31ded35a97
Merge pull request #1899 from LetsPlentendo/patch-1
...
Some more translations made...
2014-12-12 06:55:42 -08:00
Nick Winter
3941606912
Merge pull request #1913 from Rubiconline/patch-4
...
Update fr.coffee
2014-12-12 06:48:37 -08:00
Nick Winter
5a66a914eb
Temporarily turning off achievement popups in IE and synchronous multiplayer sessions in PlayLevelView for non-admins due to bugginess.
2014-12-12 06:40:32 -08:00
Matt Lott
d17cd6a2c1
No multiplayer in game-menu for non-ladder levels
...
This is a point fix to prevent single player level sessions from
setting multiplayer=true, which results in a bus.connect() in
playlevelview, which can result in a Firebase blocking error.
2014-12-11 22:05:18 -08:00
Matt Lott
0c81942c71
2nd HoC sub sale
2014-12-11 18:39:03 -08:00
Rubiconline
7736ce3f98
Update fr.coffee
2014-12-11 23:26:49 +01:00
FedericoTomas
ae0917511e
Updated..
...
I check it all on Microsoft World, the archive had a lot of wrong translations... i corrected a lot.
Pd: Someone use google translate to edit the archive, and google translate sucks...(at least long sentences)
2014-12-11 19:09:45 -03:00
Nick Winter
2d7ac81221
Merge pull request #1907 from nykkole/patch-2
...
Update de-DE.coffee
2014-12-11 12:17:51 -08:00
Nick Winter
34bb14935a
Merge pull request #1908 from fcrozetta/patch-2
...
Update pt-BR.coffee
2014-12-11 12:17:21 -08:00
jibaigao
759a0675ad
Update zh-HANT.coffee
2014-12-11 21:12:50 +01:00
Fernando H. Crozetta
9c4c320542
Update pt-BR.coffee
...
More text translated to PT-BR
2014-12-11 17:55:10 -02:00
nykkole
6096a4eef3
Update de-DE.coffee
...
Translated some sentences.
2014-12-11 11:45:49 -08:00
Scott Erickson
0b81796333
Created the Campaign foundation: schema, model, handler.
2014-12-11 11:26:28 -08:00
Imperadeiro98
2a7d9eb934
Update pt-PT.coffee
2014-12-11 15:29:02 +00:00
Nick Winter
1ef58bcfce
Propagated i18n.
2014-12-11 07:02:08 -08:00
Nick Winter
ce36fa461f
Fixed i18n typo that Imperadeiro98 noticed.
2014-12-11 06:57:58 -08:00
Nick Winter
0bed8dc460
Merged es-419.coffee.
2014-12-11 06:49:26 -08:00
Nick Winter
d6d9888811
Merged ru.coffee.
2014-12-11 06:41:49 -08:00
Nick Winter
52400c8f18
Merged de-DE.coffee.
2014-12-11 06:37:01 -08:00
Nick Winter
0e5de952e3
Activated a few translations for #1896 .
2014-12-11 06:34:54 -08:00
Nick Winter
629fe6188e
Merge pull request #1896 from AtaZh/patch-1
...
Update uk.locale
2014-12-11 06:31:31 -08:00
Nick Winter
01f31f5007
Merge pull request #1894 from Rubiconline/patch-3
...
Update fr.coffee
2014-12-11 06:30:10 -08:00
Nick Winter
21870a0ce3
Added some indentation for #1903 .
2014-12-11 06:29:33 -08:00
Nick Winter
d129f29d05
Merge pull request #1903 from FedericoTomas/patch-3
...
Update es-419.coffee
2014-12-11 06:27:34 -08:00
Nick Winter
4cfff26b39
Uncommented some hu.coffee section headers for #1891 .
2014-12-11 06:25:44 -08:00
Nick Winter
e7bcc61f76
Merge pull request #1891 from divaDseidnA/patch-5
...
Update hu.coffee
2014-12-11 06:23:54 -08:00
Nick Winter
9f909f28cf
Merged de-DE.coffee
2014-12-11 06:22:47 -08:00
Nick Winter
46b2906151
Merge pull request #1887 from nixel2007/master
...
ru_RU.coffee. account_profile, ladder_prizes, employers, admin, misc
2014-12-11 06:16:22 -08:00
Nick Winter
bfbcdd4be6
Merge pull request #1886 from Imperadeiro98/patch-1
...
Update pt-PT.coffee
2014-12-11 06:15:44 -08:00
Nick Winter
7b9f4bcbc4
Merged pt-BR.coffee.
2014-12-11 06:15:07 -08:00
Nick Winter
f73bf73344
Merged zh-HANS.coffee.
2014-12-11 06:09:23 -08:00
jmigual
4554514532
Added some translations
...
Added some translations and fixed spelling errors.
2014-12-11 12:59:08 +01:00
nixel2007
ae1aca8917
update ru.coffee. Line-sync to en, more translation
2014-12-11 13:55:01 +03:00
Nick Winter
e37c1afc17
Properly ended HoC sale price.
2014-12-10 21:24:42 -08:00
Nick Winter
dae39321e2
Properly ended HoC sale price.
2014-12-10 21:21:00 -08:00
Matt Lott
d4cfaac7e5
Sub price test
2014-12-10 16:05:55 -08:00
FedericoTomas
7aae2096de
Update es-419.coffee
2014-12-10 19:22:52 -03:00
Scott Erickson
02953d0e6c
Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page.
2014-12-10 13:42:12 -08:00
Nick Winter
84cdc5d150
Undisabled new adventurer levels.
2014-12-10 11:28:06 -08:00
Scott Erickson
e870de6146
Tweaked SpriteParser to be smarter about finding root MovieClips and shifting their bounds.
2014-12-10 11:22:47 -08:00
Nick Winter
87c34e81c6
Using new border image popover backgrounds.
2014-12-10 11:00:52 -08:00
Scott Erickson
94a400bfd8
Hero icons now show up on the world map on levels where you can unlock them.
2014-12-10 10:45:11 -08:00
Nick Winter
f8661c4a96
Added the lock image, actually.
2014-12-10 10:40:10 -08:00
Nick Winter
239f94697f
Fixed IE hero lock image.
2014-12-10 10:37:57 -08:00
Nick Winter
d51db43823
Added desert campaign.
2014-12-10 10:00:52 -08:00
Nick Winter
2b0231e95f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-10 09:45:34 -08:00
Scott Erickson
bf80307142
Put in new, smaller versions of the world map and loading wings for smaller screens.
2014-12-10 09:45:00 -08:00
LetsPlentendo
9fe8e80fba
Some more translations made...
2014-12-10 14:12:35 +01:00
kisik21
da843f2d57
Fixed ru.coffee
...
fixed error: coffeescript_error at line 627
2014-12-10 16:05:04 +03:00
kisik21
6a13c9b0f8
Update ru.coffee
...
Перевел еще немного. Можете кидаться в меня тапками, но большинство переведенного находится в разделе найма работников. Большая часть остального уже переведена. Вот какой должна быть командная работа!
Translated more things. You can kill me, but big part of this update is in recruiting dashboard. Other things are mostly already translated. That's what the team work should be!
2014-12-10 15:55:34 +03:00
nixel2007
83033287ad
Update DiplomatView.coffee
...
Added myself as ru-diplomat.
2014-12-10 13:20:54 +03:00
nixel2007
72d81630c4
update ru
...
employers, admin blocks, misc
2014-12-10 13:15:55 +03:00
Nick Winter
b65bc2dd39
Show cool victory text image for players with language defaulted to English.
2014-12-09 19:23:11 -08:00
nykkole
d9a96c3812
Update de-DE.coffee
...
Translated some sentences
2014-12-09 17:17:57 -08:00
George Saines
40582e97bd
adding desert map
2014-12-09 16:16:55 -08:00
Matt Lott
fbece1ddd0
Only show sync pvp UI to admins
...
Sync PVP isn’t ready for primetime.
2014-12-09 14:30:50 -08:00
Nick Winter
33ea572cdf
You know, actually call the method that starts simulating.
2014-12-09 14:21:55 -08:00
Nick Winter
a9247c5018
Decreased amount of unintended menu-button-click sounds.
2014-12-09 14:01:03 -08:00
Matt Lott
8df3eed824
Add revenue tracking to analytics
2014-12-09 13:57:04 -08:00
Scott Erickson
46f7bbaaf5
Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks.
2014-12-09 13:41:44 -08:00
Nick Winter
8791eded2c
Starting to add Patrol Buster to the world map.
2014-12-09 12:38:58 -08:00
AtaZh
4a5f2f0630
Update uk.locale
...
Translated several strings, put some commas, capitalized letter 'в' in a polite form 'Ви' (=You), made some other corrections.
Translated but didn't uncomment some unclear phrases for me.
Hope, I didn't delete smth on the go. Would be glad to be helpful.
2014-12-09 22:07:59 +02:00
jonidimo
d9945c03ba
Update es-419.coffee
...
Add some new lines in spanish
2014-12-09 17:02:58 -03:00
Rubiconline
2c92286e46
Update fr.coffee
2014-12-09 20:20:40 +01:00
Nick Winter
7651eaf6cc
Fixed A/B test to fire with default English language.
2014-12-09 11:15:03 -08:00
Nick Winter
6f437d11b1
Some work on making simulation unstoppable.
2014-12-09 09:00:34 -08:00
David Nagy
aec43c086b
Update hu.coffee
2014-12-09 14:46:58 +00:00
Nick Winter
a97baa2207
HoC sale.
2014-12-09 06:06:14 -08:00
Nick Winter
5365a9fdf1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-09 05:38:28 -08:00
fcrozetta
0c890e6f6d
Some translation (pt-BR)
2014-12-09 11:35:30 -02:00
nykkole
9f97c3feb9
Update de-DE.coffee
...
Translated some sentences.
For the lines 378, 379, 610-613 it might be helpful for the translations to get a bit of context.
Thank you!
nykkole
2014-12-09 00:05:10 -08:00
Matt Lott
6c60f70914
Update subscribe modal copy A/B test
2014-12-09 00:04:07 -08:00
Matt Lott
1aff798c5e
A/B Test alternate subscribe modal copy
2014-12-08 23:43:52 -08:00
Nick Winter
58d549fa8a
Styled log out button on world map.
2014-12-08 18:49:45 -08:00
Nick Winter
595ca17c05
Make sessions a little more likely to save if we're not in production.
2014-12-08 16:25:21 -08:00
Matt Lott
a21a2f7c8f
Add tracking for FB and G+ signups
2014-12-08 15:00:49 -08:00
Matt Lott
b69bdfd360
A/B Test quick victory save/continue buttons
...
Fixing typo in hu.coffee
2014-12-08 14:24:33 -08:00
Nick Winter
499666d7b3
Starting to add first three desert levels.
2014-12-08 13:59:13 -08:00
David Nagy
bbd72c568b
Update hu.coffee
2014-12-08 21:55:38 +00:00
Matt Lott
b9adcd1ab2
Add signup tracking to victory modal
2014-12-08 13:45:01 -08:00
PaulaThoelen
b2196feb1c
Update nl-BE.coffee
2014-12-08 22:30:07 +01:00
nixel2007
9a302fe3d4
ru. account_profile, ladder_prizes
2014-12-09 00:19:26 +03:00
Matt Lott
3fa95b698d
Add signup tracking to game menu signup tab
2014-12-08 13:13:30 -08:00
Imperadeiro98
7e02e636e0
Update pt-PT.coffee
2014-12-08 19:56:41 +00:00
Matt Lott
fcafe5e249
Add a bit more Tracker debug info
2014-12-08 11:34:41 -08:00
Nick Winter
c42385637f
Fixed some typos with propagated i18n.
2014-12-08 11:17:55 -08:00
Nick Winter
f3f078f9e8
Propagated i18n.
2014-12-08 11:13:33 -08:00
Nick Winter
b3b3e250a1
Merge pull request #1877 from felipedelta0/patch-1
...
Update pt-BR.coffee
2014-12-08 11:10:32 -08:00
Nick Winter
5ccd5d6d24
Got rid of some memory leaks in the InventoryModal. Fixed fr subscribe section header.
2014-12-08 11:09:04 -08:00
Rubiconline
26c46d025b
Update fr.coffee
...
Extra translations
2014-12-08 19:51:49 +01:00
Nick Winter
713645e3a9
Uncommented items section header to realize a section of hu translations.
2014-12-08 10:48:59 -08:00
Nick Winter
04858101a0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-08 10:46:51 -08:00
Nick Winter
0c3c6fb181
Merge pull request #1884 from nixel2007/master
...
Update ru. lines-sync and small fixes.
2014-12-08 10:46:41 -08:00
Nick Winter
52d55449b5
Merge pull request #1883 from carteluo/patch-1
...
Update es-419.coffee
2014-12-08 10:46:08 -08:00
Nick Winter
4f10bcb235
Merge pull request #1881 from divaDseidnA/patch-3
...
Update hu.coffee
2014-12-08 10:45:48 -08:00
Nick Winter
fc84003883
Merge pull request #1878 from divaDseidnA/patch-1
...
Update DiplomatView.coffee
2014-12-08 10:45:10 -08:00
Nick Winter
6bc9d6e7cc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-08 10:42:31 -08:00
Nick Winter
39aa34e426
Updated teacher's page description now that core levels are free again.
2014-12-08 10:41:56 -08:00
nixel2007
8508118dcb
Merge remote-tracking branch 'upstream/master'
2014-12-08 21:40:04 +03:00
nixel2007
fac996e1e2
Update ru. lines-sync and small fixes.
2014-12-08 21:39:26 +03:00
Matt Lott
2da1a94ff1
Add GA page view tracking for signup finish
2014-12-08 10:34:36 -08:00
nixel2007
73731339be
Merge remote-tracking branch 'upstream/master'
2014-12-08 21:13:40 +03:00
nixel2007
c4cd59f9ae
ru
2014-12-08 21:12:56 +03:00
carteluo
5ac0c26b57
Update es-419.coffee
...
In this context "About" is better translated as "Acerca" instead of "Sobre". (Line 31)
2014-12-08 13:30:46 -04:30
David Nagy
ba2fa04080
Update hu.coffee
2014-12-08 15:23:19 +00:00
Nick Winter
d5f953ae4f
Getting rid of indexes on employers and candidates.
2014-12-08 07:07:29 -08:00
Nick Winter
d9b116959f
Cleaned up a bit of indentation in hu.coffee.
2014-12-08 06:59:52 -08:00
Nick Winter
a0c6ba9d7e
Merge pull request #1880 from divaDseidnA/patch-2
...
Update hu.coffee
2014-12-08 06:57:31 -08:00
Nick Winter
cb54e08b9b
Reducing some writes to try to help us scale up.
2014-12-08 06:56:27 -08:00
David Nagy
535b97e19f
Update hu.coffee
2014-12-08 14:56:17 +00:00
Maks Lyashuk
390b6ab410
Ukrainian list of contributors update
2014-12-08 16:37:09 +02:00
Nick Winter
74b426ffbf
Fixed #1875 .
2014-12-08 06:24:59 -08:00
fcrozetta
a5b053c87a
Revert "Update pt-BR.coffee"
...
This reverts commit 869e27965f
.
2014-12-08 12:14:23 -02:00
David Nagy
b8c1c37f5a
Update DiplomatView.coffee
2014-12-08 13:59:29 +00:00
Nick Winter
3cfa837327
Merge pull request #1873 from Imperadeiro98/patch-1
...
Update payments-view.jade
2014-12-08 05:57:59 -08:00
Nick Winter
32c75e1617
Merge pull request #1872 from ImmortalJoker/patch-3
...
Update uk.coffee
2014-12-08 05:57:18 -08:00
Nick Winter
43b9975d74
Merge pull request #1870 from Rarst/patch-1
...
Translated strings in ladder section to Ukrainian
2014-12-08 05:55:57 -08:00
felipedelta0
d7e055e756
Update pt-BR.coffee
2014-12-08 11:54:36 -02:00
Fernando H. Crozetta
869e27965f
Update pt-BR.coffee
...
Alterações para tradução para PT-BR
2014-12-08 09:49:04 -02:00
Imperadeiro98
9655d6992e
Update en.coffee
2014-12-08 08:52:14 +00:00
Imperadeiro98
a96cd4f3c0
Update payments-view.jade
2014-12-08 08:50:12 +00:00
Krasnov Ehor
6860419352
Update uk.coffee
2014-12-08 10:30:40 +02:00
Eric Shen
7ad855b1b5
Update zh-HANS.coffee
...
"account_profile" Simplified Chinese translation part 1 - 20141208
2014-12-08 16:12:13 +08:00
Matt Lott
8f5e82c54a
Update subscribe copy
...
To be more inline with free track + subscription practice/bonus levels.
2014-12-07 23:53:04 -08:00
Matt Lott
fee328212d
Add missing signup tracking data
...
And add level to subscription tracking data where appropriate.
2014-12-07 22:44:20 -08:00
Matt Lott
3deef7f5da
Turning off signup title and description A/B tests
...
These have been on a long time. Using short title and no description.
Data from Mixpanel:
Description on:
no 42.09
yes 41.91
Title length:
short 42.26
long 41.74
2014-12-07 21:32:09 -08:00
Nick Winter
7854d6bf5a
Fixed #1868 . Fixed #1846 . Made sure that home view slogan always fits in all languages.
2014-12-07 20:17:22 -08:00
Nick Winter
4a659903fe
Started A/B test for whether the AnnouncesAction and take-damage audio help.
2014-12-07 19:39:23 -08:00
Nick Winter
346ace6ac3
Fixed goals not showing up when reloading level.
2014-12-07 19:39:23 -08:00
Matt Lott
06367d106b
IE8 unsupported message
...
Had to go low-tech. IE8 doesn’t make it far enough for a nicely styled
homepage with unsupported message.
2014-12-07 18:56:59 -08:00
Nick Winter
2278e28c42
Hid tooltip arrow for game menu controls.
2014-12-07 18:05:12 -08:00
Nick Winter
5d1a34519b
Fixed up our headings font family fallback.
2014-12-07 17:57:57 -08:00
Nick Winter
01c6709c36
Implemented George's WorldMapView user status line design.
2014-12-07 16:55:08 -08:00
Nick Winter
ac4a252a5e
Fixed some border images in Firefox, and hopefully in other browsers.
2014-12-07 15:51:32 -08:00
Nick Winter
1ba57c7ae1
Fixed issues with gems prompt not laying out properly from item store details view.
2014-12-07 15:29:42 -08:00
Matt Lott
343ad28761
Fix IE9 missing console object
...
Debugging IE9 without debugging tools, when the debugging tools are
kind of the problem. Fun.
2014-12-07 15:24:15 -08:00
Nick Winter
795e58778c
Fixed some problems in InventoryModal with unequipped items not loading their images.
2014-12-07 15:14:43 -08:00
Nick Winter
08a5f70fb1
Fixed wrong item showing up selected after an item is bought from inventory.
2014-12-07 15:05:39 -08:00
Nick Winter
9f0ae9ff09
Ditched dependency on index 0 as first unlocked level, instead explicitly granting Dungeons of Kithgard.
2014-12-07 14:57:23 -08:00
Nick Winter
774d366d96
Fixed error padding issue on AuthModal.
2014-12-07 14:37:13 -08:00
Nick Winter
6880a9621e
Fixed overeager modal selection on PlayHeroesModal.
2014-12-07 14:32:23 -08:00
Nick Winter
f50898ddf5
Ditched double game-menu-open sound when opening LevelSetupManager modals.
2014-12-07 14:27:34 -08:00
Nick Winter
7a9d09654d
Fixed ellipsis and font on item names in item details view when viewed from inventory modal.
2014-12-07 14:22:59 -08:00
Nick Winter
9054f70052
Implemented new victory modal design.
2014-12-07 14:03:11 -08:00
Scott Erickson
690a24cda9
Added static imagery to the world map to show better completed, started and premium levels.
2014-12-07 13:28:32 -08:00
Andrey Savchenko
f767d82af7
Translated strings in ladder section to Ukrainian
2014-12-07 21:41:07 +02:00
Maks Lyashuk
e583964d4d
Ukrainian translation update
2014-12-07 19:54:28 +02:00
Nick Winter
7bc38ef513
Merge pull request #1865 from richard-ma/master
...
add some ZH-HANS translations
2014-12-07 08:08:49 -08:00
Richard Ma
9a4bce337d
add some ZH-HANS translations
2014-12-07 23:29:32 +08:00
nykkole
a8bcfd0cf5
Update de-DE.coffee
2014-12-07 03:57:40 -08:00
Nick Winter
12a109f146
Lowered ambient WorldMap volume. Hacked together ranger right-hand builder's hammer positioning for now.
2014-12-06 20:06:14 -08:00
Nick Winter
50624ca7bb
Hooked up some of the new voiceover sounds.
2014-12-06 18:45:15 -08:00
Nick Winter
f504490a37
Using big green button for account creation.
2014-12-06 18:18:42 -08:00
Nick Winter
d2d21db08b
Merge pull request #1862 from dmreinoso/patch-2
...
Update es-ES.coffee
2014-12-06 18:11:16 -08:00
Nick Winter
fbd0585379
Merge pull request #1861 from Imperadeiro98/master
...
Removed more wizard i18n stuff
2014-12-06 18:10:15 -08:00
Nick Winter
d53d1d5ace
Merginated.
2014-12-06 17:28:11 -08:00
Nick Winter
9bde375dcc
Implemented new AuthModal design (sans green button for signup/login).
2014-12-06 17:27:02 -08:00
Diego Reinoso
01b11027d6
Update es-ES.coffee
2014-12-06 17:49:20 -05:00
Scott Erickson
83e1fe8bfe
InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests.
2014-12-06 14:21:56 -08:00
Scott Erickson
b976a11d65
Removed the module loader modal, replaced with a simple progress bar at the top of the screen.
2014-12-06 13:11:47 -08:00
Imperadeiro98
43c0b399ed
Update keyboard_shortcuts.jade
2014-12-06 20:52:30 +00:00
Imperadeiro98
9813e7584f
Removed more wizard i18n stuff
...
I am not sure about line 278.
2014-12-06 20:41:01 +00:00
Scott Erickson
aac1aa379e
Set up stubs for future subscription sales.
2014-12-06 12:38:06 -08:00
Maks Lyashuk
bc4acde60f
Update and fix Ukrainian translation
2014-12-06 22:03:29 +02:00
Nick Winter
491a7ef456
Handling another error noted with Errorception. Updated minimum Firefox version to 25 based on seeing many (possibly non-critical) errors with it.
2014-12-06 12:02:48 -08:00
Nick Winter
708f0e543c
Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes.
2014-12-06 11:33:57 -08:00
Nick Winter
4348450a88
Removed old wizard_settings i18n keys. Propagated i18n.
2014-12-06 11:07:28 -08:00
Nick Winter
477ebb3c48
Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit.
2014-12-06 11:05:52 -08:00
Nick Winter
bba78970ea
Deleted WizardSettingsView.
2014-12-06 10:23:26 -08:00
Scott Erickson
62cab1e76b
Admins can now give users discounts and free accounts from the MainAdminView view.
2014-12-06 10:05:52 -08:00
Nick Winter
f189eafe0c
Activated a few more Czech translations.
2014-12-06 09:51:05 -08:00
Nick Winter
dd0d58dcb5
Merge pull request #1855 from Martin005/patch-1
...
Update cs.coffee
2014-12-06 09:49:53 -08:00
Nick Winter
00e6ce5f45
Couldn't reproduce #1851 , but this should work around the error if it happens again.
2014-12-06 09:46:37 -08:00
Nick Winter
175cdb5151
Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing.
2014-12-06 09:35:13 -08:00
Nick Winter
e9ab0c1f4d
Merge pull request #1859 from dmreinoso/patch-1
...
Update es-ES.coffee
2014-12-06 09:09:24 -08:00
Nick Winter
7d2d2776c8
Restricted crude-glasses in more later levels so it'd be less likely to get them equipped after the wooden ones should be on your face.
2014-12-06 08:37:13 -08:00
dmreinoso
30d6db8ca4
Update es-ES.coffee
2014-12-06 10:31:00 -05:00
Nick Winter
061e52e181
Merge pull request #1858 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-06 07:21:08 -08:00
Nick Winter
560a8c7b72
Merge pull request #1856 from Lirai/patch-3
...
Update de-DE.coffee
2014-12-06 07:20:21 -08:00
Imperadeiro98
1a8bf81258
Update pt-PT.coffee
2014-12-06 12:55:07 +00:00
Anders Bernard
ac9d173201
Update de-DE.coffee
2014-12-06 12:35:44 +01:00
Anders Bernard
dbaffde2a0
Update de-DE.coffee
2014-12-06 12:16:10 +01:00
Martin005
56e243a656
Update cs.coffee
2014-12-06 12:07:23 +01:00
nixel2007
8619f43801
Update ru.
...
Sync lines to en.coffee a bit
2014-12-06 13:16:58 +03:00
nixel2007
2e6ada0935
Update ru.
...
Today subscription update and small fixes.
2014-12-06 13:07:25 +03:00
Nick Winter
6a26681fec
Minor level progression tweak.
2014-12-05 18:30:31 -08:00
Nick Winter
bbc25a0877
Updated next level links.
2014-12-05 18:29:15 -08:00
Nick Winter
c7e2398f7c
Fixed some bugs with hero doll placement and dungeon unlocks.
2014-12-05 18:16:58 -08:00
Nick Winter
07f7e7473d
Merged.
2014-12-05 17:27:33 -08:00
Nick Winter
6596bde758
Right, don't need that in there.
2014-12-05 17:25:20 -08:00
Scott Erickson
836d2905b9
Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties.
2014-12-05 17:19:52 -08:00
George Saines
640b841306
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-05 16:57:44 -08:00
George Saines
04a6ab3734
resizing large img files, adding buttons for victory modal
2014-12-05 16:57:39 -08:00
Nick Winter
6344b0c1a3
Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only.
2014-12-05 15:46:15 -08:00
Nick Winter
8932cef46d
Merge pull request #1850 from Lirai/patch-1
...
Update de-DE.coffee
2014-12-05 15:46:09 -08:00
Matt Lott
d6265a4065
Fix default locked code css
...
Couldn’t get multiple ranges to highlight ranges correctly, so leaving
it on for python and coffeescript only.
2014-12-05 14:15:43 -08:00
Scott Erickson
209836c172
Fixed user patching to not also unsubscribe subscribers.
2014-12-05 14:11:38 -08:00
Anders Bernard
3304fedb16
Update de-DE.coffee
2014-12-05 22:16:48 +01:00
Nick Winter
fd88056123
Merge pull request #1849 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-05 12:54:38 -08:00
Imperadeiro98
074c16733b
Update pt-PT.coffee
2014-12-05 20:23:06 +00:00
Imperadeiro98
7a89d30bb6
Update pt-PT.coffee
2014-12-05 20:21:13 +00:00
nixel2007
9a2bc14bad
merge remote
2014-12-05 20:15:59 +03:00
nixel2007
793fbfcd18
Merge remote-tracking branch 'upstream/master'
2014-12-05 20:08:29 +03:00
Nick Winter
fb4646b1dd
Propagated i18n.
2014-12-05 09:08:26 -08:00
nixel2007
171d862fcf
ru
...
community block, skill_docs done, small fixes
2014-12-05 20:07:50 +03:00
Nick Winter
723209642c
Merge pull request #1845 from Imperadeiro98/patch-1
...
Fixed some i18n
2014-12-05 08:56:11 -08:00
Nick Winter
b01b74cdc8
Merge pull request #1843 from Lirai/patch-2
...
Update de-DE.coffee
2014-12-05 08:54:57 -08:00
Nick Winter
8b62b6ec44
Temporary workaround for #1842 .
2014-12-05 07:55:17 -08:00
Imperadeiro98
bf7872b059
Update legal.jade
2014-12-05 15:54:35 +00:00
Imperadeiro98
f089531aac
Update en.coffee
2014-12-05 15:43:54 +00:00
Imperadeiro98
e4be319875
Update legal.jade
2014-12-05 15:43:37 +00:00
Imperadeiro98
afbc669742
Update en.coffee
2014-12-05 15:41:31 +00:00
Imperadeiro98
7cd8a57d1e
Update legal.jade
2014-12-05 15:38:42 +00:00
Imperadeiro98
203b407b4b
Update en.coffee
2014-12-05 15:38:41 +00:00
Imperadeiro98
ecc94b411c
Update en.coffee
2014-12-05 15:29:18 +00:00
nixel2007
ef20e26484
ru
...
subscribe block and strings above.
2014-12-05 18:00:14 +03:00
nixel2007
5703e3eb94
ru
...
Play block
2014-12-05 17:42:19 +03:00
Lirai
e4120ceadf
Update de-DE.coffee
...
some translations
2014-12-05 10:43:41 +01:00
Matt Lott
4616df6c23
Add virtual page views for subscribe paths
2014-12-04 21:14:22 -08:00
Scott Erickson
d0ee8cb7c7
Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.
2014-12-04 17:41:27 -08:00
Matt Lott
bd797e8cfd
Highlight locked default code
2014-12-04 16:33:59 -08:00
Matt Lott
222e532006
Make default code locking contiguous
...
Lock ‘del’ command too.
2014-12-04 16:04:44 -08:00
Nick Winter
b5b38d042a
Added i18n for extrapolation tip.
2014-12-04 15:35:31 -08:00