codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10813 commits 27 branches 0 tags 134 MiB
Commit graph

1160 commits

Author SHA1 Message Date
Scott Erickson
b567e737cd Tweaked campaign editor styling. 2014-12-23 09:19:24 -05:00
Scott Erickson
e6c914f443 Tweaked campaign editor styling. 2014-12-23 09:19:08 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
2df1318e1b Hooked up i18n for redesigned contribute view. 2014-12-19 15:35:18 -08:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -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
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -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
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
774d366d96 Fixed error padding issue on AuthModal. 2014-12-07 14:37:13 -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
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
f504490a37 Using big green button for account creation. 2014-12-06 18:18:42 -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
b976a11d65 Removed the module loader modal, replaced with a simple progress bar at the top of the screen. 2014-12-06 13:11:47 -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
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
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
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -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
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
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
4b75516a88 Fixed Amara's positioning. 2014-12-01 17:08:48 -08: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
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
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
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
b8d4f00cd4 Merge pull request #1813 from ebirkenes/tmp 
Fix for #1795
 2014-11-29 10:40:48 -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
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
Erlend Birkenes
744b856092 Fixed padding on language-dropdown 2014-11-28 12:10:57 +01: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
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
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
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
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
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
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
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
1535b6bdd2 Fixed play footer in new styling regime. 2014-11-23 15:48:08 -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
b359c25c97 Fixed multiplexed-by-code-and-spoken-language component documentation i18n. 2014-11-23 10:22:06 -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
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
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
96ff44017e A few fixes for unequippable cross-class item state. 2014-11-18 19:37:08 -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
1889c771f2 Added the close button to the GameMenuModal. 2014-11-18 13:57:44 -08:00
Scott Erickson
3008abed19 Made the Equip button in the inventory modal green. 2014-11-18 13:52:39 -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
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
208f05cf67 Added an equip button to every piece of available equipment. 2014-11-18 13:02:06 -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
Scott Erickson
8c953fffed Hid the G+ "Welcome back" message, since we are managing logins manually now. 2014-11-14 11:14:08 -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
ed8285248f Put in the new InventoryModal background. 2014-11-12 18:01:35 -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
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -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
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
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
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
Scott Erickson
424c3a6d3e Integrated the new PlayHeroesModal into the game, refactoring PlayLevelModal into LevelSetupManager. 2014-11-06 16:23:23 -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
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
a73b7df179 Added i18n for some more inventory screen strings. 2014-11-05 14:33:56 -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
081e1ced20 Killed scroll bars on programming language selection fancy select. 2014-11-05 14:02:49 -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
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
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
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
2dbdacd958 GoalsView should now roughly scale with the size of the screen. 2014-10-27 16:37:07 -07:00
Nick Winter
eeeb7d47c9 Messing with .executing styles to make them outrageously visible. 2014-10-27 15:54:56 -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
7b2964c6ef Formatting docs popovers for iPad. 2014-10-26 20:21:03 -07:00
Nick Winter
4c8e67efce FastClick avoidance on start level button. 2014-10-26 17:49:45 -07:00
Nick Winter
6473fff940 Implemented stat comparison bars on ChooseHeroView. 2014-10-25 21:53:55 -07:00
Nick Winter
3f5f292f0d Updated how we're sending over spell palette items to iPad app. 2014-10-25 16:26:03 -07:00
Nick Winter
774ae24b41 Fixed my Camera fix for point/region choosers. Trying to fix #1411 by insisting on monospace fonts in the code editor. 2014-10-25 11:47:04 -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
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
Matt Lott
56c15116a7 Swap problem alert error message and hint lines 
Also fixing problem alert border on Firefox.
 2014-10-20 21:20:33 -07:00
