Commit graph

502 commits

Author SHA1 Message Date
Nick Winter
3f78071e5e A few small fixes. 2015-02-02 11:50:25 -08:00
Nick Winter
59a6d369a3 Merge pull request #2183 from rishiloyola/patch-7
Update hero-victory-modal.sass
2015-02-02 09:00:27 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Rishi
106d5f640e Update hero-victory-modal.sass 2015-01-31 17:40:34 +05:30
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Nick Winter
beb61ba8d4 Merge pull request #2094 from rishiloyola/patch-6
Update spell_palette_entry.sass
2015-01-13 11:06:50 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Rishi
8a4b6eebf4 Update spell_palette_entry.sass 2015-01-13 15:30:37 +05:30
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Nick Winter
6ec7066309 Using a couple more percentage margins/paddings in spell palette. 2015-01-04 09:08:59 -08:00
Imperadeiro98
c529c3d874 Update spell_palette.sass 2015-01-04 12:41:16 +00:00
Nick Winter
c2d74a812d Updates to require/restrict level logic. 2015-01-02 15:44:43 -08:00
Nick Winter
913de5dc8c Additional tweak for #2005. 2014-12-28 15:26:04 -08:00
Imperadeiro98
9018e41c2c Fixed a issue 2014-12-28 22:43:08 +00:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Nick Winter
f0826c865e Preparing new campaign levels for migration to new campaign editor. 2014-12-23 17:14:35 -08:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -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
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
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
Nick Winter
7651eaf6cc Fixed A/B test to fire with default English language. 2014-12-09 11:15:03 -08:00
Matt Lott
1aff798c5e A/B Test alternate subscribe modal copy 2014-12-08 23:43:52 -08:00
Nick Winter
74b426ffbf Fixed #1875. 2014-12-08 06:24:59 -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
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
6880a9621e Fixed overeager modal selection on PlayHeroesModal. 2014-12-07 14:32:23 -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
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
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
Matt Lott
bd797e8cfd Highlight locked default code 2014-12-04 16:33:59 -08: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
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
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
Nick Winter
65dde043c7 SubscribeModal is in. 2014-12-03 09:14:14 -08:00
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -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
35f1ed1e82 Implemented George's new level loading view design. 2014-11-30 18:02:45 -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
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
Nick Winter
9471beafd9 A few fixes for PlayHeroesModal and InventoryModal. 2014-11-30 14:00:29 -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
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -08: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
Scott Erickson
8f55b9bc1b Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal. 2014-11-25 12:43:17 -08:00
Nick Winter
bbc9b615ea ItemDetailsView showing item descriptions now. 2014-11-25 10:28:31 -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
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
Nick Winter
6851c309fb Moved older campaigns from world map view to site footer. 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
Matt Lott
fbed0dd13d Jiggle spell palette popover onclick in hero level 2014-11-22 17:35:05 -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
cee017c7ec Moved spell palette popovers to top placement if dialogue view is active. 2014-11-21 12:14:37 -08:00
Nick Winter
cfe1b020c3 Fixed esc shortcut when editor is disabled. 2014-11-21 11:07:57 -08:00
Nick Winter
6d7bc9ce11 Fixed #1729. 2014-11-20 17:09:29 -08:00
Nick Winter
46c4601ac6 Levels (back) link now embiggened. 2014-11-20 11:11:38 -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
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
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
2af8271829 Some size/styling tweaks for goals and gold. 2014-11-19 09:01:01 -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
Scott Erickson
6440ce528b Fixed the CSS of the item details view in the scrunched item store. 2014-11-18 13:48:59 -08:00
Scott Erickson
acd94c4247 Fixed the nanoscroller in the item details view to be off the sheet and always visible. 2014-11-18 13:44:34 -08:00
Matt Lott
b000389b3a Add problem range highlighting back
Now full line still pulses, and specific problem range has a darker red
background.
2014-11-18 10:03:02 -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
Nick Winter
e5aada2e5b Incorporated tweaked victory modal background assets. 2014-11-16 21:26:21 -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
Nick Winter
29860caeea Implemented new blue background texture for dialogue messages. 2014-11-12 20:45:15 -08:00
Scott Erickson
73fee3e801 Added a gems icon to the world map. 2014-11-12 17:19:56 -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
ad35109878 Built the BuyGemsModal stub. 2014-11-12 09:40:55 -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
bc8a51e023 Added a missing file from last commit. 2014-11-10 18:13:36 -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
9b074841d6 Messed around with some of the new modals' scroll bars. 2014-11-09 19:39:09 -08:00
Nick Winter
fb040fd882 Fixed some play subview positioning on iPad. 2014-11-09 08:48:11 -08:00
Matt Lott
cb49a0395a Update red pulse background css order 2014-11-08 22:04:10 -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
b74ad24aa8 A few sass tweaks to problem alerts and level loading. 2014-11-08 11:59:39 -08:00
Nick Winter
f9370532af Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-08 11:51:38 -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
4cb641689c Increased dimming behavior when parts of the DOM are locked. 2014-11-08 08:58:36 -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
Matt Lott
588fa0620e Jiggle user code problem alert 2014-11-07 22:46:12 -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
Scott Erickson
75226be778 Experimenting with a larger currently-executing-line pointer. 2014-11-07 13:58:02 -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
Nick Winter
03852fb44f Plannable pickUpFlags support and fixes for playing Coinucopia. 2014-11-06 18:21:54 -08:00
Nick Winter
ce8b3bc83c Added hero components projection for good hero stat comparison bars. Fixed overflow/scrolling on code language selector for play-heroes-modal. 2014-11-05 19:37:13 -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
36c753a828 Returning executed statement highlighting to deemphasized state when playback has ended. 2014-11-05 17:47:23 -08:00
Nick Winter
aa9c3b5eaa Fixed iPad scrubber positioning. Reworked spell debug progress stepper to use drags instead of hover. Hiding spell debug progress stepper based on level, not statements executed. 2014-11-05 17:34:56 -08:00
Nick Winter
46409ef10d Made goals styling more robust to different sizing scenarios. 2014-11-05 15:06:26 -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
2e3755d2b9 Disabled gem/xp pulse animation on iPad, since it's too slow to do it justice. 2014-11-05 14:07:04 -08:00
Nick Winter
f461aeca95 Implemented new playback scrubber textures. 2014-11-04 19:03:35 -08:00
Nick Winter
49b8c745a0 New GoalsView background. Be my guest with any text color improvements. 2014-11-04 17:20:58 -08:00
Nick Winter
b776350e6a Made item shop fit on iPad and small screens. 2014-11-04 08:39:36 -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
Nick Winter
bfdc671b1d Made Open Sans Condensed use small-caps in a bunch of the places it's used as a header font to slightly better match the old font weights of Bangers. 2014-11-03 22:19:43 -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
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
6184171f2d Pushing playback menu down in accordance with control bar. 2014-11-02 15:22:22 -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
01fccf5ab7 Started highlight arrow sound A/B test. Hid more of the HUD when hiding. Support for knowing whether your killer was hurt when firing world:thang-died notes. 2014-10-30 19:18:03 -07:00
Nick Winter
57680f4a83 Hide HUD until Kithgard Gates. 2014-10-30 16:59:32 -07:00
Scott Erickson
02eacbbc8f Added a button to switch between world maps. 2014-10-29 09:48:37 -07:00
Scott Erickson
a4729d9d6b Finished migrating the guide into game menu. 2014-10-28 16:30:40 -07:00