1734 commits

Author	SHA1	Message	Date
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
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	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	a65dabad04	Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay.	2014-10-17 15:25:31 -07:00
Nick Winter	c4207873d7	Merge pull request #1681 from Imperadeiro98/patch-1 ... Update cast_button.jade	2014-10-17 10:11:40 -07:00
Imperadeiro98	3b9feebee8	Update cast_button.jade ... Internationalized "Submit".	2014-10-17 17:06:25 +01:00
Nick Winter	7f60701daa	Merge pull request #1678 from yjw9012/master ... #1668: moved the question above the dropdown	2014-10-17 08:50:42 -07:00
Nick Winter	005b4991cd	Merge pull request #1680 from Imperadeiro98/patch-1 ... Update level_loading.jade	2014-10-17 08:48:47 -07:00
Nick Winter	7bc50ade30	Fixes for spectate layout in new WebGL dual-stage mode.	2014-10-17 08:47:53 -07:00
Imperadeiro98	f496823bb5	Update level_loading.jade ... Removed an unused tip.	2014-10-17 16:38:21 +01:00
yjw9012	30b261e40a	Merge remote-tracking branch 'upstream/master'	2014-10-16 23:27:50 -07:00
yjw9012	fe66b6e960	#1668: moved the question above the dropdown ... moved the question ‘which programming do you want to use?’ above the programming language dropdown.	2014-10-16 21:39:59 -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
Scott Erickson	fbaced90c3	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-10-15 16:43:37 -04:00
Scott Erickson	9455199b39	Limited social media library loading to only those views that need it.	2014-10-15 16:43:26 -04:00
Nick Winter	5c40f99d99	Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit.	2014-10-14 22:38:22 -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	99e5941126	Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels.	2014-10-13 17:18:33 -04:00
Scott Erickson	6ff7cd12cc	Mostly done with the victory modal.	2014-10-13 11:53:08 -04:00
Imperadeiro98	3c5adb7bad	Update level_loading.jade ... This tip was removed some time ago from the locale files.	2014-10-11 10:19:30 +01:00
Imperadeiro98	cc5a2508d9	Update victory.jade ... Corrected some i18n errors.	2014-10-09 14:29:48 +01:00
Nick Winter	d6b7616f15	Updated keyboard shortcut symbols.	2014-10-06 15:04:42 -07:00
Matt Lott	efa1f7c4a3	Disable Google+ on login modal for IE ... This is causing script errors in IE10.	2014-10-06 13:38:08 -07:00
Nick Winter	31056933e9	Added volume control to world map.	2014-10-06 10:17:55 -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	285264ceb4	Skip past hero selection if hero has already been selected.	2014-10-02 11:18:43 -07:00
Nick Winter	40b61c32f2	Linked iPad preview video from teacher's page.	2014-10-02 01:20:45 -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	5dd7c3ffa1	Adding some iPad event publishing optimizations. Fixed #1623.	2014-10-01 10:58:19 -07:00
Nick Winter	8d37309de1	Several fixes for achievement recalculation.	2014-09-30 19:32:11 -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	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
Matt Lott	c50b443eca	IE9 compat: css fixes ... Linking to bless-brunch git for fixes that blocked bless from splitting app.css into multiple files to address IE9 limits. sass-brunch version update fixes problems during the css file-splitting that were messing up nested @media queries.	2014-09-25 16:17:35 -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
George Saines	8183d671b8	simplifying the homepage	2014-09-25 14:38:02 -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	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	73d6261b5d	Hide run shortcut (shift+enter) for first few levels so as not to distract. Don't show beautification button in Python mode. Don't show maximize editor button in hero levels. Don't show method selector if there's only one method. Renamed some spells to methods. Added a bit of i18n.	2014-09-24 16:29:28 -07:00
Nick Winter	a786b1e096	Changed world map to click on iPad, hover otherwise.	2014-09-24 15:21:39 -07:00
Matt Lott	73e49f9972	IE11 compatibility fixes ... Removing social share buttons from base if IE, except Facebook. Unrolling restricted property setting loop (weird). Updating isIE check to support IE11.	2014-09-24 12:17:13 -07:00
Nick Winter	94838af17f	Fixed scroll bars messing up inventory view.	2014-09-24 09:38:45 -07:00
Nick Winter	8d6b23274b	Zoom in on hero during real-time playback.	2014-09-23 22:10:18 -07:00
Nick Winter	225fd0ca18	Moved world map level info to click from hover.	2014-09-23 19:12:05 -07:00
Nick Winter	af6e770c30	Changed name of Stop button to Skip in real-time playback.	2014-09-23 18:23:28 -07:00
Nick Winter	a6473c2cf3	Merge pull request #1588 from ThatOtherPerson/add-quotes ... Add some more quotes for #710	2014-09-23 17:54:56 -07:00
David Beckley	8d7ed040af	Add more quotes for #710	2014-09-23 17:46:02 -07:00
Nick Winter	a57cc0126e	A few more tweaks for #1584. Hero victory now always goes to world map.	2014-09-23 17:13:41 -07:00
Nick Winter	e109cbbbdc	Hid world map level icons for now. Hid play counts when fewer than 20 players. Disabled Zatanna for now until it can stop doing this.this.moveRight()(). Disabled hover debugger for new hero levels for now. Fixed bug with victory modal not allowing replay of completed non-hero levels.	2014-09-23 11:39:56 -07:00
Nick Winter	8640369b26	Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor.	2014-09-22 21:50:48 -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	42b52f5593	No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.	2014-09-21 22:10:52 -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	9f6e1e081c	Using language choice from ChooseHeroView.	2014-09-20 16:04:13 -07:00
Nick Winter	ae7a2dfe6a	Testing out the new comment preservation in locale files.	2014-09-20 09:17:10 -07:00
Nick Winter	e3b75a69ea	Working on PlayLevelModal and ChooseHeroView.	2014-09-19 22:16:05 -07:00
Nick Winter	81a5b73f93	Fixed a few misc bugs I noticed with the job profiles.	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	791c23c7e7	Fixed #1573.	2014-09-18 16:39:50 -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	689a4241d4	Final Criss-Cross tournament results.	2014-09-17 22:37:34 -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	1f71a1eaf9	Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs.	2014-09-16 20:19:52 -07:00
Nick Winter	89aa930803	Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio.	2014-09-15 15:38:07 -07:00
Daniel James Smith	3dd888469e	Added i18n-tags in admin.jade and community.jade and updated the locale files (en, de-DE and de-AT) accordingly	2014-09-15 18:36:45 +02:00
Nick Winter	75538a158e	Merge pull request #1523 from Imperadeiro98/patch-3 ... Level editor fixes	2014-09-06 19:56:22 -07:00
Nick Winter	067b32dfbf	Merge pull request #1520 from Imperadeiro98/patch-1 ... Fixed a typo	2014-09-06 19:55:26 -07:00
Nick Winter	2f07c3e8d3	Adding communication with iPad app.	2014-09-06 19:50:31 -07:00
Imperadeiro98	c6f6282ae1	Update edit.jade ... Fixed some errors	2014-09-06 17:32:01 +01:00
Imperadeiro98	66451b6ef0	Fixed a typo	2014-09-06 10:18:16 +01:00
Nick Winter	88144024c4	Updated about page i18n.	2014-09-05 09:12:05 -07:00
Imperadeiro98	319b9a3400	Update about.jade ... Updated some i18n (it is also needed to add line 42, 45-47, 56)	2014-09-05 09:25:32 +01:00
George Saines	0beb34e3db	redoing the about page	2014-09-04 16:59:46 -07:00
Scott Erickson	bfae70ef13	Added a close button to the game menu modal.	2014-09-04 10:03:34 -07:00
Scott Erickson	7fb89a9e7e	Making the thangs column in the level editor hidden by default again.	2014-09-03 17:27:19 -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
Nick Winter	6b6c8dd683	Merged master into feature/realtime-multiplayer; looks good.	2014-09-03 16:14:33 -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	fa0f904fbb	Fixed a couple bugs with Achievements not getting schema defaults.	2014-09-02 16:48:16 -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	d8ef2f8596	Made new related achievements open in a new tab in the level editor.	2014-09-02 15:00:14 -07:00
Scott Erickson	9c841991fd	Added links to the versions modal.	2014-09-02 11:07:58 -07:00
Nick Winter	e615dde6e2	Show inventory view now, for hero levels.	2014-09-01 21:10:45 -07:00
Nick Winter	3e0518cd70	Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.	2014-09-01 09:11:10 -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
Nick Winter	77e7efebeb	Fixed #1385: no more redundant fallback localization files.	2014-08-30 19:30:33 -07:00
Nick Winter	24d3d189df	Made espionage mode simpler, and added an admin user lookup.	2014-08-30 17:09:57 -07:00
Nick Winter	a8644d030e	Fixed #1355.	2014-08-30 14:30:53 -07:00
Imperadeiro98	caa372628b	Fixed errors	2014-08-30 13:48:19 +01: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
Matt Lott	92cad5f46f	Real-time multiplayer subscription schemas	2014-08-29 15:10:04 -07:00
Scott Erickson	570380c2a4	Merge branch 'master' into feature/defaults	2014-08-29 08:14:43 -07:00
Matt Lott	68cca74b43	Real-time multiplayer initial commit ... Simple matchmaking, synchronous multiplayer PVP, flags! Rough matchmaking is under the game menu multiplayer tab, for ladder games only. After creating a 2-person game there, you can exit that modal and real-time cast to play against each other. If you’re the first person to cast, you’ll sit at the real-time level playback view waiting until the other player casts. When they do, you both should start the real-time playback (and start placing flags like crazy people). If in a multiplayer session, the real-time simulation runs the players’ code against each other. Your multiplayer opponent’s name should be up near the level name. Multiplayer sessions are stored completely in Firebase for now, and removed if both players leave the game. There’s plenty of bugs, synchronization issues, and minimal polish to add before we push it to master.	2014-08-28 23:34:07 -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
Scott Erickson	8b056cfb8f	Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.	2014-08-28 11:24:45 -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	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	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
Nick Winter	35b107cf58	Refactored grid. Fixed #158.	2014-08-26 13:56:57 -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
Imperadeiro98	32de00a87f	Update user_home.jade ... Fixed some errors.	2014-08-26 10:33:00 +01: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
George Saines	f5790907a1	removing editor page	2014-08-25 20:27:50 -07:00
Nick Winter	9df0cfb93f	A few changes to flags UX.	2014-08-25 14:02:23 -07:00
Scott Erickson	d392994a83	Merge branch 'master' into feature/defaults	2014-08-25 13:00:33 -07:00
Nick Winter	e278f3ecb4	Merge branch 'stream'	2014-08-25 09:11:57 -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	2dca4d72fc	Rudimentary flag buttons are in.	2014-08-23 19:00:35 -07:00
Nick Winter	8777a87774	Made a real-time playback button.	2014-08-23 14:31:38 -07:00
Scott Erickson	4520c0f2b6	Merge branch 'master' into feature/defaults	2014-08-23 11:08:54 -07:00
Scott Erickson	1c5db3f2b7	First round of getting the site to use the new defaults system, in particular the job profile view.	2014-08-23 11:07:52 -07:00
Imperadeiro98	c0c3879bb1	Fixed typo	2014-08-22 13:15:47 +01:00
Nick Winter	2c6fc67db2	Some simulation and ladder fixes. Preparing Criss-Cross tournament.	2014-08-18 21:49:58 -07:00
Scott Erickson	f8d4e42c67	Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork.	2014-08-18 15:25:45 -07:00
Nick Winter	4a133f6998	Added popovers to community social link logos.	2014-08-15 09:43:55 -07:00
Ruben Vereecken	40818fd7bc	GitHub Login implemented	2014-08-15 16:20:45 +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
Nick Winter	719e64e85f	Added a quick visualization of language localization completion to the Diplomat page.	2014-08-14 11:43:40 -07:00
Nick Winter	18b0208aac	Updated i18n.	2014-08-14 10:57:57 -07: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	99d29bd206	Merge pull request #1437 from Imperadeiro98/patch-1 ... Update diplomat.jade	2014-08-14 09:57:23 -07:00
Ruben Vereecken	dbff3e04d5	Job profile view works once again	2014-08-14 17:25:41 +02:00
Imperadeiro98	d7270335ca	Update diplomat.jade ... Added all the languages and myself.	2014-08-14 09:04:29 +01:00
Nick Winter	0084b64d67	Made some updates to the community page.	2014-08-13 20:45:33 -07:00
Nick Winter	7844a2b987	Some fixes for new user views breaking on bad data or certain configurations.	2014-08-13 19:17:26 -07:00
Nick Winter	4f3af4d64f	Fixed #1433.	2014-08-13 14:57:07 -07:00
Nick Winter	bdb3e14189	Added missing ForkModal.	2014-08-13 14:26:56 -07:00
Scott Erickson	31e3e7f98e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-08-13 14:06:03 -07:00
Nick Winter	b7d5428d5f	Made Forking more abstract to apply to ThangTypes, too.	2014-08-13 11:36:00 -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
Nick Winter	9fd31c70e7	Hid parts of game menu that aren't ready yet.	2014-08-12 09:13:23 -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	31d7e641e6	Fixes for equipping items and adding them to the World.	2014-08-11 11:04:38 -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	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
Ruben Vereecken	e6569539dc	User page now uses the supermodel for user loading	2014-08-08 19:26:24 +02:00
Nick Winter	cc0ea25262	Merge pull request #1412 from rubenvereecken/meh ... Table headers are now unhoverable	2014-08-08 08:38:05 -07:00
Ruben Vereecken	47f00f9b5e	Added achievement deleting and automatic achievement filling	2014-08-08 17:20:07 +02:00
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
Ruben Vereecken	e082d363be	Table headers are now unhoverable	2014-08-07 13:12:30 +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
Ruben Vereecken	d42922871e	Added related achievements tab to level editor	2014-08-05 15:15:53 +02:00
Ruben Vereecken	7d7d5300c0	Refactored New Model Modal (from SearchView originally)	2014-08-05 14:33:33 +02:00
Ruben Vereecken	3266e3b46b	intermediate	2014-08-04 22:21:43 +02:00
Ruben Vereecken	fb3848359e	Merge branch 'master' into achievements	2014-08-04 17:55:44 +02:00
Ruben Vereecken	6267352c6e	Drastically changed the way achievements get grayscaled	2014-08-04 15:29:46 +02:00
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	026e6e6378	Added some support to fetch level sessions for the user profile page	2014-07-29 16:50:07 +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
Michael Schmatz	d7cb76d10c	Merge branch 'pr/1387' ... Conflicts: app/views/editor/level/LevelEditView.coffee	2014-07-25 19:17:16 -07: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
Darredevil	b77b796cef	Merge branch 'codecombat-master' ... Conflicts: app/views/docs/ComponentDocumentationView.coffee app/views/editor/level/LevelEditView.coffee	2014-07-25 22:48:13 +03:00
Jayant Jain	dc66218c00	Adds undo and redo buttons in editor topbar	2014-07-25 18:06:34 +05:30
Jayant Jain	598e727500	Adds an initial dungeon preset, refactors border code to properly create dungeon walls	2014-07-25 18:05:49 +05:30
Jayant Jain	80da704d19	Background image paths automated, adds preset image files	2014-07-25 17:54:10 +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
Darredevil	f78c48c893	Docs tab v2	2014-07-25 01:26:34 +03:00
Michael Schmatz	d773c301fb	Add message if no player code in profile	2014-07-24 10:47:27 -07:00
Michael Schmatz	2120657e5b	Add login link to profile login prompt	2014-07-24 10:16:43 -07:00
Michael Schmatz	7910c5d9cc	Implement #1370	2014-07-23 15:10:51 -07:00
Michael Schmatz	c4e3044a81	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 14:44:17 -07:00
Michael Schmatz	07cc01332d	Merge branch 'pr/1383' ... Conflicts: app/views/play/level/tome/SpellListTabEntryView.coffee	2014-07-23 14:44:15 -07:00
Nick Winter	26ac94367e	Fixed #1372. Minor fixes.	2014-07-23 08:59:42 -07:00
Scott Erickson	1c3404d03e	Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.	2014-07-23 07:02:45 -07: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	0d87209fa8	Recently played is now shown on account page	2014-07-21 19:06:22 +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	61ebc4d15b	Docs tab	2014-07-21 03:52:34 +03:00
Nick Winter	20df6b4ebe	Merge pull request #1360 from Darredevil/master ... Docs page enhancement	2014-07-20 17:00:37 -07:00
Darredevil	e43afcc0a9	Docs page enhancement	2014-07-21 02:23:01 +03:00
Nick Winter	a7905db316	Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.	2014-07-20 15:51:48 -07:00
Darredevil	f8cc64dc4c	fix for no user logged	2014-07-20 22:14:33 +03:00
Scott Erickson	e7a70bbd0b	Merge conflict handling.	2014-07-18 17:09:41 -07:00
Scott Erickson	97964f7853	More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.	2014-07-18 17:06:20 -07: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
Scott Erickson	2b4b91733c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-17 16:31:03 -07:00
Scott Erickson	45a8278e7e	Work on the job profile view, initial work on the code modal.	2014-07-17 16:30:56 -07:00
Nick Winter	a1aa71084d	Merge pull request #1344 from Darredevil/master ... fix for no user logged	2014-07-17 16:30:51 -07:00
Michael Schmatz	a9d664b8ec	Restored legacy candidates view	2014-07-17 13:16:17 -07:00
Scott Erickson	6f09e95d68	Removed background from job profile view.	2014-07-17 09:22:52 -07:00
Darredevil	80b420ebbf	fix for no user logged	2014-07-17 19:11:23 +03:00
Darredevil	8da06f6c6b	language sensitive docs added	2014-07-17 03:18:06 +03:00
Nick Winter	855461a67e	Don't let test view interfere with normal body styles.	2014-07-16 16:01:37 -07:00
Nick Winter	6e9091fdf0	More fixes to documentation popovers.	2014-07-15 19:25:53 -07:00
Nick Winter	e06f9132d1	Fixed #469.	2014-07-15 10:24:18 -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
Scott Erickson	b113e126a3	Fixes #1316 and #1318	2014-07-14 17:18:48 -07:00
Scott Erickson	9d22a35194	Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat	2014-07-14 15:13:52 -07: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	e748417007	GET /auth/name/<name> now serves possible free names ... anonymous users are now warned if their new name is already chosen User Settings is now without auto-save Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all. Refactored conflicted name checking so it can be used in more places Signup form now has an optional name field Covered extra case where the debounced check happened too late. Support for submitting on enter. Worked in scott's comments and got tests working again	2014-07-14 20:07:58 +02:00
Ruben Vereecken	a60451368e	Merged in master	2014-07-14 18:58:25 +02:00
Nick Winter	7446c9ee08	Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons.	2014-07-14 09:38:55 -07:00
Nick Winter	f1c8983de2	Don't ask for team again if we already have a child window.	2014-07-14 08:40:36 -07:00
Ruben Vereecken	7a52c195eb	More user navbar styling! Also need to investigate browser reflow	2014-07-14 15:32:02 +02:00
Ruben Vereecken	1aa566e4f7	Layout of navbar user dropdown about finished	2014-07-14 14:56:44 +02:00
Ruben Vereecken	5f2c7665ea	Navbar refactored, starting to look good already.	2014-07-14 14:20:13 +02:00
Tery Lim	0f4a7df982	Use spl instead of trailing space for spacing	2014-07-14 13:56:27 +08:00
Nick Winter	1a016394fe	Starting to show opponent code languages.	2014-07-13 20:19:51 -07:00
Nick Winter	f9822b65e4	Merge branch 'master' of git://github.com/jayant1992/codecombat	2014-07-13 18:21:27 -07:00
Jayant Jain	493ebd07e6	Changes randomise to randomize	2014-07-14 06:01:09 +05:30
Michael Schmatz	2a5a366c12	Made language selection in opponent modal	2014-07-13 17:22:06 -07:00
Nick Winter	01fdc5b520	Merge pull request #1311 from rubenvereecken/pretty_wizard_modal ... Bootstrappified Wizard Settings modal	2014-07-13 17:07:07 -07:00
Ruben Vereecken	bd7c2d0d36	Bootstrappified Wizard Settings modal	2014-07-14 00:25:24 +02:00
Jayant Jain	1e5edb5efd	Moves randomise modal template and view to editor/level/modal	2014-07-14 01:34:32 +05:30
Jayant Jain	be223197df	Updates i18n tags and en.coffee	2014-07-14 01:33:45 +05:30
Ruben Vereecken	9c0353a2f0	Merged in master	2014-07-13 21:18:32 +02:00
Nick Winter	202a562c51	Merge pull request #1303 from maryannv/patch-1 ... Add space before "Contribute"	2014-07-13 12:08:27 -07:00
Nick Winter	868a6ed43b	Fixed a couple i18n issues. Fixed #1302.	2014-07-13 09:31:56 -07:00
Maryann Vellanikaran	f9c92d2731	Add space before "Contribute" ... Before: http://cl.ly/image/0p1f1P1D0P2d After: http://cl.ly/image/3a0x12070C28	2014-07-12 15:45:53 -07:00
Nick Winter	45545796a0	Fixes, tweaks, and i18n for the employers page.	2014-07-10 19:17:51 -07:00
Jayant Jain	d6928eb1c4	Removes okay button, hides modal upon generation	2014-07-11 01:43:51 +05:30
Jayant Jain	da0b0d9830	Big terrain generator commit - ... 1.Adds method for randomising decorations/doodads 2.Creates presets 3.Adds thang clusters which can be used to create presets easily	2014-07-11 00:01:19 +05:30
Jayant Jain	b401b04893	Adds randomiseFloor and randomiseBorder functions	2014-07-11 00:01:19 +05:30
Jayant Jain	1436a4dac7	Cleans up some css for terrain generator modal	2014-07-11 00:01:18 +05:30
Jayant Jain	813ecaa59c	Adds randomise option to dropdown on editor page	2014-07-11 00:01:18 +05:30
Jayant Jain	c40da260f0	Adds initial modal and view for terrain generator	2014-07-11 00:01:18 +05:30
Nick Winter	bcf3c19f81	Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.	2014-07-09 15:32:57 -07:00
Nick Winter	4b16e2fc57	Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master	2014-07-09 13:53:58 -07:00
Nick Winter	ca847329b1	Merge branch 'dkundel-feature/fullscreen-editor'	2014-07-09 13:41:57 -07:00
Nick Winter	0ed8d2b371	Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it.	2014-07-09 13:41:42 -07:00
Darredevil	4309bfbe67	new Documentation page	2014-07-09 23:01:53 +03:00
Scott Erickson	d74a778f67	Made creating components open to everyone!	2014-07-09 12:21:32 -07:00
Ruben Vereecken	5dc54c784d	Added case and demo for user not found. Should be made prettier as soon as users can be queried by name	2014-07-09 18:13:22 +02:00
Ruben Vereecken	b065a524c1	Got down the basic layout for achievement overview ... Achievement style is now compatible between overview and popup	2014-07-09 15:06:47 +02:00
Nick Winter	928e4362ba	Made some style tweaks to the employers page to move the filters into a sidebar when authorized.	2014-07-08 20:47:22 -07:00
Michael Schmatz	21d056ff01	Instant application of filters	2014-07-08 11:19:14 -07:00
Michael Schmatz	aa40257034	Table styling/ copy edit	2014-07-07 23:23:36 -07:00
Michael Schmatz	e71ca28f02	Implement candidate filter counts next to filters	2014-07-07 21:43:30 -07:00
Michael Schmatz	08b9a8fdaa	Various changes to education filter	2014-07-07 21:04:12 -07:00
Michael Schmatz	30745a25ca	Consolidated iOS and Android into Mobile	2014-07-07 20:24:29 -07:00
Nick Winter	9381a4dec6	Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups.	2014-07-07 20:16:00 -07:00
Michael Schmatz	9313541f9f	Fixed targeting on employers CSS	2014-07-07 20:02:01 -07:00
Michael Schmatz	30671d82f6	Removed PM and Management from filters	2014-07-07 19:52:31 -07:00
Michael Schmatz	05560662dd	Various fixes to employer page/profile view	2014-07-07 19:34:36 -07:00
Scott Erickson	5d00aedac7	Widened the click area on the wizard settings view for color config.	2014-07-07 18:13:19 -07:00
Scott Erickson	2a309c149c	Enabled submitting patches for thangs and articles.	2014-07-07 15:19:22 -07:00
Michael Schmatz	b76239b4e9	Replaced candidate avatars on employer page	2014-07-07 10:29:35 -07:00
Scott Erickson	12543cf4dd	Added the foundation of a component docs view.	2014-07-07 10:11:02 -07:00
Michael Schmatz	3151db6fc5	Hide briefcase when no work history	2014-07-07 09:49:13 -07:00
Ruben Vereecken	ea3d1fee74	Starting on achievement overview style	2014-07-07 15:03:28 +02:00
Ruben Vereecken	10735867a4	Got some basic hierarchy set up for user view and template inheritance	2014-07-06 21:10:28 +02:00
Ruben Vereecken	e33bb44ffc	Start of new user routing and views are there	2014-07-06 20:45:27 +02:00
Scott Erickson	94a6e3961b	Added a button in the level editor to choose which team to play when editing a ladder level.	2014-07-05 13:54:41 -07:00
Ruben Vereecken	601c4e2731	Merged with master	2014-07-05 16:47:16 +02:00
Scott Erickson	81121faebf	Merge pull request #1242 from differentmatt/master ... Fix Placement Agreement typo	2014-07-04 17:39:38 -07:00
Ruben Vereecken	39fb2cb1b4	Added achievement preview, exp test, stuff	2014-07-04 19:27:37 +02:00
Ruben Vereecken	45798aab02	added images for achievements! Demo is now operational	2014-07-04 19:27:37 +02:00
Ruben Vereecken	a933f9737d	Creating achievement demo ... intermediate	2014-07-04 19:27:37 +02:00
Michael Schmatz	615303395c	Various fixes for recruiting page	2014-07-03 16:30:27 -07:00
Michael Schmatz	6c31f08853	Unchecked all by default	2014-07-03 15:48:50 -07:00
George Saines	4d12aff35e	removing the counselor from the contribute page and all other links	2014-07-03 15:42:24 -07:00
Michael Schmatz	52ddb8db62	Add login link and rounded corners for pics	2014-07-03 15:10:09 -07:00
Michael Schmatz	3f1547488c	Added login button and fixed bg color	2014-07-03 14:40:39 -07:00
Michael Schmatz	ae63461ef3	Filter functional	2014-07-03 11:39:44 -07:00
Michael Schmatz	b58f2c49eb	Fix description	2014-07-03 10:22:50 -07:00
Michael Schmatz	ed30d3292a	Filter button	2014-07-03 10:14:32 -07:00
Michael Schmatz	397140d9b0	Basic filtering ... Only visas work	2014-07-02 16:47:02 -07:00
Michael Schmatz	fe328a766b	Basic filtering functionality ... Still has a few bugs	2014-07-02 15:48:26 -07:00
Michael Schmatz	8e6807ab60	Redesigned layout of employers page	2014-07-02 11:44:33 -07:00
Michael Schmatz	5da1db8f6e	Made new recruitment base layout	2014-07-02 11:43:26 -07:00
Matt Lott	ffdd73a503	Fix Placement Agreement typo	2014-06-30 16:01:00 -07:00
Nick Winter	66da53f8f9	Launching the language selector on the front page.	2014-06-27 10:21:38 -07:00
Michael Schmatz	28bb28cf85	Fixed employer view for manually created candidates	2014-06-26 17:07:17 -07:00
Nick Winter	d360ecac94	Merged in the language-war branch.	2014-06-25 23:00:03 -07:00
Nick Winter	aee95ac5c0	Improved per-language spell palette and tab documentation.	2014-06-25 22:56:39 -07:00
Nick Winter	8c6ee66684	Better handling of alternate spell palette documentation syntax for other code languages.	2014-06-25 20:19:11 -07:00
Darredevil	a127cb7a5b	Added a joke tip	2014-06-26 02:11:15 +03:00
Philippe Rigovanov	f2898e3bc0	Update diplomat.jade ... added myself to diplomats	2014-06-26 00:56:41 +04:00
Nick Winter	04976a7b14	Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225.	2014-06-24 21:08:01 -07:00
George Saines	68d7b3997a	modifying the employer page to be more explanatory	2014-06-24 16:43:27 -07:00
Scott Erickson	9b873cfab4	Patch modal handles invalid patches.	2014-06-24 17:25:01 -04:00
Scott Erickson	ee0b14eb61	Changed the versions history modal to show name and date.	2014-06-24 16:41:55 -04:00
Nick Winter	8719b80663	Showing expired profiles to admins.	2014-06-24 10:15:38 -07:00
Nick Winter	3862bd2376	Clearing backups of old models when saving new versions of versioned models.	2014-06-24 09:43:20 -07:00
Nick Winter	815ef88e78	Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.	2014-06-23 10:36:42 -07:00
Nick Winter	1e9b403ce5	More zazz for home page code language selection.	2014-06-19 14:55:16 -07:00
Nick Winter	666c020389	Switching code language based on selection now.	2014-06-19 13:42:25 -07:00
Nick Winter	a58f3e0fb6	More styling work on code language selector.	2014-06-19 12:31:56 -07:00
Michael Schmatz	2559a73244	Merge pull request #1186 from dkundel/master ... Initial Autocomplete Version	2014-06-19 10:10:26 -07:00
Nick Winter	2e850dba78	Working on home language selection.	2014-06-19 08:06:34 -07:00
Michael Schmatz	548eaefae1	Add debug variable inspection progress bar	2014-06-18 13:43:04 -07:00
Dominik Kundel	d3e0299465	merge conflict solved	2014-06-18 17:59:26 +02:00
Dominik Kundel	f6355b034b	integrated autocomplete	2014-06-18 17:57:42 +02:00
Nick Winter	4bd02ba6dc	ModelModal now grants real ultimate power.	2014-06-17 15:17:25 -07:00
Nick Winter	0b8a0c8f6f	Added UserRemarks.	2014-06-17 13:03:13 -07:00
Scott Erickson	1786eab09d	Initial work on a demo view. But brunch won't build demo-app.js for some reason.	2014-06-16 11:40:08 -07:00
Michael Schmatz	84601d2927	Added more info email field to employer signup	2014-06-13 15:38:47 -07:00
Nick Winter	21e7487132	Showing more skills in employer table for better searching. Hid employer selling copy after sold.	2014-06-13 14:52:50 -07:00
Nick Winter	2bda60796a	Copy / i18n tweaks for tournament ending and employers blurb.	2014-06-13 08:08:13 -07:00
Nick Winter	1b2c4e078c	Fixed candidates viewing their own code and resetting it.	2014-06-12 17:52:08 -07:00
Nick Winter	28264d5ace	Added tournament results and a way to email them out.	2014-06-12 17:52:08 -07:00
George Saines	03aa0783b1	a few copy edits	2014-06-12 16:13:48 -07:00
George Saines	3415b62663	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-12 16:01:39 -07:00
George Saines	fb7b3f8580	adding a top info arena on top of the employers page	2014-06-12 16:01:34 -07:00
Michael Schmatz	32a041a5a7	Made max size of canvas much bigger for spectate view	2014-06-12 15:48:11 -07:00
Ruben Vereecken	aecf937722	Cleaned up achievement testing environment ... Made sure server sided tests work completely	2014-06-12 19:41:07 +02:00
Ruben Vereecken	2a5c2020ca	Added recalculation button to the achievement editor	2014-06-12 19:41:07 +02:00
Ruben Vereecken	7096a07ce8	Improved logging (winston) and admin-only'd the achievement editor	2014-06-12 19:40:59 +02:00
Nick Winter	77920b5416	Improvements to profile views. Added links to players' code.	2014-06-11 19:38:47 -07:00
Nick Winter	cb378c13e2	Fixed employer list template typo.	2014-06-11 09:15:41 -07:00
Nick Winter	69fc378930	Final tournament update blurb.	2014-06-10 16:51:36 -07:00
Nick Winter	f3d18efa90	Added employer_list and activity tracking.	2014-06-10 16:30:13 -07:00
Nick Winter	86223167af	Re-added significant trailing whitespace.	2014-06-10 07:46:43 -07:00
Nick Winter	22ca9507d0	Upgrades to employer's candidate indexing.	2014-06-09 22:17:53 -07:00
Michael Schmatz	693da57f13	Merge branch 'feature/linkedin-profile-import' ... Conflicts: app/templates/account/profile.jade app/views/account/profile_view.coffee	2014-06-08 18:37:33 -07:00
Michael Schmatz	f29a41f108	Add linkedIn link, field of study support to LinkedIn import	2014-06-08 18:15:18 -07:00
Nick Winter	bb5d23e6ba	Wrapped LinkedIn button in a .btn.	2014-06-08 18:51:45 -06:00
Michael Schmatz	7ec3910e36	Make LinkedIn import more robust	2014-06-08 17:38:02 -07:00
Nick Winter	cefeb1df14	Fixed backwards Approved button and candidate time sort.	2014-06-07 19:58:33 -06:00
Nick Winter	63a3aa9074	Fixes for browsing profiles by username.	2014-06-07 17:33:14 -06:00
Michael Schmatz	4072c1b969	Basic functionality done, needs validation error handling ... As well as formatting	2014-06-07 11:45:49 -07:00
Nick Winter	67b10474e8	Suggested improvements to profile pages.	2014-06-07 00:33:18 -06:00
Scott Erickson	49c9c6bfc9	Built the client test view (rebased from feature/testclient).	2014-06-05 16:56:29 -07:00
Nick Winter	f493f407c2	Fixed some bugs on job profile initialization.	2014-06-04 15:38:57 -06:00
Ruben Vereecken	ed44ab5f7d	Improved logging (winston) and admin-only'd the achievement editor	2014-06-02 21:07:23 +02:00
Ruben Vereecken	bb57756cd9	Processed Scott's feedback. Db endpoint slightly safer, some refactorings.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	8607162cd7	Finished designing achievement notify, for now.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d8bb802468	Designing the Notify to show level progress	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d766a24e11	Achievements now popup when polled for by the client	2014-06-02 20:33:01 +02:00
Ruben Vereecken	1b2a251c58	Achievement editor in place and looking mighty fine	2014-06-02 20:31:09 +02:00
Ruben Vereecken	c2d2f2a2b8	Refactorings performed necessary to have searchable for more uses	2014-06-02 20:31:09 +02:00
Nick Winter	10754e6825	Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton.	2014-06-01 16:45:19 -07:00
Nick Winter	d19b6760da	More flourishes for inline profile editor.	2014-06-01 11:45:01 -07:00
Nick Winter	400fddc294	Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry.	2014-05-31 22:09:41 -07:00
Nick Winter	852053022a	Started the horrifying migration to an inline jobs profile editor.	2014-05-30 22:12:44 -07:00
Scott Erickson	29011fab2a	Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.	2014-05-30 17:26:49 -07:00
Nick Winter	6b554e03ef	Merge pull request #1084 from domenukk/feature/step-single-frame ... Added shortcut for frame single-stepping	2014-05-25 09:37:13 -07:00
Dominik Maier	f62cd7f38b	+ added shortcut for frame single-stepping ... + fixed single stepping for frames	2014-05-24 17:31:59 +02:00
Jayant Jain	241adafad8	Adds nanoscroll for other tabs in editor	2014-05-24 12:02:26 +05:30
Jayant Jain	f17c5cfb51	Adds nanoscroll to thang tab in level editor	2014-05-24 12:02:26 +05:30
Scott Erickson	bfa90f671d	Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal.	2014-05-22 11:26:08 -07:00
Scott Erickson	d613c230ef	Fixed some text in the victory modal that wasn't showing up because of indentation.	2014-05-22 11:26:08 -07:00
Michael Schmatz	8604a0ed3c	Update rules about location restrictions ... Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.	2014-05-22 10:34:46 -07:00
Michael Schmatz	b31e6312ac	Updated rules to be subject to change	2014-05-20 10:10:40 -07:00
Nick Winter	b6406b9b0e	Put some tournament details in there. Muted some extra casting sounds during level load.	2014-05-19 21:56:20 -07:00
Nick Winter	b2cc3d0692	Fixed bug with preloading the world replacing casting the same world if timing was wrong.	2014-05-19 20:12:16 -07:00
Nick Winter	341097c5ca	A couple improvements for the LadderSubmissionView.	2014-05-19 19:51:24 -07:00
Michael Schmatz	d8df61f94b	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder.jade	2014-05-19 19:43:47 -07:00
Michael Schmatz	ca2e48b491	Edited judging criteria	2014-05-19 19:37:25 -07:00
Nick Winter	116965fcdc	Rules wording tweaks; highlighting new matches and end of ranking with sounds.	2014-05-19 19:13:36 -07:00
George Saines	8277472fda	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 17:59:48 -07:00
George Saines	4f763d0203	added the rules section	2014-05-19 17:59:43 -07:00
Nick Winter	af31bcf008	Fleshed out tournament prizes tab.	2014-05-19 17:40:06 -07:00
Scott Erickson	62ad8dd26a	Added a status message to the goals view.	2014-05-19 16:36:45 -07:00
dpen2000	10d0ef0606	Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly	2014-05-19 23:28:53 +01:00
George Saines	7c0d73e779	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 15:19:59 -07:00
George Saines	07177e1a89	putting together the prizes page	2014-05-19 15:19:56 -07:00
Nick Winter	8a5a45950f	Simulator now pleads for you to help simulate when your match is being ranked.	2014-05-19 14:59:47 -07:00
Nick Winter	68a4483e91	Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.	2014-05-19 11:58:53 -07:00
Scott Erickson	179702b0eb	Set up the goals view to be more hidden by default, and shows up on mouse hover.	2014-05-19 11:31:18 -07:00
Nick Winter	b89615cea4	Added helpful keyboard shortcuts modal.	2014-05-19 10:08:34 -07:00
Nick Winter	9df34875ee	Added tournament rules/prizes placeholders.	2014-05-17 20:43:05 -07:00
Nick Winter	3c9428ffd3	Refactored game ranking buttons into a LadderSubmissionView.	2014-05-17 11:55:51 -07:00
Michael Schmatz	934c853789	Live simulation count and fixed double simulator leaderboard session	2014-05-16 13:16:35 -07:00
Nick Winter	dbcafbb29b	Working on level-specific coding languages, with non-writable code in JavaScript.	2014-05-14 21:54:36 -07:00
Nick Winter	c420209a6b	Improved GoldView tooltip.	2014-05-14 16:06:00 -07:00
George Saines	75ab5d6435	making our recruitment % consistent	2014-05-14 14:55:04 -07:00
Nick Winter	53870a89a5	Python allowed, and better support for transpile errors.	2014-05-13 11:04:04 -07:00
Nick Winter	0b5854765a	Adding Clojure and Lua as choosable languages.	2014-05-11 22:51:44 -07:00
Scott Erickson	f1de2ca8d9	Brought the canvas size down again because it halves the FPS in Firefox at least.	2014-05-09 16:35:10 -07:00
Scott Erickson	e9fc3df7c1	Set up the versions modal to display changes between versions when you select two of them.	2014-05-08 10:54:39 -07:00
Scott Erickson	ed222338e7	Fixed #892 by having the components tab reload whenever it's opened.	2014-05-07 16:24:13 -07:00
Michael Schmatz	4221fd55cb	Fixed #979	2014-05-07 13:56:10 -07:00
Nick Winter	0e0ca785d9	Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.	2014-05-05 16:59:12 -07:00
Nick Winter	a04f74de8b	Implemented George's gold design.	2014-05-02 15:12:30 -07:00
Nick Winter	9d45b22057	Added some i18n tags.	2014-05-02 11:00:30 -07:00
Michael Schmatz	347292c985	Implemented save notes button	2014-05-01 17:36:49 -07:00
Michael Schmatz	9fb5826593	Scroll to candidate position while going back	2014-05-01 16:56:41 -07:00
Nick Winter	0f33bae1f1	Hid level done button better. Avoiding building wizard sprite when not needed.	2014-05-01 14:36:26 -07:00
Michael Schmatz	546bd26328	Fixed login flow and user profile issue	2014-04-29 15:12:50 -07:00
Scott Erickson	3a28f190a1	Merge branch 'master' into feature/loading-views	2014-04-28 11:55:17 -07:00
Nick Winter	4a2f2700bc	Don't show tutorial level link if tutorial level doesn't exist for a ladder level.	2014-04-28 10:54:03 -07:00
Scott Erickson	17a0bf54c6	Merge branch 'master' into feature/loading-views	2014-04-28 10:10:57 -07:00
Nick Winter	d245dfd34c	Merge pull request #915 from dpen2000/HideCreateComponentsSystems ... Hide Create New System/Component links in menus from non-admins	2014-04-27 20:25:06 -07:00
Nick Winter	c1637fe37a	Fixed merge conflicts in es-419.coffee.	2014-04-27 20:19:05 -07:00
Nick Winter	e65202434b	Merge pull request #890 from treby/update_ja_resource ... Update ja resource.	2014-04-27 20:12:14 -07:00
Nick Winter	dac4f05fd9	Improved legibility of gold font. Moved Done button to not conflict with gold display.	2014-04-27 14:19:39 -07:00
Scott Erickson	fed5d681f2	Merge branch 'master' into feature/loading-views	2014-04-26 12:54:37 -07:00
Nick Winter	834c27bbd7	Show spell palette for Thangs with apiProperties that aren't programmable.	2014-04-25 16:57:42 -07:00
Scott Erickson	6cd7c723d8	Fixed up showing errors, made sure they work with the play view.	2014-04-25 15:31:38 -07:00
Nick Winter	183fe9c496	Code review of 97d3b6.	2014-04-25 10:46:43 -07:00
Michael Schmatz	97d3b6107d	Merge feature/linkedin into master	2014-04-25 08:47:31 -07:00
Michael Schmatz	0dbcc861bf	Various tweaks to employer signup	2014-04-25 07:48:59 -07:00
Michael Schmatz	4f6f845c2d	Employer signup works	2014-04-24 17:36:07 -07:00
dpen2000	69b3fe4b8c	Hide Create New System/Create New Component links in menus from non-admins	2014-04-24 19:24:08 -04:00
Michael Schmatz	6644c6a9ee	Push for george	2014-04-24 15:27:37 -07:00
Nick Winter	8a42521cd0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 14:31:54 -07:00
Nick Winter	2a2ddd068e	Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.	2014-04-24 14:23:15 -07:00
Scott Erickson	2d43b36022	Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText	2014-04-24 13:29:24 -07:00
Scott Erickson	e2c2657f34	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 13:23:40 -07:00
Scott Erickson	472f8899dd	Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master ... Conflicts: app/views/editor/level/edit.coffee	2014-04-24 13:17:43 -07:00
Nick Winter	b9173a5ea5	Fixed #913, I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
Nick Winter	73f39095e6	Upgraded table sorter.	2014-04-24 11:09:01 -07:00
tmrdja	14ebc957de	Changed responsive view for LevelEditor	2014-04-24 11:51:16 +02:00
Nick Winter	68f3eeb770	Two tiny profile improvements.	2014-04-23 11:26:20 -07:00
Michael Schmatz	628a784ac4	Progress towards LinkedIn integration	2014-04-23 11:25:36 -07:00
Nick Winter	d4cf31c8fe	Improved admin view of pending candidates.	2014-04-23 10:21:58 -07:00
Scott Erickson	c85971e5e6	Added i18n population action to the level editor.	2014-04-22 17:56:41 -07:00
dpen2000	dd00e2abe6	Replace generic text Sign Up to Create a New Content	2014-04-23 00:37:10 +01:00
treby	6937d656c7	Added translate contributor.	2014-04-22 08:55:00 +09:00
Scott Erickson	f57be1ae52	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
tmrdja	826a5f56db	Added responsive view for LevelEditor	2014-04-21 21:15:22 +02:00
Michael Schmatz	486d1b75ff	Changed moar to More	2014-04-21 10:40:22 -07:00
dpen2000	c241b06f76	Modify links on community page	2014-04-19 20:03:22 +01:00
George Saines	fced3e821a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-18 13:02:11 -07:00
George Saines	71ee31ef49	styling the community page	2014-04-18 13:02:07 -07:00
Nick Winter	f38d17c64f	Protected candidates from view by employers they work(ed) at.	2014-04-18 12:48:13 -07:00
Nick Winter	848ebf2ffe	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-18 09:53:34 -07:00
Nick Winter	844c1391ca	Reworked top nav. Many improvements to job profile form.	2014-04-18 09:53:28 -07:00
Scott Erickson	cdaf2ebfaf	Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.	2014-04-17 14:23:33 -07:00
Scott Erickson	781a8ec913	Fixed the play and save buttons.	2014-04-17 13:37:08 -07:00
Scott Erickson	07afba01df	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/views/editor/level/thangs_tab_view.coffee	2014-04-17 13:25:42 -07:00
Scott Erickson	b5406b0149	Set up the rest of the component/system buttons and nav bars.	2014-04-17 13:24:17 -07:00
Scott Erickson	9eff958dcb	Fixed the level and component watch buttons.	2014-04-17 11:35:09 -07:00
Nick Winter	46487f55a4	Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping.	2014-04-17 11:34:55 -07:00
Scott Erickson	8f4535853b	Fixed the component history button.	2014-04-17 11:29:12 -07:00
Scott Erickson	6057bd94b9	Refactored how the editor sets up its special nav through base.jade.	2014-04-17 11:27:20 -07:00
Scott Erickson	4c1143f026	Tweaked the versions history modal.	2014-04-17 11:22:33 -07:00
Scott Erickson	8859405e18	Reworked the nav bars in the level editor.	2014-04-17 11:02:00 -07:00
Scott Erickson	02a7381fa9	Fixed the watch buttons for levels and components.	2014-04-16 11:02:40 -07:00
Scott Erickson	731726dcd3	Merge branch 'master' into feature/jsondiffpatch	2014-04-16 10:42:43 -07:00
Scott Erickson	f88e0ac0ab	Set up patches for components.	2014-04-16 10:42:32 -07:00
dpen2000	62e2de6cee	Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now	2014-04-16 17:07:25 +01:00
Scott Erickson	c395a3414e	Merge branch 'master' into feature/jsondiffpatch	2014-04-15 15:18:57 -07:00
dpen2000	a74f89c30c	Implement rank column in simulators leaderboard	2014-04-15 23:13:10 +01:00
Scott Erickson	58b1019934	Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.	2014-04-15 15:09:36 -07:00
Nick Winter	f762d95ab8	ModelModal and simple leaderboard pagination.	2014-04-15 15:01:54 -07:00
Nick Winter	9194f842e6	Added some job description fields.	2014-04-15 09:28:19 -07:00
Nick Winter	03df078d5a	Couple job profile fixes.	2014-04-15 08:39:18 -07:00
Nick Winter	04014ef2d7	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-14 16:34:18 -07:00
Glen De Cauwsemaecker	a9806a6fa3	Added m website url to the about page	2014-04-15 03:12:54 +02:00
Nick Winter	954afad3f0	Fixed bug with job profile approval locale string tag.	2014-04-14 15:32:57 -07:00
Nick Winter	e908ae2fb4	Fixed #772.	2014-04-14 14:49:38 -07:00
Nick Winter	8aa36178af	Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.	2014-04-13 20:31:23 -07:00
Nick Winter	af0b8aa5e2	A few fixes and cleanup for #831.	2014-04-13 15:28:16 -07:00
dpen2000	ec3c292b72	Implement simulators leaderboard	2014-04-13 02:35:58 +01:00
Nick Winter	08616def10	Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.	2014-04-12 14:53:09 -07:00
Scott Erickson	775821feec	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 08:52:50 -07:00
Scott Erickson	6eab5003f8	Merge branch 'feature/jsondiffpatch'	2014-04-12 08:52:35 -07:00
Scott Erickson	10b1660419	Fixed the level editor so you can save again.	2014-04-12 08:48:49 -07:00
Nick Winter	059b5e9b66	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-11 23:08:26 -07:00
Nick Winter	a4284e6209	Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization.	2014-04-11 23:07:48 -07:00
Scott Erickson	35fe47bbac	Merge branch 'feature/jsondiffpatch'	2014-04-11 22:52:58 -07:00
Scott Erickson	53579b2632	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade	2014-04-11 22:52:05 -07:00
Scott Erickson	308adec7c7	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade	2014-04-11 22:52:00 -07:00
Scott Erickson	0eb74ab287	Added buttons for performing actions on patches.	2014-04-11 22:33:09 -07:00
Scott Erickson	34bf484bf2	Added data merge conflict handling.	2014-04-11 21:11:52 -07:00
Nick Winter	91c2f0fa33	Fixed #715, and some misc cleanup.	2014-04-11 17:36:15 -07:00
Scott Erickson	bbb9fb7a64	Added a patches view.	2014-04-11 14:19:17 -07:00
Nick Winter	82b47f6c0f	Added i18n for #809.	2014-04-11 13:37:39 -07:00
Nick Winter	b330e783bf	Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons	2014-04-11 13:28:11 -07:00
Nick Winter	ae65f07e7e	Added some i18n and improved employer page.	2014-04-11 12:49:44 -07:00
Nick Winter	ca13324e99	Resolved merge conflicts.	2014-04-11 11:32:51 -07:00
Nick Winter	3751bf903e	Merge pull request #806 from 1c7/master ... New features: chinese language version use Youku	2014-04-11 10:33:10 -07:00
Scott Erickson	97a7bc7614	Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch ... Conflicts: app/initialize.coffee bower.json	2014-04-11 10:32:19 -07:00
Nick Winter	8d5e129c2c	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
Nick Winter	a68f3efb99	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00
Nick Winter	7a35a6248f	Adding contact form for employers to contact candidates.	2014-04-10 14:59:32 -07:00
Scott Erickson	a3951b0fa7	Extended the save version modal to allow submitting patches.	2014-04-10 13:09:44 -07:00
Nick Winter	e9416ee128	Added some autocompleters for job profile Treema. Projects are now entirely links.	2014-04-10 11:58:51 -07:00
Scott Erickson	3c832d3707	Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.	2014-04-10 11:13:33 -07:00
Scott Erickson	5629284c76	Added text diff library to delta view.	2014-04-10 10:24:14 -07:00
Scott Erickson	66d455285e	Integrated the delta view into the save view for levels.	2014-04-09 19:07:44 -07:00
Nick Winter	dd46f9d039	Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.	2014-04-09 16:46:44 -07:00
Scott Erickson	f2d21b960f	Added a delta subview for displaying deltas of schema'd data.	2014-04-09 16:09:35 -07:00
Nick Winter	f17775cc10	Implemented George's jobs page design.	2014-04-09 13:14:52 -07:00
Aditya Raisinghani	b3804e7445	Minor corrections in format	2014-04-10 01:07:48 +05:30
Aditya Raisinghani	495d1be620	Added social buttons to Sign up modal	2014-04-10 01:01:30 +05:30
1c7	56c18441e4	use youku for Chinese Version	2014-04-09 13:50:13 +08:00
Alexei Nikitin	f8d6857633	Fix crlf	2014-04-08 10:50:58 +04:00
Nick Winter	b96bca8c18	Finished most of basic features for job profiles.	2014-04-07 17:58:02 -07:00
Alexei Nikitin	e87c0c4b91	Work on thang tab	2014-04-08 02:49:27 +04:00
Nick Winter	9af6694054	More work on the job profiles.	2014-04-07 15:21:05 -07:00
Alexei Nikitin	5f062ad25c	Work on revert, save modal	2014-04-08 01:38:46 +04:00
Aditya Raisinghani	7cc9d22254	Moved nanoscroller to bower components and related fixes.	2014-04-08 03:04:36 +05:30
Alexei Nikitin	d64690e8d9	Work on fork modal	2014-04-08 00:29:40 +04:00
Alexei Nikitin	69406df0ed	Work on create_new modal	2014-04-07 23:27:42 +04:00
Alexei Nikitin	630c44135a	Work on wizard settings	2014-04-07 21:44:47 +04:00
Nick Winter	1b79de0d86	Loading active candidate profiles from the database into a table for employers.	2014-04-06 17:01:56 -07:00
Nick Winter	13f34341b2	Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat	2014-04-06 14:55:14 -07:00
1c7	13cfba91a8	add myself into diplomat.jade	2014-04-06 11:56:25 +08:00
Nick Winter	5c8c7fff1d	Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.	2014-04-05 17:05:03 -07:00
Scott Erickson	2093049f5c	Fixed a bug with the profile view caused by the new page loading system.	2014-04-04 13:59:40 -07:00
Scott Erickson	978c84bc89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-03 18:43:36 -07:00
Scott Erickson	3b3b825be0	Set up a new loading/progress system for views.	2014-04-03 18:43:29 -07:00
Michael Schmatz	9bb109dd7d	First iteration of mobile styling!	2014-04-03 15:10:24 -07:00
Michael Schmatz	75b278b333	Fixed table overflow, added wrapper for histogram	2014-04-03 09:57:35 -07:00
Michael Schmatz	3aa31c7246	Graphs with D3!	2014-04-02 18:41:11 -07:00
Nick Winter	52de546727	Merged.	2014-04-02 15:09:40 -07:00
Aditya Raisinghani	44979c074d	Integrated nanoscroller.	2014-04-03 03:10:06 +05:30
Nick Winter	785cb342a2	Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master	2014-04-01 09:12:48 -07:00
Dominik Kundel	45f1d8d408	added two programming quotes	2014-04-01 17:16:35 +02:00
Nick Winter	0bd8321345	Updated Mondo Bizarro i18n comma.	2014-03-31 16:02:56 -07:00
Nick Winter	8c013c1192	Fixed 101: added level completion status to /play.	2014-03-31 15:48:22 -07:00
Nick Winter	d8a194f895	Actually using loading screen template.	2014-03-31 13:21:08 -07:00
Nick Winter	0af05176f6	Re-added a minor fix that got lost.	2014-03-31 13:00:40 -07:00
Nick Winter	a9a0a55331	Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master	2014-03-31 12:42:53 -07:00
Dominik Kundel	1c6aea9c1c	Merge remote-tracking branch 'upstream/master'	2014-03-31 20:35:32 +02:00
Alexei Nikitin	aeddb64f90	Update base.jade	2014-03-31 11:09:44 -07:00
Nick Winter	cb27124285	Fixed #135.	2014-03-30 17:24:07 -07:00
tmrdja	470a79e6b0	Added contextmenu	2014-03-30 19:33:21 +02:00
Nick Winter	54f4e8d1e9	Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor	2014-03-29 17:38:14 -07:00
Dominik Maier	fb607d06fa	Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670	2014-03-30 00:38:45 +01:00
Ting-Kuan	130d322d60	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
Nick Winter	5e30ab091b	Updated i18n tags.	2014-03-28 13:19:17 -07:00
Nick Winter	13d5536eb3	Merged.	2014-03-28 13:08:30 -07:00
Jasper D'haene	fa6ef5aa49	added authors to quotations	2014-03-28 19:58:33 +01:00
Nick Winter	ff7e2d5d47	Fixed #728.	2014-03-28 11:02:23 -07:00
Jasper D'haene	cd3019296c	added tips/quotes to loading bar	2014-03-28 19:01:31 +01:00
Dominik Kundel	35a16b47ff	Merge remote-tracking branch 'upstream/master'	2014-03-28 14:37:14 +01:00
Darredevil	a91e067549	Added funny tip	2014-03-28 00:13:40 +02:00
Ting-Kuan	6012a3ce9e	Show error message when editor fails to initiate.	2014-03-27 14:35:20 -04:00
Scott Erickson	781b33092c	Added a google plus connect button.	2014-03-26 14:19:05 -07:00
Scott Erickson	132b22f14a	Got the gplus friends loading now.	2014-03-26 13:50:01 -07:00
Glen De Cauwsemaecker	5825b2676b	Added myself to the signature.	2014-03-26 04:46:49 +01:00
Dominik Kundel	fe8a4901de	Merge remote-tracking branch 'upstream/master' ... Conflicts: app/locale/de.coffee bower.json	2014-03-25 17:07:36 +01:00
Glen De Cauwsemaecker	305e2f6d68	Merge pull request #685 from JasperDhaene/master ... Added myself to the diplomate list, fixed typos and made corrections to Dutch locale	2014-03-25 13:27:13 +01:00
JasperDhaene	748081b4a7	Added myself to the diplomate list, fixed typos and made corrections to Dutch locale	2014-03-25 09:25:20 +01:00
Nick Winter	e6e216fcd3	Mergred Diplomats.	2014-03-24 14:20:40 -07:00
Nick Winter	fd2d9b6833	Merge pull request #658 from ItsLastDay/editor_tweaks ... Added tooltip in level-editor (issue #174)	2014-03-22 17:30:52 -07:00
Mikhail Koltsov	baf8adcc74	added nothing	2014-03-22 20:50:50 +04:00
Scott Erickson	2cdfbf1c48	Merged conflicts.	2014-03-21 19:56:25 -07:00
Scott Erickson	6445924598	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder_tab.jade app/views/play/ladder/ladder_tab.coffee	2014-03-21 19:53:32 -07:00