Nick Winter
7a9014f83a Several improvements to the victory modal. 2014-10-20 19:01:00 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
2e539debbb Added signup poke to HeroVictoryModal. 2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e More blingstrositization for the HeroVictoryModal. 2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54 First set of fixes to HeroVictoryModal. 2014-10-17 18:00:13 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Nick Winter
a922c9c6ef First draft of new hero spell palette that groups abilities by item. 2014-10-16 21:38:11 -07:00
Nick Winter
54de8482f1 Spell palette now hugs the spell editor, which itself shrinks as needed. 2014-10-16 12:08:21 -07:00
Nick Winter
d79d40b98c Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin. 2014-10-14 09:54:36 -07:00
Scott Erickson
6ff7cd12cc Mostly done with the victory modal. 2014-10-13 11:53:08 -04:00
Nick Winter
7487df5af8 Point out (and require) equipping of necessary items for first set of levels. Can now drag items to unequip. 2014-10-09 15:54:18 -07:00
Nick Winter
589c3b090c Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map. 2014-10-08 10:46:10 -07:00
Nick Winter
c6b398aae2 Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure. 2014-10-08 09:46:56 -07:00
Nick Winter
fcd174ed22 Re-enabled line-by-line highlighting through brute force for hero levels. 2014-10-07 22:28:53 -07:00
Nick Winter
31056933e9 Added volume control to world map. 2014-10-06 10:17:55 -07:00
Matt Lott
530da639d8 Removing css background-position-x usage 
Not supported in Firefox or Opera.
 2014-10-03 16:02:50 -07:00
Matt Lott
33055ca0b5 Fix IE9 world map game control button images 
Fixes #1625
 2014-10-03 15:39:33 -07:00
