Commit graph

1227 commits

Author SHA1 Message Date
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
1b12eee3ac Fixed signup in victory modals and ContributeClassView. 2014-12-01 10:49:38 -08:00
Nick Winter
f9b239ded7 Fixed #1820. 2014-12-01 08:18: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
35f1ed1e82 Implemented George's new level loading view design. 2014-11-30 18:02:45 -08:00
Nick Winter
9471beafd9 A few fixes for PlayHeroesModal and InventoryModal. 2014-11-30 14:00:29 -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
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
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
c226856204 Fixed typo in previous rewadding. 2014-11-29 14:42:46 -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
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
Scott Erickson
0bbcdd5698 Made all of lib into a wad. Fixed AuthModal. 2014-11-29 08:54:18 -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
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -08:00
Nick Winter
4c900b8870 Working on paper doll equipping. 2014-11-26 19:06:57 -08: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
9feb4e6add Using ACE to add syntax highlighting to code documentation. 2014-11-26 12:33:29 -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
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
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
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
Scott Erickson
426202d80a Added a simple payments page. 2014-11-25 11:09:29 -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
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
Nick Winter
1535b6bdd2 Fixed play footer in new styling regime. 2014-11-23 15:48:08 -08:00
Nick Winter
f248de0dc5 Adding i18n to skill docs. 2014-11-23 12:52:34 -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
f16c1b5030 Fixed a few UX issues Chloe found. 2014-11-22 20:56:46 -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
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
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
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
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
afff1056cb Don't be draggin' all these images around yo. 2014-11-19 16:36:06 -08:00
Matt Lott
41db27c709 Apply markdown to error messages and hints 2014-11-19 15:27:06 -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
96ff44017e A few fixes for unequippable cross-class item state. 2014-11-18 19:37:08 -08:00
Scott Erickson
1889c771f2 Added the close button to the GameMenuModal. 2014-11-18 13:57:44 -08:00
Scott Erickson
46f9667311 Made the double click hint alert in the inventory modal more visible. 2014-11-18 13:28:04 -08:00
Scott Erickson
a04bc63b87 Equip hint and available header now are visible only when there are items to equip. 2014-11-18 13:20:59 -08:00
Scott Erickson
208f05cf67 Added an equip button to every piece of available equipment. 2014-11-18 13:02:06 -08:00
Matt Lott
05cc9c2f46 Move sync pvp status UI to control bar
Replaces level name UI for hero-ladder levels.
2014-11-18 09:01:07 -08:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
Matt Lott
f56d01419f Update sync pvp teams and real-time playback
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
Nick Winter
e5aada2e5b Incorporated tweaked victory modal background assets. 2014-11-16 21:26:21 -08:00
Nick Winter
b7c2a33ddc Fixed some i18n on the PlayHeroesModal, and started showing special hero skills. 2014-11-15 07:40:10 -08:00
Nick Winter
7bbc270f26 Merge pull request #1748 from Imperadeiro98/master
Update achievements.jade
2014-11-15 07:32:28 -08:00
Scott Erickson
36305cde97 Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window. 2014-11-14 11:04:24 -08:00
Nick Winter
05a3577de9 Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload. 2014-11-13 10:49:37 -08:00
Imperadeiro98
4c8d959c8a Update achievements.jade
The titles were not being translated.
2014-11-13 17:02:32 +00:00
Scott Erickson
ed8285248f Put in the new InventoryModal background. 2014-11-12 18:01:35 -08:00
Scott Erickson
5b034194ee Put in the new BuyGemsModal design. 2014-11-12 17:17:24 -08:00
Scott Erickson
07cf741015 Changed the campaign switching icons arrows nested in the campaign maps. 2014-11-12 16:26:35 -08:00
Scott Erickson
1b73569072 Forgot jade != coffeescript. 2014-11-12 14:34:23 -08:00
Scott Erickson
a7d48f4b3c Tweaked the gems icon to be visible for ipad and admins. 2014-11-12 14:25:34 -08:00
Scott Erickson
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -08:00
Scott Erickson
c3eecd15be Set up the WorldMapView to update the gem count when a player purchases gems or items. 2014-11-12 10:22:56 -08:00
Scott Erickson
ad35109878 Built the BuyGemsModal stub. 2014-11-12 09:40:55 -08:00
Nick Winter
0af7b4d5b7 Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories. 2014-11-11 16:37:00 -08:00
Nick Winter
bc4c4353b2 Added a signup button to the level when not logged in. 2014-11-11 08:49:16 -08:00
Nick Winter
ce04541d3a Working on tying item purchasability to player level, plus other small tweaks to the item store. 2014-11-10 22:07:55 -08:00
Nick Winter
eab293cb66 Refactored item-details-view styling and shared styles between InventoryModal and PlayItemsView, fixing scrollbars and text overflow issues in the process. Dragging to unequip now updates restrictions again. Worked on pointer cursors for equippable ittems. Hid items not usable by your hero's class. Stopped silhouetted items from being clickable. 2014-11-10 18:13:04 -08:00
Scott Erickson
f21f54cd19 Refactored, mostly redesigned inventory view, modeled after the Heald item store design. 2014-11-10 15:31:32 -08:00
Nick Winter
ffea887330 Revamped real-time playback behavior to kick in on Thornbush Farm. Added a Done button until then. 2014-11-10 15:16:28 -08:00
Nick Winter
ab448532f5 Fixed bug in achievement popup listing wrong xp left values. 2014-11-10 08:31:26 -08:00
Nick Winter
f78ff257ab Several improvements to behavior of pointing out next levels. 2014-11-10 08:21:28 -08:00
Nick Winter
85471badaa Added callout to become an Adventurer on disabled levels. 2014-11-09 21:27:03 -08:00
Nick Winter
111b9febac Updated main.html. Removed LinkedIn. 2014-11-09 20:35:46 -08:00
Nick Winter
44d4d13c93 A few tweaks to the GameMenuModal. 2014-11-09 20:19:12 -08:00
Nick Winter
982e85da52 Linked to new i18n page from Diplomat page. 2014-11-09 20:06:55 -08:00
Nick Winter
9b074841d6 Messed around with some of the new modals' scroll bars. 2014-11-09 19:39:09 -08:00
Matt Lott
0d2fe9b6e2 Update error code line background
Add title to problem alert dialog
2014-11-08 21:51:58 -08:00
Nick Winter
1b94868197 Added new LevelDialogueView. Messed around with dimming a bit more. 2014-11-08 11:39:04 -08:00
Nick Winter
a8700f5113 Reload now shows confirmation modal again. Added some stuff missing from the last commit. 2014-11-08 08:38:25 -08:00
Nick Winter
f3dfcdc81d Implemented new HUD design. Removed more unneeded stuff. Changed reload button to restart level. Still need restart confirmation and to redo the sprite dialogue area. 2014-11-07 19:15:55 -08:00
Nick Winter
cfff09b01e Merged big .executing arrow. 2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things. 2014-11-07 16:04:35 -08:00
George Saines
b0533850db adding matt's avatar 2014-11-07 15:29:18 -08:00
Scott Erickson
a087663458 Implemented Heald's design of the GameMenuModal. 2014-11-07 13:02:28 -08:00
Nick Winter
fbc2799211 Startd to implement new code editor design. Fixed #1732. 2014-11-07 09:09:13 -08:00
Scott Erickson
e23e6f4ad2 Refactored the names of the play modal files. 2014-11-07 07:04:10 -08:00
Matt Lott
b4dde5705b Place error message over Surface next to line 2014-11-06 21:43:43 -08:00
Scott Erickson
424c3a6d3e Integrated the new PlayHeroesModal into the game, refactoring PlayLevelModal into LevelSetupManager. 2014-11-06 16:23:23 -08:00
Scott Erickson
790dd8e7e0 Enabled the heroes button on the world map. 2014-11-06 16:01:40 -08:00
Matt Lott
453960b3fb A/B Run and Submit button text 2014-11-06 14:44:56 -08:00
Nick Winter
fe7e96ab4e Started restricting common items with APIs that will make it impossible to win certain dungeon campaign levels. 2014-11-05 20:56:17 -08:00
Nick Winter
35f5fd1c84 Hid some buttons that take us to old account/settings/achievements pages for now. Made property documentation popovers chill over to the left. 2014-11-05 19:23:55 -08:00
Scott Erickson
c660053dea Set up the PlayHeroesModal, and hooked it into the world map. 2014-11-05 19:04:14 -08:00
Nick Winter
189c3d202c Goals now show status: 'Running...' while the world is simulating. 2014-11-05 14:42:55 -08:00
Nick Winter
a73b7df179 Added i18n for some more inventory screen strings. 2014-11-05 14:33:56 -08:00
Nick Winter
6c15833b70 Removed confusing ThangAvatarView title so as not to disturb beginner players in hero levels. 2014-11-05 13:49:49 -08:00
Nick Winter
a2554570b0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-05 07:50:13 -08:00
Matt Lott
40506d23a6 Admin growth view 2014-11-04 22:17:49 -08:00
Nick Winter
f461aeca95 Implemented new playback scrubber textures. 2014-11-04 19:03:35 -08:00
Nick Winter
b776350e6a Made item shop fit on iPad and small screens. 2014-11-04 08:39:36 -08:00
Nick Winter
ff1f9d488c Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins. 2014-11-04 07:52:23 -08:00
Nick Winter
9dba7ee187 Temporarily making Wizard/Ranger gear unpurchasable while we have no Wizards or Rangers. 2014-11-04 07:19:30 -08:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
447432301d Turning some links into buttons for iPad. 2014-11-03 09:58:57 -08:00
Nick Winter
75f624c10b More iPad tweaks. Can now switch back to logging in from signing up. Default to signing up instead of logging in. 2014-11-02 18:36:43 -08:00
Nick Winter
ad2fdb9dde Working on new Fully Illustrated designs for level play view and iPad interface. 2014-11-02 14:51:01 -08:00
Nick Winter
a061ab5148 Some styling and animation tweaks to the level loading screen. 2014-11-01 11:10:26 -07:00
Matt Lott
35cba4a90d Sync PVP status view and bug fixes
Pvp status view (temp location and UI)
Remove pvp status from control bar
Add game menu param for jumping into a specific tab
Lots of bug fixing and session state cleanup
Does not address problems with executing real-time multiplayer cast
2014-10-31 16:33:43 -07:00
Nick Winter
47c090f7c7 Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of. 2014-10-30 13:07:04 -07:00
Imperadeiro98
f0c1730a76 Updated obsolete tip 2014-10-30 17:01:27 +00:00
Nick Winter
7da65dec5b Including leather boots as required gear better. Labeling 'Your Skills'. Not showing a minus for incomplete goals. Adding script triggers for deleting required sample code. 2014-10-29 22:29:36 -07:00
Scott Erickson
02eacbbc8f Added a button to switch between world maps. 2014-10-29 09:48:37 -07:00
Nick Winter
5ba1f61abe Added i18n support for level code comments. 2014-10-28 21:15:47 -07:00
Scott Erickson
a4729d9d6b Finished migrating the guide into game menu. 2014-10-28 16:30:40 -07:00
Scott Erickson
9e6fd119a0 Achievements populate i18n whenever they're edited now. 2014-10-28 13:09:07 -07:00
Scott Erickson
e5ea4f70e9 Added a progress bar to the i18n home view. Sorting models by completion so documents needing translation go to the top. 2014-10-28 11:28:31 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Nick Winter
206f7ee5a4 Upgraded ChooseHeroView: drag onto hero, more visible drag states and animations, emphasize double-click over drag, better programming language selector. 2014-10-27 11:17:34 -07:00
Nick Winter
6b423ed13e Added signup to game menu modal. 2014-10-27 09:27:57 -07:00
Nick Winter
4c8e67efce FastClick avoidance on start level button. 2014-10-26 17:49:45 -07:00
Matt Lott
7c21d5921e Update query for user code problems view
So it doesn’t explode in production.
2014-10-26 10:50:30 -07:00
Nick Winter
6473fff940 Implemented stat comparison bars on ChooseHeroView. 2014-10-25 21:53:55 -07:00
Matt Lott
185c977cdb User code problems admin view
Shows the most recent 1000 log entries
Url: admin/user-code-problems
2014-10-24 15:11:55 -07:00
Nick Winter
13fe1bbece Improved branching choices and set up an A/B/C/D test around branching. 2014-10-23 16:37:09 -07:00
Nick Winter
7f8216f482 Experimental branching support, visible to admins. 2014-10-22 15:42:51 -07:00
Nick Winter
afc6558edc Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging. 2014-10-22 10:46:34 -07:00
Scott Erickson
1f7d098b2e Added rotation buttons in the context menu and shortcuts to the level editor. 2014-10-22 07:53:49 -07:00
Nick Winter
7c2982d3f1 Adding some logging for crazy save validation bugs. Swapping in flag item slot. 2014-10-21 13:57:49 -07:00
yjw9012
ca09381d42 Fixed #1567
Moved the code diff control to the top of the list, and added a short
instructional message.
2014-10-20 23:12:00 -07:00