Commit graph

2193 commits

Author SHA1 Message Date
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
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
434b71c887 Added myself as translator on norwegian nb 2014-11-27 20:45:27 +01:00
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -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
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
915a3243f5 Added feature image hair and thumb slots to the ThangType. 2014-11-26 16:29:48 -08: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
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
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
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
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
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
8f55b9bc1b Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal. 2014-11-25 12:43:17 -08: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
bb766e9610 Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit. 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
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
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
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
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
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
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
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
Matt Lott
692569f655 Update problem alert width to be more dynamic 2014-11-22 22:48:03 -08:00