Matt Lott
49cf206be7 Border-image fallback for world map level buttons 2014-10-03 15:24:43 -07:00
Scott Erickson
df1c72d132 Fixed normalCanvas styling in the level editor. 2014-10-03 09:59:54 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Nick Winter
3636f3d259 Messing with the scaling on the dungeon map. 2014-10-02 14:05:18 -07:00
Nick Winter
16ff8c6601 Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails. 2014-10-02 12:10:24 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a Added new slot icons and dungeon map. 2014-10-01 18:17:21 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
0290db9cd4 Starting to try to get iPad to work during real-time playback. 2014-10-01 12:08:14 -07:00
Nick Winter
2611e441d7 Trying to standardize sass imports in an effort to test #1615, to no avail. 2014-09-30 16:17:54 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00
Scott Erickson
19e6b9d095 Fixed real-time placement of normal canvas, and brought the stop-real-time-playback-button on top of it. 2014-09-30 14:25:44 -07:00
Scott Erickson
6b03de0235 Merge branch 'master' into feature/webgl 2014-09-30 10:21:51 -07:00
George Saines
fcd943aa46 adding the teacher's page first draft for HoC 2014-09-29 11:47:40 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Nick Winter
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -07:00
Nick Winter
4ca7df0b32 A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet. 2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81 Completed transition to new hero levels. 2014-09-25 15:32:33 -07:00
Scott Erickson
06b106f42b Merged from master. 2014-09-25 10:52:27 -07:00
Scott Erickson
c7e7066aef Migrating surface to webgl. It sorta works! 2014-09-25 10:47:53 -07:00
Nick Winter
cde2acaea1 Disabled clicking spell palette entries for hero levels. 2014-09-24 22:52:18 -07:00
Nick Winter
58e0ba1c10 Hid flags view during real-time playback for non-flag-using levels. 2014-09-24 22:23:14 -07:00
Nick Winter
b2592aad8c Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle. 2014-09-24 21:01:58 -07:00
Nick Winter
6441a753d5 Improvements to lock state of items, differentiating between locked and unlocked and equipped vs. available better. 2014-09-24 20:15:17 -07:00
Nick Winter
e48fa5f0b7 Fixed bug with slow-mo heroes in ChooseHeroView. Added lock silhouette portraits. 2014-09-24 19:14:22 -07:00
Nick Winter
da83fee58f Unborked victory continue buttons when signup is needed. Fixed an issue with the DocFormatter being unable to display null current values. 2014-09-24 16:58:52 -07:00
Nick Winter
94838af17f Fixed scroll bars messing up inventory view. 2014-09-24 09:38:45 -07:00
Nick Winter
225fd0ca18 Moved world map level info to click from hover. 2014-09-23 19:12:05 -07:00
Nick Winter
7b15ecfab2 Improved comment visibility. 2014-09-23 18:29:04 -07:00
Nick Winter
c1023b137f Better pointing out of submit button when victory is ready. 2014-09-23 18:21:27 -07:00
Nick Winter
149848c971 Fixed temporary item restrictions. 2014-09-22 20:44:45 -07:00
Nick Winter
a79976e6a2 Bigass 'Stop' button in lower right during real-time playback. 2014-09-22 15:34:25 -07:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
Nick Winter
600e985259 Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected. 2014-09-21 20:19:27 -07:00
Nick Winter
949f4594af Showing goals on level loading view. 2014-09-21 15:52:49 -07:00
Nick Winter
0d495ba36e Press Start to begin playing levels. Fixed #1574. 2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce Fixed a bug with hero placeholder loading. Improved game menu modal close button usability. 2014-09-21 13:26:56 -07:00
Nick Winter
389f6fb9c1 Pre-assigning and limiting owned items based on level for now. 2014-09-21 11:24:37 -07:00
Nick Winter
e1790d5159 Restored item comparison in InventoryView, now o'ertop the hero. 2014-09-21 09:53:58 -07:00
Nick Winter
4cdff02a32 Implemented most of new inventory view. 2014-09-20 23:11:51 -07:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
e3b75a69ea Working on PlayLevelModal and ChooseHeroView. 2014-09-19 22:16:05 -07:00
Nick Winter
ec21637adf Showing the new hero levels instead of the old campaign levels on the /play-hero map. 2014-09-19 11:03:38 -07:00
Nick Winter
121ff0a4af Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now. 2014-09-18 18:25:33 -07:00
Nick Winter
8e17a54dc3 Fixed not being able to add properties in the Systems tab Treemas. 2014-09-18 15:13:17 -07:00
Nick Winter
5ddbbe7707 Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting. 2014-09-18 08:12:46 -07:00
Nick Winter
95e37fa3b2 Starting new front view (at /front for now) and play view (at /play-hero for now). 2014-09-17 18:56:08 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
George Saines
d1f6b6ef51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-09-04 16:59:52 -07:00
George Saines
0beb34e3db redoing the about page 2014-09-04 16:59:46 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Scott Erickson
bfae70ef13 Added a close button to the game menu modal. 2014-09-04 10:03:34 -07:00
Nick Winter
35f22e0f8c Fixed a few tome / canvas resizing bugs. 2014-09-03 18:35:14 -07:00
Scott Erickson
f519df6189 Wrapping up work on the folderized thangs treema in the level editor. 2014-09-03 16:51:09 -07:00
Scott Erickson
9439f0d47d Some tweaks and fixes to the folderized thangs in the level editor. 2014-09-03 15:38:57 -07:00
Scott Erickson
e1abf115f7 Folderizing thang types in the level editor. 2014-09-03 12:30:08 -07:00
Scott Erickson
5b57fa5c71 Tweaked the color selection for thang types. 2014-09-02 18:08:18 -07:00
Scott Erickson
621c684c74 Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly). 2014-09-02 17:53:39 -07:00
Scott Erickson
3fd9cb89ef Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly. 2014-09-02 17:26:02 -07:00
Scott Erickson
daca7b54f3 Refactored SystemTabView names, hid the add button in the systems tab. 2014-09-02 16:50:54 -07:00
Nick Winter
b20b819a1f Tweaked a few styles on the ThangsTabView. 2014-09-02 16:43:17 -07:00
Scott Erickson
55bac798ee Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width. 2014-09-02 15:33:23 -07:00
Nick Winter
ef9a983e30 Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs. 2014-08-31 12:21:25 -07:00
Nick Winter
5f132e55ba Fixed #1414. Also started lazily loading certain level editor tabs. 2014-08-30 23:04:45 -07:00
Nick Winter
a284c8eb37 Fixed #1428. 2014-08-30 21:16:01 -07:00
Nick Winter
aa54cc32d1 Fixed #1458. 2014-08-30 20:27:58 -07:00
Scott Erickson
5f11a5ecca Selected component in the thang components edit view shows up with a blue header. 2014-08-30 09:47:23 -07:00
Nick Winter
e5cf6c340b Fixed #1140. I just put it on the home page for now, but later we can put it somewhere where it makes sense. 2014-08-29 23:09:38 -07:00
Nick Winter
63f2c5db4f Fixed #1268. 2014-08-29 17:33:25 -07:00
Scott Erickson
570380c2a4 Merge branch 'master' into feature/defaults 2014-08-29 08:14:43 -07:00
Nick Winter
a4b2333fd3 Added Systems documentation. Fixed #1115. 2014-08-28 22:32:55 -07:00
Scott Erickson
2dde77f8b0 Merge branch 'master' into feature/defaults 2014-08-28 15:26:04 -07:00
Nick Winter
1094d09aa5 Fixed #1226. Fixed #1156. Fixed two other issues with spectate mode. 2014-08-28 11:23:52 -07:00
Nick Winter
54207f0f7d Fixed #1000. 2014-08-28 10:50:20 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
a0e1806239 Fixed a bug with old, un-migrated level-set-playing events in button handlers. 2014-08-28 09:52:51 -07:00
Nick Winter
28431703f5 Fixed #953. 2014-08-27 22:23:24 -07:00
Nick Winter
2ef7bff2c5 Fixed #886. 2014-08-27 17:54:16 -07:00
Nick Winter
92b29915e2 Finished fixing #841. 2014-08-27 17:26:56 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Nick Winter
50ad453345 Fixed #169. 2014-08-26 14:34:23 -07:00
Scott Erickson
ef8ca9874a For the markdown editor node, tweaked ace height, and made sure preview div is hidden by default. 2014-08-26 10:28:01 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Nick Winter
51bc98665a Removed more old editor root page bits. Like #1486 but keeping the editor titles. 2014-08-26 08:16:29 -07:00
Nick Winter
e666ee1dac Added stop playback button and real-time countdown screen. 2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
Nick Winter
9df0cfb93f A few changes to flags UX. 2014-08-25 14:02:23 -07:00
Nick Winter
718d586f07 A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in. 2014-08-24 21:39:34 -07:00
Nick Winter
3125c2b129 Add flag cursor and pending flags. 2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934 Fixed a couple bugs. Flags are now colored. 2014-08-24 12:33:46 -07:00
Nick Winter
2dca4d72fc Rudimentary flag buttons are in. 2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651 Sending flag history to the World for to make flag Thangs during simulation. 2014-08-23 17:26:56 -07:00
Nick Winter
8777a87774 Made a real-time playback button. 2014-08-23 14:31:38 -07:00
Nick Winter
c79541f669 Full-screen playback during real-time mode. 2014-08-23 13:54:52 -07:00
Nick Winter
6fee881efd Fixed a few more issues with playback. 2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73 Fixed some wonkiness with the playback scrubbing while streaming worlds. 2014-08-22 15:32:23 -07:00
Nick Winter
def4d01c8e Starting to let us control the size of the achievements popup, although much more Sass math is needed. 2014-08-19 19:21:36 -07:00
Scott Erickson
9f6bfb854d Fixed the markdown treema node after changes to the ace editor node on treema broke things. 2014-08-18 16:04:43 -07:00
Nick Winter
f1a9848366 Fixed a couple errors. 2014-08-15 10:27:36 -07:00
Nick Winter
32c74db282 Merge pull request #1442 from dkundel/master 
Fixing most of the issues described in #18
 2014-08-15 09:02:15 -07:00
