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
Nick Winter
3c3d98b0ec
Merge pull request #1841 from Zacharias030/master
...
Added another tip to be displayed during loading
2014-12-04 15:34:16 -08:00
Zacharias Fisches
55f85e3682
Added another tip to be displayed during loading
...
There are only two kinds of people: those that can extrapolate from
incomplete data...
2014-12-05 00:21:36 +01:00
Nick Winter
0306d0ee31
Fixed bug with heroes not rendering in the hero picker.
2014-12-04 15:04:34 -08:00
Nick Winter
8318606457
Added a slot for the wizard hand hero doll images.
2014-12-04 14:35:25 -08:00
Nick Winter
b253eb9be8
Merged something.
2014-12-04 14:34:35 -08:00
Matt Lott
4ff6e95f62
Add show subscribe modal events
2014-12-04 14:23:47 -08:00
Nick Winter
bae90024b5
Merge pull request #1840 from nixel2007/master
...
Update ru.coffee
2014-12-04 14:20:14 -08:00
Nick Winter
24c3f6aa3a
Merge pull request #1829 from jkohlin/patch-1
...
Update sv.coffee
2014-12-04 14:09:53 -08:00
Nick Winter
b895db3da2
Merge pull request #1831 from Rubiconline/patch-1
...
Update fr.coffee
2014-12-04 14:09:28 -08:00
Nick Winter
49dd6704c3
Merge pull request #1839 from Imperadeiro98/patch-1
...
Fixed translation, I think
2014-12-04 14:08:29 -08:00
nixel2007
7179236caa
Update ru.coffee
...
G+ commands, skill_docs, about - team blocks, thangs and small fixes.
2014-12-05 01:00:50 +03:00
Nick Winter
dffc14f995
Put in a fallback in case somehow the gems weren't loaded for the PlayHeroesView locked hero gem costs.
2014-12-04 13:57:21 -08:00
Imperadeiro98
1c136b0657
Fixed translation, I think
2014-12-04 21:44:27 +00:00
Nick Winter
a25d306be7
Added restricted hero button where the choose hero would normally go, for heroes unavailable to a particular level.
2014-12-04 13:43:19 -08:00
Nick Winter
fa4f479107
Restricted Arcane Ally and Munchkin Harvest to warriors, since otherwise players will tend to suicidally pick their under-armored new ranger or wizard.
2014-12-04 13:37:17 -08:00
Nick Winter
a7eaac773d
Fixed some ranger paper doll stylings and a typo in the femaleRangeThumbr item doll image schema.
2014-12-04 13:30:20 -08:00
Nick Winter
c0842959e8
Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded.
2014-12-04 13:18:06 -08:00
Scott Erickson
0edf4e0ca1
Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users.
2014-12-04 13:07:07 -08:00
Matt Lott
e3abb9ceb3
Capture active user metrics
...
Watching for these events:
Level completed
User registered
Playtime of 30s in a level
Purchase
Payment
Subscribe
Earned an achievement
2014-12-04 12:57:57 -08:00
Scott Erickson
7025f0a488
Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up.
2014-12-04 11:56:14 -08:00
Nick Winter
86be36621d
Sped up real-time playback on some more non-randomized levels.
2014-12-04 11:31:22 -08:00
Nick Winter
7bfe0e5c9e
Updated Programmaticon II requirements. Adjust editor height after reloading code.
2014-12-04 11:31:22 -08:00
Lirai
324a749149
Update de-DE.coffee
...
uncommented...
2014-12-04 20:28:56 +01:00
Lirai
bde08dd24b
Update de-DE.coffee
...
Checked for errors and better translations.
2014-12-04 19:34:28 +01:00
Matt Lott
7537817081
Update subscribe parent copy
2014-12-04 09:57:01 -08:00
Nick Winter
a1d8b02ca6
Moved simulation Aether requires to be more specific and not loaded all the time on normal play pages.
2014-12-04 08:33:26 -08:00
Nick Winter
3573a929e3
Added requires for other languages in Simulator.coffee so simulation can work.
2014-12-04 08:21:36 -08:00
Nick Winter
f48468c474
Merge pull request #1834 from ebirkenes/translation
...
Bunch of norwegian translations
2014-12-04 07:40:10 -08:00
Maks Lyashuk
22fe41fd70
Fix another indent
2014-12-04 14:19:37 +02:00
Maks Lyashuk
8479f94ecb
Fix indent
2014-12-04 14:13:46 +02:00
Maks Lyashuk
f12d9b5598
New translation in uk.coffee
2014-12-04 13:14:19 +02:00
Nick Winter
69623edefb
WorldMapView no longer restricting access to adventurer and started levels.
2014-12-03 20:46:57 -08:00
Scott Erickson
41d78fd4c5
Payments view now sorts payments by date.
2014-12-03 19:44:04 -08:00
Nick Winter
4d72c1c84b
Show an AuthModal instead of a SubscribeModal to anonymous players.
2014-12-03 19:34:00 -08:00
Scott Erickson
0f706bfdf6
Fixed GPlus login.
2014-12-03 16:40:28 -08:00
Nick Winter
8cff42a843
Show SubscribeModal for non-admins, too.
2014-12-03 16:28:56 -08:00
Nick Winter
a8ce1bbfb2
Added unsubscribe button and subscription status on payments screen.
2014-12-03 16:11:46 -08:00
Nick Winter
1f2408a99f
Can actually edit requiresSubscription on levels.
2014-12-03 15:50:34 -08:00
Erlend Birkenes
4c4c263bb8
Fixed indentation error
2014-12-03 22:43:45 +01:00
Scott Erickson
eb98cf4952
Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one.
2014-12-03 13:32:28 -08:00
Nick Winter
4701ba22af
Got rid of a bit of skipping, enabled some other arenas for testing.
2014-12-03 13:17:57 -08:00
Nick Winter
6e57cbfb66
LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it).
2014-12-03 12:04:12 -08:00
Nick Winter
50ec896fd8
Added a requiresSubscription property to the levels.
2014-12-03 11:46:03 -08:00
George Saines
371127a368
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-03 11:19:52 -08:00
George Saines
bcaad51b24
more level rearranging
2014-12-03 11:19:48 -08:00
Nick Winter
0ac9b3758b
Fixed bug with subscriptions not working. Added subscription status text to the world map.
2014-12-03 11:19:10 -08:00
Erlend Birkenes
861cb64fec
More norwegian translations
2014-12-03 20:01:00 +01:00
Matt Lott
898b22723e
Update subscribe copy
2014-12-03 11:00:45 -08:00
George Saines
103d1035a2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-03 10:53:52 -08:00
George Saines
5dafe4b541
changing the placement of the level dots
2014-12-03 10:53:45 -08:00
Nick Winter
73b5f130b5
Repositioned ranger weapons.
2014-12-03 10:39:16 -08:00
Nick Winter
f82ccfc4cb
The sky darkened.
2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7
SubscribeModal is in.
2014-12-03 09:14:14 -08:00
Erlend Birkenes
5d4d631ae6
More norwegian translations.
...
Conflicts:
app/locale/nb.coffee
2014-12-03 16:36:04 +01:00
Matt Lott
201547e388
Revert autocomplete to support Enter too
2014-12-02 22:14:01 -08:00
Nick Winter
32d3745b77
A tiny bit more progress on the SubscribeModal.
2014-12-02 21:27:12 -08:00
Scott Erickson
cd3bb690f4
Created stripe subscription logic.
2014-12-02 20:02:35 -08:00
Nick Winter
15d7ac876a
Starting SubscribeModal.
2014-12-02 20:01:53 -08:00
Matt Lott
774260769d
Update pageview tracking
...
Based on more feedback from segment.io support.
Still trying to get Google Analytics virtual pageviews to work
correctly.
2014-12-02 13:25:18 -08:00
Scott Erickson
3675c79b26
Hotfix for #1828 . Still doesn't figure out why user preferredLanguage properties are being set to null.
2014-12-02 13:19:05 -08:00
Rubiconline
e1326f1698
Update fr.coffee
2014-12-02 21:25:58 +01:00
Scott Erickson
5dcdabfd62
Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.
2014-12-02 11:47:15 -08:00
Nick Winter
6cfb45e7a6
Pausing branchingGroup temporarily for school testing.
2014-12-02 09:18:39 -08:00
Matt Lott
1773744bcd
Turn off a/b test hide locked levels
...
Minor increase in level completion for hiding locked levels was not
statistically significant. We can run this test again after level
banners and world map paths have been ironed out.
2014-12-02 09:13:42 -08:00
Johan
06dcb8c48b
Update sv.coffee
2014-12-02 17:03:33 +01:00
Nick Winter
19dde10a54
Fixed jade comment syntax error.
2014-12-01 18:33:37 -08:00
Nick Winter
8c7e62b9bd
Added back doll image buckets.
2014-12-01 18:19:20 -08:00
Scott Erickson
7f97a3b91e
The PlayItemsModal now dynamically loads portrait images as they scroll into view.
2014-12-01 17:33:45 -08:00
Nick Winter
4f9dc39567
Fixed item details view shadow.
2014-12-01 17:17:27 -08:00
Matt Lott
5965d319d6
Fix Firefox world map level hover flicker
2014-12-01 17:12:02 -08:00
Nick Winter
4b75516a88
Fixed Amara's positioning.
2014-12-01 17:08:48 -08:00
Scott Erickson
cd5b57a658
Set up our resource retrying mechanism to stop after 20 tries.
2014-12-01 16:09:59 -08:00
Nick Winter
8ce192bf7c
Got modularized Aether imports working for PlayLevelView and its workers.
2014-12-01 15:43:22 -08:00
Scott Erickson
7f3f1a6038
Set up aether module loading, but it's not working, so creating a branch until it works.
2014-12-01 15:43:22 -08:00
Scott Erickson
a48fa41edd
CocoViews and CocoModels now notify users of connection errors and automatically retry when getting and putting data goes wrong.
2014-12-01 15:29:19 -08:00
Matt Lott
b2b25f354c
Narrow pageview tracking to only Google Analytics
2014-12-01 14:53:11 -08:00
Matt Lott
35adea61e0
Update trackPageView integrations call
...
Based on feedback from segment.io support. Was unclear from
documentation how to provide only name and options object.
2014-12-01 13:58:21 -08:00
Nick Winter
ca6c95b0f7
Migrated getting nextLevelURL to the new campaign organization.
2014-12-01 13:46:55 -08:00
Imperadeiro98
6036d2bd74
Update pt-PT.coffee
2014-12-01 20:45:29 +00:00
Imperadeiro98
1e4d6b3bd5
Update pt-PT.coffee
2014-12-01 20:27:52 +00:00
Scott Erickson
1b12eee3ac
Fixed signup in victory modals and ContributeClassView.
2014-12-01 10:49:38 -08:00
Scott Erickson
57b154810b
Added a placeholder me for iPad which inspects the object once the page loads.
2014-12-01 10:45:19 -08:00
Scott Erickson
43ac0e8572
Proxied 'lib/auth' to 'core/auth' for the iPad which can't be updated so quickly.
2014-12-01 10:35:45 -08:00
Nick Winter
f9b239ded7
Fixed #1820 .
2014-12-01 08:18:38 -08:00
Björn Kimminich
4d1130a9c6
Update de-DE.coffee
2014-12-01 14:00:36 +01:00
Matt Lott
23e60116d5
A/B test hiding locked levels in world map
2014-11-30 22:11:39 -08:00
Nick Winter
748fcf2a65
Fixed not showing locked items in inventory modal.
2014-11-30 19:45:40 -08:00
Nick Winter
88849d6dfb
Propagated i18n.
2014-11-30 18:13:30 -08:00
Björn Kimminich
5432be27f5
added some german translations
2014-12-01 03:11:28 +01:00
Nick Winter
35f1ed1e82
Implemented George's new level loading view design.
2014-11-30 18:02:45 -08:00
Nick Winter
d007f5337e
Fixed up inventory slot images for minions and wrists, and added Wizard/Ranger placeholder images.
2014-11-30 16:13:39 -08:00
Matt Lott
153c39b30b
Reverting larger currently-executing-line pointer
...
Not compatible with Firefox, and not clear how to make it work in both
browsers.
2014-11-30 16:03:23 -08:00
Matt Lott
2ecda7dbbf
Fix trackPageView options initialization
2014-11-30 15:28:01 -08:00
Nick Winter
44282cb946
Hooked up new menu music loop.
2014-11-30 14:57:34 -08:00
Matt Lott
070d3ec6c2
Fix Firefox code area border
2014-11-30 14:42:51 -08:00
Nick Winter
cf25b5c6ed
Made sure we can see the whole world map background, even though it looks bad when we stretch it.
2014-11-30 14:35:24 -08:00
Matt Lott
02eb254eba
Add virtual pageviews for level load and complete
2014-11-30 14:14:47 -08:00
Nick Winter
50eed15eed
Can now equip a second ring slot.
2014-11-30 14:12:07 -08:00
Nick Winter
9471beafd9
A few fixes for PlayHeroesModal and InventoryModal.
2014-11-30 14:00:29 -08:00
Nick Winter
68559a3aa5
Re-enabled top hero preloading on WorldMapView, but only when it makes sense.
2014-11-30 13:23:25 -08:00
Michael Schmatz
3cf80c895e
Removed log infos, iPad language selection
2014-11-30 16:19:01 -05:00
Nick Winter
8cb6c09889
Properly show paper doll equipment when inventory modal first loads.
2014-11-30 13:00:45 -08:00
Nick Winter
bd494dd513
Adding in what will eventually be our App Store URL.
2014-11-30 12:44:18 -08:00
Nick Winter
77a4cea387
Improvements for mobile layouts and mobile and iPad browser detection.
2014-11-30 12:27:34 -08:00
Matt Lott
066b1798ab
Make default code read-only
2014-11-30 11:47:54 -08:00
Scott Erickson
85f3972bfc
Fixed #1821
2014-11-30 10:57:17 -08:00
Matt Lott
94ae4bf6aa
Updating analytics integration selection
...
Context property has been renamed from providers to integrations.
https://segment.com/docs/libraries/analytics.js/#selecting-integrations
2014-11-29 22:16:18 -08:00
Scott Erickson
be809337c4
Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it.
2014-11-29 17:51:40 -08:00
Nick Winter
412955c6be
Got rid of some CSS filters that were making the PlayItemsModal take way too much memory.
2014-11-29 17:34:59 -08:00
Nick Winter
af24857255
Do not load silhouetted or hidden items. More importantly, remove the absolute positioning on the .required-level tag inside the item element to save 150MB (!!!) of memory for no discernible reason. (But actualy just remove that whole .required-level tag, because who even needs it.)
2014-11-29 17:06:56 -08:00
Scott Erickson
3a4eaa718f
Did what I needed to do to get d3 to not be loaded during play: refactored the ladder views out of the play wad, and got the Router to handle viewClass being a string rather than a fully loaded module.
2014-11-29 16:46:51 -08:00
Nick Winter
ad913024c0
Merge pull request #1817 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-11-29 15:57:59 -08:00
Scott Erickson
6fccae579a
Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views.
2014-11-29 15:31:56 -08:00
Nick Winter
fe55811075
Fixed a bit of repaining that was going on when it shouldn't.
2014-11-29 15:06:54 -08:00
Nick Winter
c226856204
Fixed typo in previous rewadding.
2014-11-29 14:42:46 -08:00
Nick Winter
65280454bf
Merge pull request #1818 from kerradus/master
...
update RU translation
2014-11-29 14:42:18 -08:00
Dmitry
52311bd256
update RU translation
2014-11-30 01:24:19 +03:00
Scott Erickson
02ddd7f698
Fixed #1816 . Cleaned up logging in config.coffee.
2014-11-29 13:47:04 -08:00
Scott Erickson
129e07e231
Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView.
2014-11-29 13:36:48 -08:00
Imperadeiro98
abf75281ca
Update pt-PT.coffee
2014-11-29 21:25:46 +00:00
Imperadeiro98
8d9c7cf0be
Update pt-PT.coffee
2014-11-29 21:22:06 +00:00
Nick Winter
155ead86cf
Removed unneede catiline lib. Trying speedups for updating HUD property values and Lank Thang inventory.
2014-11-29 13:09:38 -08:00
Scott Erickson
17f2d76512
Undid some apparent changes from the last commit.
2014-11-29 12:53:57 -08:00
Scott Erickson
9b5228afd9
Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match.
2014-11-29 12:46:04 -08:00
Scott Erickson
1c33842125
Refactored core templates into a core folder.
2014-11-29 11:39:37 -08:00
Nick Winter
912df310a2
Disabled GitHub login for now, since it's too buggy and also makes the server mad slow.
2014-11-29 10:52:53 -08:00
Scott Erickson
1bd70591a0
Added new mongodb versions to be allowed.
...
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Nick Winter
b8d4f00cd4
Merge pull request #1813 from ebirkenes/tmp
...
Fix for #1795
2014-11-29 10:40:48 -08:00
Nick Winter
98199ac72e
Propagated i18n.
2014-11-29 10:38:55 -08:00
Nick Winter
891b78eb44
Hiding some ThangTypes from view in level editor.
2014-11-29 10:34:04 -08:00
Nick Winter
306f599673
Merge pull request #1815 from ewertonorg/translate-to-pt-br
...
Update pt-BR.coffee
2014-11-29 10:33:22 -08:00
Scott Erickson
0bbcdd5698
Made all of lib into a wad. Fixed AuthModal.
2014-11-29 08:54:18 -08:00
Nick Winter
d2aabbdacc
A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.
2014-11-29 08:43:40 -08:00
Nick Winter
dbbcfe3789
Fixed a couple requires needed for level editor.
2014-11-29 06:50:50 -08:00
ewertonorg
4b7fc0322c
Update pt-BR.coffee
2014-11-29 11:53:27 -02:00
Scott Erickson
82e2344fa5
Fixed new module loading system when optimized.
2014-11-29 00:34:55 -08:00
Nick Winter
89af30f436
Using home play i18n tag instead of common play tag.
2014-11-28 19:49:13 -08:00
Nick Winter
8400eb6016
Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring.
2014-11-28 19:39:51 -08:00
Scott Erickson
31214e854e
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05
Set up the site to load its logic and templates piecemeal rather than in one giant app.js file.
2014-11-28 16:38:56 -08:00
Scott Erickson
12b3428aee
Got rid of some styling in the achievement edit view that was messing with the new site chrome.
2014-11-28 16:38:56 -08:00
Nick Winter
32a271d17e
Updated to new paper doll positioning.
2014-11-28 14:23:44 -08:00
Nick Winter
4b45385571
Working on paper dolls.
2014-11-28 12:11:59 -08:00
Matt Lott
fc2c68a7af
Update Tracker.trackEvent
...
Mechanics have changed a bit: first param is an action string, second
param has specific properties if Google Analytics.
Updating some of the trackEvent calls to use correct actions and
categories.
2014-11-28 15:06:25 -05:00
Erlend Birkenes
6efb03ec40
Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little.
2014-11-28 19:30:41 +01:00
Erlend Birkenes
744b856092
Fixed padding on language-dropdown
2014-11-28 12:10:57 +01:00
Matt Lott
fead762d04
Stopping tracking analytics for admins
2014-11-27 23:55:28 -05:00
Erlend Birkenes
434b71c887
Added myself as translator on norwegian nb
2014-11-27 20:45:27 +01:00
Erlend Birkenes
5f7f1c2b65
Translated the entire contributing page plus some other stuff to norwegian.
2014-11-27 20:17:33 +01:00
Nick Winter
2d2a9ad681
Updated Hour of Code visitor counting.
2014-11-27 09:44:08 -08:00
Nick Winter
b5c7a4e0f2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-27 07:28:31 -08:00
Erlend Birkenes
37601efa17
More norwegian translations.
...
Conflicts:
app/locale/nb.coffee
2014-11-27 16:11:13 +01:00
Nick Winter
81495fd722
Added suspect code fragment to Known Enemy.
2014-11-26 19:30:23 -08:00
Nick Winter
0499702e10
Translated IFC Videira description to English, and added an image.
2014-11-26 19:22:39 -08:00
Nick Winter
bef466304d
Merge pull request #1805 from leocadiotk/patch-1
...
Update MainPlayView.coffee
2014-11-26 19:20:45 -08:00
Nick Winter
4e51289de8
Merge pull request #1800 from ShadowTrainer/patch-2
...
Update tr.coffee
2014-11-26 19:20:10 -08:00
Nick Winter
12253fc472
Resolved nb.coffee merge conflicts.
2014-11-26 19:19:30 -08:00
Nick Winter
167595789d
Merged tr.coffee.
2014-11-26 19:09:39 -08:00
Nick Winter
4c900b8870
Working on paper doll equipping.
2014-11-26 19:06:57 -08:00
leocadiotk
d2b394aaf2
Update MainPlayView.coffee
2014-11-26 23:16:07 -02:00
Nick Winter
7a7d82e8e4
Merge pull request #1792 from ccdarkness/patch-1
...
Update zh-HANS.coffee
2014-11-26 16:51:07 -08:00
Nick Winter
6e7e11a884
Merge pull request #1791 from nadian/patch-1
...
Update id.coffee
2014-11-26 16:50:50 -08:00
Nick Winter
16e0c2b4fb
Merge pull request #1804 from ebirkenes/translation
...
Lots of translations to norwegian bokmål
2014-11-26 16:49:58 -08:00
Nick Winter
ab1e256b98
Merge pull request #1803 from ebirkenes/master
...
Fixed wrong I18n suffix in Thang Editor section on Community page.
2014-11-26 16:48:31 -08:00
Nick Winter
915a3243f5
Added feature image hair and thumb slots to the ThangType.
2014-11-26 16:29:48 -08:00
Erlend Birkenes
c8a34e78e8
Lots of translations to norwegian bokmål
2014-11-27 01:00:02 +01:00
Erlend Birkenes
83e41bb38e
Fixed wrong I18n suffix in Thang Editor section on Community page.
2014-11-27 00:41:29 +01:00
Nick Winter
53c6da5ef8
Allowing upload of paper doll images for items.
2014-11-26 14:18:17 -08:00
Nick Winter
fc18ed0153
Undisabled the new Adventurer levels we just emailed about.
2014-11-26 12:56:58 -08:00
Matt Lott
cf6450201f
Fix IE9 simulation problems
...
World.deserialize call had mixed up parameters.
flagHistory wasn’t being initialized.
Error logging using unsupported CoffeeScript splats invocation.
2014-11-26 15:40:18 -05:00
Nick Winter
e538808c76
Merge branch 'master' of git://github.com/notno/codecombat into notno-master
2014-11-26 12:34:35 -08:00
Nick Winter
12394b6bba
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-26 12:33:36 -08:00
Nick Winter
9feb4e6add
Using ACE to add syntax highlighting to code documentation.
2014-11-26 12:33:29 -08:00
Nathan Rosquist
da4116ee2e
Add tree_stand thangs to Generate Terrain modal in level editor. Use as border for grassy terrain.
2014-11-26 12:18:57 -08:00
Scott Erickson
c4fdcab6fe
The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.
2014-11-26 12:02:42 -08:00
Nick Winter
e8ed205038
Added original data to all WorldMapView levels.
2014-11-26 11:03:24 -08:00
Nick Winter
55eaed0cd2
Updated AI/Vision pathfinding/line-of-sight default terrain updates.
2014-11-26 10:51:30 -08:00
Nick Winter
c701ca9eb0
Sorting items by tier instead of gems so that the unlock order will be consistent, and so that we can show the Ring of Speed early despite its high price.
2014-11-26 09:22:30 -08:00
Nick Winter
2c0bf2fef1
Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed.
2014-11-26 08:53:06 -08:00
Nick Winter
3f9aa1ba79
Changed 'Your Skills' to 'Help' for hero level spell palette.
2014-11-26 07:39:13 -08:00
Nick Winter
18238a1781
Silhouetted items show what level they'd need to unlock after a while on hover from inventory modal.
2014-11-26 07:33:07 -08:00
Nick Winter
48e78aa0d0
Messed around with equip button and active item css.
2014-11-26 07:11:55 -08:00
Nick Winter
24ac3050bd
Added a bunch of button click sound triggers.
2014-11-26 06:58:23 -08:00
Nick Winter
09d67a8189
Gradually reducing the initial size of the highlight arrow as the player levels up.
2014-11-25 17:55:10 -08:00
Nick Winter
6f2ac13c5a
Not duplicating spell docs if they're explicitly granted.
2014-11-25 17:49:31 -08:00
Nick Winter
9fe5e277a3
Forcing a Programmaticon II upgrade when you get it.
2014-11-25 16:54:24 -08:00
Scott Erickson
425da04ab6
Looks like I left a wee bit of debugging code in PlayItemsModal, and it was messing things up.
2014-11-25 16:27:42 -08:00
Scott Erickson
790217f227
Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.
2014-11-25 16:22:06 -08:00
Scott Erickson
b018746565
Switched the ThangNamesCollection to use GET instead of POST.
2014-11-25 16:22:05 -08:00
Nick Winter
0b4bc61b01
Exposed home slogan for the smaller screens. Re-hid App Store button for now.
2014-11-25 14:31:24 -08:00
Scott Erickson
464f06c031
Turned off saving automatically when you toggle subscriptions in the AccountSettingsView, as it was triggering the PlayAccountModal to save and close.
2014-11-25 13:32:43 -08:00
Scott Erickson
0f29e098cc
ThangTypes with empty portraits now upload them with blank images, to overwrite extant portraits.
2014-11-25 13:28:28 -08:00
Nick Winter
c2f77470a0
Fixed a couple typos Jade was complaining about.
2014-11-25 13:26:04 -08:00
Scott Erickson
8f55b9bc1b
Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.
2014-11-25 12:43:17 -08:00
ShadowTrainer
28acb28912
Update tr.coffee
2014-11-25 21:23:43 +02:00
Scott Erickson
426202d80a
Added a simple payments page.
2014-11-25 11:09:29 -08:00
Scott Erickson
b27ac94382
Fixed the loading screen in the new site-chrome. As a result, found and removed all the extraneous loading logic from MainAccountView.
2014-11-25 11:06:34 -08:00
Scott Erickson
2a135eeaf1
Reworked the account modal links and a little bit of the styling.
2014-11-25 10:39:53 -08:00
Scott Erickson
bb766e9610
Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit.
2014-11-25 10:39:53 -08:00
Scott Erickson
6b8a9593ef
Set up the new site chrome to compress when the height of the screen is < 800px tall.
2014-11-25 10:39:53 -08:00
Nick Winter
bbc9b615ea
ItemDetailsView showing item descriptions now.
2014-11-25 10:28:31 -08:00
Nick Winter
5c77eea304
You can now buy heroes.
2014-11-25 10:15:10 -08:00
Nick Winter
98f1eec10c
Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs.
2014-11-25 09:28:50 -08:00
Matt Lott
3c161268f0
Don't register createjs.FlashPlugin if undefined
...
This was completely breaking IE 11/10/9. Audio still seems to work
fine with this change.
2014-11-25 12:19:16 -05:00
Imperadeiro98
77c7381e40
Update pt-PT.coffee
2014-11-24 19:55:12 +00:00
Imperadeiro98
6cd32857ac
Update pt-PT.coffee
2014-11-24 19:35:07 +00:00
Nick Winter
9accd0cb04
You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more.
2014-11-24 10:51:20 -08:00
Aase Mestad
5a10ec8a23
Some norwegian updates
2014-11-24 18:18:40 +01:00
Nick Winter
f9e6c167bc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-24 09:06:05 -08:00
Nick Winter
a1ebdb7101
Adjusted amount of items you can buy so that you can theoretically spend much more than you earn, while still not unlocking powerful stuff too early.
2014-11-24 09:05:59 -08:00
Matt Lott
48d5dd9dc6
Make sync pvp level sessions publicly readable
2014-11-23 23:49:03 -08:00
Matt Lott
6b7e146084
Reduce problem alert jiggle duration to 1s
2014-11-23 21:58:29 -08:00
ccdarkness
1ce776f9e2
Update zh-HANS.coffee
2014-11-24 12:54:38 +08:00
Nick Winter
b87cf462fc
Shrinking home page height as much as easily possible to be able to fit it on anyone's screen.
2014-11-23 20:13:06 -08:00
Nick Winter
cbf3aab374
Removed hero team color in non-multiplayer levels.
2014-11-23 20:04:07 -08:00
Nick Winter
df162080c3
Totally hid code stepper toolbar for now, since it's proving difficult to make room for it in the new design.
2014-11-23 19:40:50 -08:00
nadian
b429e5f26a
Update id.coffee
2014-11-24 08:45:21 +07:00
Matt Lott
c203ff15a2
Fix sync PVP opponent syncing issue
...
Ripped out backfire from PlayLevelView so we have more control over
data synchronization. These changes should wait properly for the
opponent data to load before blazing ahead, after a PlayLevelView
reload.
Fixes #1767
2014-11-23 17:15:59 -08:00
Nick Winter
0c8b5ec9a8
Turned off dead Thang underlayering when in the air.
2014-11-23 16:06:28 -08:00
Nick Winter
1535b6bdd2
Fixed play footer in new styling regime.
2014-11-23 15:48:08 -08:00
Nick Winter
1cd781233c
Press enter to start level, esc to skip real-time playback. Reduced likelihood of repetetive aural say messages. Updated required code for Bonemender.
2014-11-23 15:25:12 -08:00
George Saines
e7a5cadfb0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-23 13:32:31 -08:00
George Saines
294a8497ed
making the editor error more visually distinctive
2014-11-23 13:32:26 -08:00
Nick Winter
0b97ef5f0b
Properly using the skill docs i18n. Fixed issue with markdown getting to #{spriteName} before our replacer did.
2014-11-23 13:26:19 -08:00
Nick Winter
294a37e2a2
Propagated i18n.
2014-11-23 12:54:42 -08:00
Nick Winter
f248de0dc5
Adding i18n to skill docs.
2014-11-23 12:52:34 -08:00
Nick Winter
ffaa42cb9b
Added detection of suspect code fragment deletion. Implemented Chloe's styling advice on restricted items. Fixed purchasing items clobbering inventory changes.
2014-11-23 12:18:42 -08:00
Nick Winter
c7f8565ae7
Getting a few more placeholder stats filled in automatically in ItemDetailsView. Showing buildTypes for Builder's Hammer docs. Fixed font casing / humanizing for skills granted.
2014-11-23 11:08:20 -08:00
Nick Winter
b359c25c97
Fixed multiplexed-by-code-and-spoken-language component documentation i18n.
2014-11-23 10:22:06 -08:00
Scott Erickson
994584f13a
Shapes now handle radial gradient fills. Handled one sprite (new Anya attack) export including initializing a container with movie clip arguments for no apparent reason, so loosened SpriteParser a bit to handle this.
2014-11-23 09:39:02 -08:00
Scott Erickson
1f3b02440a
Fixed a harmless bug where the Lank would try to add new sprites to old containers.
2014-11-23 08:51:45 -08:00
Matt Lott
692569f655
Update problem alert width to be more dynamic
2014-11-22 22:48:03 -08:00
Nick Winter
b7949424e6
Re-enabled branchingGroup A/B test. Restricted Builder's Hammer in The Gauntlet.
2014-11-22 21:36:14 -08:00
Nick Winter
5d54332ed7
Round inferred cooldown docs. Show grabber/grabbing cursor when Surface is enabled, playing, and zoomed in.
2014-11-22 21:22:46 -08:00
Nick Winter
f16c1b5030
Fixed a few UX issues Chloe found.
2014-11-22 20:56:46 -08:00
Matt Lott
c16b0f97bf
Update sync PVP to use transpiledCode
2014-11-22 20:48:07 -08:00
Scott Erickson
1a85fea33b
Fixed the editor views, get that site chrome outta there.
2014-11-22 18:51:21 -08:00
Nick Winter
6851c309fb
Moved older campaigns from world map view to site footer.
2014-11-22 18:45:22 -08:00
Nick Winter
6fd0d024eb
Moved overlapping level dot.
2014-11-22 18:45:22 -08:00
Scott Erickson
96f9b60780
Set George's new hero stat colors.
2014-11-22 18:43:02 -08:00
George Saines
1bdc331f40
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-22 18:00:28 -08:00
George Saines
c98e875c68
making the error message more blood red
2014-11-22 18:00:23 -08:00
Scott Erickson
0e6965d097
Hiding the iPad link for now.
2014-11-22 17:44:26 -08:00
Scott Erickson
cfcd09c112
Set up the new Heald-designed site chrome.
2014-11-22 17:41:13 -08:00
Matt Lott
fbed0dd13d
Jiggle spell palette popover onclick in hero level
2014-11-22 17:35:05 -08:00
Matt Lott
fcb098b3aa
Remove cast button text A/B test
2014-11-22 16:50:49 -08:00
George Saines
2151cd6799
added the additional default inventory icons, added the dungeon map path
2014-11-22 16:14:43 -08:00
ShadowTrainer
48a0be91d8
Update tr.coffee
2014-11-23 01:32:59 +02:00
George Saines
2875cb09a5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-22 15:18:23 -08:00
George Saines
9a2c52545f
adding carpeting to the dungeon floor
2014-11-22 15:18:19 -08:00
Matt Lott
496d52b2aa
Add moveRight to loop snippet for first 2 mazes
2014-11-22 12:29:37 -08:00
Dmitry
41b3d066d6
update RU translation
2014-11-22 19:58:05 +03:00
Nick Winter
2fc6f7a8a2
New required inventory items for ranger/wizard levels.
2014-11-21 22:35:03 -08:00
Matt Lott
c012cd4e30
Prevent continuous deletion of a single line
2014-11-21 21:02:39 -08:00
Nick Winter
904d605e42
Getting ready to add new levels.
2014-11-21 20:36:56 -08:00
Nick Winter
549fb8aa37
Attempting to require purchase of tarnished bronze breastplate in The Raised Sword.
2014-11-21 16:23:26 -08:00
Nick Winter
dae3c9cef6
Always show Buy Gems menu on iPad.
2014-11-21 14:55:04 -08:00
Nick Winter
d00c7d6a3a
Allow buying gems when not logged in on iPad.
2014-11-21 14:41:04 -08:00
Nick Winter
ca73a049dd
Paths for non-admins. Making sure paths are showing when level first loads and playback ends (not sure why they are not showing up at first otherwise).
2014-11-21 14:22:02 -08:00
Michael Schmatz
1d52562070
Publish signed up message
2014-11-21 17:18:02 -05:00
Nick Winter
074d9f33c2
Fixed bugs with unequipping restricted items not then requiring the proper item afterward.
2014-11-21 12:20:24 -08:00
Nick Winter
cee017c7ec
Moved spell palette popovers to top placement if dialogue view is active.
2014-11-21 12:14:37 -08:00
Nick Winter
c5ae253a45
Fixed next-level popovers appearing in wrong place on world map.
2014-11-21 11:56:31 -08:00
Nick Winter
cfe1b020c3
Fixed esc shortcut when editor is disabled.
2014-11-21 11:07:57 -08:00
Nick Winter
16a717aec1
Disallow finding enemy names by selecting them before the HUD is fully enabled.
2014-11-21 10:14:02 -08:00
Nick Winter
c3398ed8ed
Required topEnemy in Thornbush Farm.
2014-11-21 09:53:46 -08:00
Nick Winter
5550c695e2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-21 08:19:37 -08:00
Nick Winter
6f3485f089
Fully removed A/B test that was causing hero victory modals to not fully work.
2014-11-21 08:16:03 -08:00
Thomas Abend
145535f465
Update names.coffee
2014-11-21 09:49:01 -05:00
Scott Erickson
624f164b54
Set up the WorldMap to load earned achievements and modify the User object to include absolutely everything.
2014-11-20 23:03:16 -08:00
Scott Erickson
b86e3c30dc
Set up level achievements to be created manually by the client, hopefully making them a bit more stable.
2014-11-20 22:09:54 -08:00
Nick Winter
2393165d9a
Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found.
2014-11-20 21:57:47 -08:00
Nick Winter
e97ba54c94
Reduced how much we're sending to Mixpanel. Turned off experimental languages A/B test.
2014-11-20 20:31:17 -08:00
Nick Winter
33ef8f9760
Added Programmaticon II dependency.
2014-11-20 20:06:59 -08:00
Nick Winter
f5f2d57db6
Paused branchingGroup A/B test and set everyone to no-practice. Realized that no-practice wasn't working at all, so fixed that.
2014-11-20 19:56:44 -08:00
Nick Winter
fcfe81c63e
Added endangered-burl and village-guard.
2014-11-20 19:32:09 -08:00
Nick Winter
6d7bc9ce11
Fixed #1729 .
2014-11-20 17:09:29 -08:00
Michael Schmatz
f84e92595b
Changed UDID to identifierForVendor
2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065
Added the ability to assign a user an iOS UDID, and login with it.
2014-11-20 15:54:15 -08:00
Matt Lott
ef8e7563b4
Increase autocomplete font size in dungeon levels
...
Also moving getCampaignForSlug to new CampaignOptions file.
2014-11-20 12:41:56 -08:00
Nick Winter
79ac94d84a
Fixed busted item crash.
2014-11-20 11:59:49 -08:00
Nick Winter
df51e28a1d
Fixed camera zoom killing coordinate hover unnecessarily.
2014-11-20 11:37:10 -08:00
Nick Winter
46c4601ac6
Levels (back) link now embiggened.
2014-11-20 11:11:38 -08:00
Matt Lott
f80baf3eb2
Update autocomplete instruction to 'press tab'
...
Enter no longer autocompletes, instead dismisses popup and executes a
Return
2014-11-20 10:56:38 -08:00
Nick Winter
83bbb6bef2
Merge pull request #1766 from iAladdin/master
...
improved Chinese localization zh-HANS.coffee
2014-11-20 09:02:32 -08:00
Nick Winter
7b7ceeba53
Right, it's long-sword, not longsword.
2014-11-20 08:49:18 -08:00
iAladdin
0fcffc9736
improved Chinese Localization
...
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-21 00:16:45 +08:00
iAladdin
84c6ed0193
Merge branch 'master' of github.com:codecombat/codecombat
2014-11-20 11:14:05 +08:00
iAladdin
55f725de93
fixed error
...
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 11:13:47 +08:00
Nick Winter
b0f65a4da8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-19 18:36:30 -08:00
Nick Winter
8280347752
Fixes to spell palette doc hovering and ensuring at least two column layout.
2014-11-19 18:36:09 -08:00
Matt Lott
81d6c186dc
Add time to missing null check error messages
2014-11-19 17:13:00 -08:00
Nick Winter
afff1056cb
Don't be draggin' all these images around yo.
2014-11-19 16:36:06 -08:00
iAladdin
dff443bc07
Merge branch 'master' of github.com:codecombat/codecombat
2014-11-20 08:22:23 +08:00
iAladdin
883a58ed2d
improved Chinese Localization
...
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 08:22:10 +08:00
Scott Erickson
09087428b9
Got lanks to update healthbars when the floating layer spritesheet is recreated.
2014-11-19 16:09:48 -08:00
Nick Winter
716f8864f1
Increased dialogue strong tag color contrast.
2014-11-19 16:09:25 -08:00
Nick Winter
5c0f007c4f
Toning down executing highlights when errored out as well as when ended.
2014-11-19 16:05:00 -08:00
Nick Winter
89f0f52714
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-19 16:04:29 -08:00
Scott Erickson
e10af778ca
Added some logs to figure out why that one time the GPlus logging in process just left things hanging.
2014-11-19 15:55:44 -08:00
Nick Winter
a1038af32b
Make it much less likely to get to frame 0, since that frame is often pretty weird.
2014-11-19 15:46:50 -08:00
iAladdin
038e8cf776
Merge branch 'master' of github.com:codecombat/codecombat
2014-11-20 07:43:04 +08:00
iAladdin
42997c4bb2
improved Chinese Localization
...
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 07:42:35 +08:00
Matt Lott
41db27c709
Apply markdown to error messages and hints
2014-11-19 15:27:06 -08:00
Nick Winter
f310719cee
Restarting level now doesn't clear anything except code unless you hold down shift.
2014-11-19 15:24:50 -08:00
Nick Winter
6755c90f02
Properly continue to Haunted Kithmaze from The Raised Sword if that's the A/B test group.
2014-11-19 15:18:59 -08:00
Nick Winter
c82d1d0f36
Additional scriptable property on thang-died events.
2014-11-19 15:13:45 -08:00
Nick Winter
07a09e34d8
Fixed small-caps font-variant on docs popover titles.
2014-11-19 15:01:30 -08:00
Scott Erickson
13de055c0b
Set up a basic achievements list modal for the world map.
2014-11-19 14:56:40 -08:00
Nick Winter
fe018309d0
Don't show blurbs for aggro messages. Big announces action blurbs for heroes.
2014-11-19 14:29:11 -08:00
Nick Winter
5a71d93d8a
Hid play button for a couple more levels.
2014-11-19 14:29:11 -08:00
Nick Winter
0640f382ba
Fixed coordinate hover cursors fighting flag cursors. Added suspect code check functionality for scripts to slap hands.
2014-11-19 14:29:11 -08:00
Scott Erickson
63c516c5f5
Quick fix to get people to the forest levels even if, for some reason, the first forest level isn't in the User list of earned levels.
2014-11-19 10:05:13 -08:00
Nick Winter
2af8271829
Some size/styling tweaks for goals and gold.
2014-11-19 09:01:01 -08:00
iAladdin
0b9d6ea5c3
Merge branch 'master' of github.com:codecombat/codecombat
2014-11-19 12:51:59 +08:00
iAladdin
d24db06e0e
improved Chinese Localization
...
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-19 12:51:39 +08:00
Nick Winter
96ff44017e
A few fixes for unequippable cross-class item state.
2014-11-18 19:37:08 -08:00
iAladdin
43f56c7ff7
Merge branch 'master' of github.com:codecombat/codecombat
2014-11-19 11:19:41 +08:00
iAladdin
5f1f02f8e8
improved Chinese localization
2014-11-19 11:19:31 +08:00
Nick Winter
3ad67130c7
A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button.
2014-11-18 18:43:53 -08:00
Nick Winter
05b53fa10e
Merge branch 'iAladdin-master'
2014-11-18 18:16:35 -08:00
Nick Winter
b3119e300d
Resolved merge conflicts.
2014-11-18 18:16:17 -08:00
