Commit graph

2237 commits

Author SHA1 Message Date
Nick Winter
346ace6ac3 Fixed goals not showing up when reloading level. 2014-12-07 19:39:23 -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
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
f50898ddf5 Ditched double game-menu-open sound when opening LevelSetupManager modals. 2014-12-07 14:27:34 -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
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
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
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
aac1aa379e Set up stubs for future subscription sales. 2014-12-06 12:38:06 -08: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
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
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
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
Nick Winter
6344b0c1a3 Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. 2014-12-05 15:46:15 -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
Nick Winter
8b62b6ec44 Temporary workaround for #1842. 2014-12-05 07:55:17 -08:00
Matt Lott
4616df6c23 Add virtual page views for subscribe paths 2014-12-04 21:14:22 -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
0306d0ee31 Fixed bug with heroes not rendering in the hero picker. 2014-12-04 15:04:34 -08:00
Matt Lott
4ff6e95f62 Add show subscribe modal events 2014-12-04 14:23:47 -08:00
Imperadeiro98
1c136b0657 Fixed translation, I think 2014-12-04 21:44:27 +00:00
Nick Winter
c0842959e8 Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded. 2014-12-04 13:18:06 -08:00
Nick Winter
7bfe0e5c9e Updated Programmaticon II requirements. Adjust editor height after reloading code. 2014-12-04 11:31:22 -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
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
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
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
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
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
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
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -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
Scott Erickson
7f97a3b91e The PlayItemsModal now dynamically loads portrait images as they scroll into view. 2014-12-01 17:33:45 -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
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
Nick Winter
ca6c95b0f7 Migrated getting nextLevelURL to the new campaign organization. 2014-12-01 13:46:55 -08:00
Scott Erickson
1b12eee3ac Fixed signup in victory modals and ContributeClassView. 2014-12-01 10:49:38 -08: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
35f1ed1e82 Implemented George's new level loading view design. 2014-11-30 18:02:45 -08:00
Nick Winter
44282cb946 Hooked up new menu music loop. 2014-11-30 14:57:34 -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
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
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
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
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
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
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
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
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
891b78eb44 Hiding some ThangTypes from view in level editor. 2014-11-29 10:34:04 -08:00
Scott Erickson
0bbcdd5698 Made all of lib into a wad. Fixed AuthModal. 2014-11-29 08:54:18 -08:00
Nick Winter
dbbcfe3789 Fixed a couple requires needed for level editor. 2014-11-29 06:50:50 -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
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00