Dominik Kundel
755a86e3d3 moving some styling 2014-08-15 01:56:01 +02:00
Scott Erickson
827f6ee8b8 Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way. 2014-08-14 14:04:03 -07:00
Dominik Kundel
702656ad02 Merge remote-tracking branch 'upstream/master' 2014-08-14 22:30:19 +02:00
Dominik Kundel
b1252a4426 moving the popover for palette entries into the body to fix layering with popover of autocomplete 2014-08-14 22:29:57 +02:00
Scott Erickson
c31a509472 Working on the inventory view. Added a way to get the current equipment config from the inventory view. 2014-08-14 10:44:04 -07:00
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -07:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Nick Winter
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Nick Winter
6d04b583f9 Added volume slider to game options. 2014-08-12 10:10:54 -07:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Scott Erickson
8fafd46b7f Reined in an overzealous css rule. 2014-08-12 09:04:36 -07:00
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
023fd40767 Renamed inventory to collectedThangIDs for Collects. #59 2014-08-11 12:52:40 -07:00
Ruben Vereecken
672b0f54f6 Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
Nick Winter
0074a04cfe Moved Restart into Game Menu. 2014-08-10 17:41:18 -07:00
Nick Winter
45c762fddc Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n. 2014-08-10 17:26:30 -07:00
Nick Winter
fb95f48f73 Implemented GameMenu OptionsView. 2014-08-10 16:27:33 -07:00
Nick Winter
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Scott Erickson
65658dec78 Small styling fix. 2014-08-10 13:07:06 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Jayant Jain
93fd301300 Increases add treema line height, components are selected after being added 2014-08-08 18:02:20 +05:30
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
George Saines
0549273d14 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8 community page redesign 2014-08-06 17:42:19 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Scott Erickson
eceac0bbc9 Hiding the randomize button overlay until #1409 is handled. 2014-08-05 15:06:11 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Nick Winter
3bbdee583d Better problem alert layout for alerts that include hints. 2014-08-04 20:16:12 -07:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Jayant Jain
549f2657ea Styles add button for addComponentsTreema 2014-08-04 07:53:24 +05:30
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Ruben Vereecken
d4043ac3db Implemented singleplayer and multiplayer games played on profile 2014-07-29 20:11:45 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
7987e1d05b Did a bunch related to achievements and user profile page 2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Jayant Jain
df554360fe Updates glyphicons for undo-redo, adds placeholder text for add thangs search 2014-07-26 01:55:15 +05:30
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded 
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
 2014-07-25 17:51:48 +05:30
Jayant Jain
86cf344f28 Adds preset images to preview the generated terrain 2014-07-25 17:50:02 +05:30
Dominik Kundel
5279b01483 fixed showing pinned popover 2014-07-23 17:39:16 +02:00
Dominik Kundel
4f6ca5335f fixed spell palette sliding behind HUD 2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3 fixed artefact 2014-07-23 15:26:22 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Ruben Vereecken
8969311d82 Butons on profile page now nicer 2014-07-22 21:52:52 +02:00
Ruben Vereecken
411bb87985 Added contributor categories to user profile page 2014-07-22 12:50:56 +02:00
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Ruben Vereecken
ebdbc0f891 Basis for user view is finished 2014-07-21 22:02:08 +02:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81 Half the account page is there 2014-07-21 13:40:11 +02:00
Darredevil
e43afcc0a9 Docs page enhancement 2014-07-21 02:23:01 +03:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Nick Winter
079d336881 Stopped .nano from overriding Bootstrap's column width for component docs page. 2014-07-17 16:36:59 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Nick Winter
855461a67e Don't let test view interfere with normal body styles. 2014-07-16 16:01:37 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Ruben Vereecken
c423fe989b Merge branch 'navbar' into achievements 2014-07-15 16:16:01 +02:00
Ruben Vereecken
40ba28f49b Basics for account and user home pages 2014-07-15 16:15:21 +02:00
Nick Winter
cfeb6c34a4 Merge pull request #1324 from Darredevil/master 
docs page minor update
 2014-07-14 13:23:52 -07:00
Ruben Vereecken
1f1ff25a5a merge 2014-07-14 20:27:47 +02:00
Darredevil
c579742955 docs page update 2014-07-14 21:18:17 +03:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Ruben Vereecken
ae4a5eb460 Deduplicated bootstrap include 2014-07-14 18:52:23 +02:00
Ruben Vereecken
5aa6db7696 Made the sass more snappy 2014-07-14 18:40:23 +02:00