codecombat

mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00

Author	SHA1	Message	Date
Matt Lott	1108159603	Enable updated autocomplete Bug fixes for incorrect autocompletes such as “this.this.moveRight()();” Reducing suggestions to just level snippets to make it more beginner friendly.	2014-10-07 15:13:43 -07:00
Nick Winter	dfdcf66f4b	A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance.	2014-10-06 17:46:22 -07:00
Nick Winter	d6b7616f15	Updated keyboard shortcut symbols.	2014-10-06 15:04:42 -07:00
Nick Winter	31056933e9	Added volume control to world map.	2014-10-06 10:17:55 -07:00
Nick Winter	63f518e7c6	Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements.	2014-10-06 10:17:55 -07:00
Nick Winter	0c09a468c7	Fixed skipping through real-time playback to fire when the final goals are actually ready.	2014-10-02 17:49:14 -07:00
Nick Winter	3cdb8ff416	Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map.	2014-10-02 17:21:06 -07:00
George Saines	90be8a4ad3	moving the level dots to fit the dungeon world map	2014-10-02 14:36:26 -07:00
Nick Winter	3636f3d259	Messing with the scaling on the dungeon map.	2014-10-02 14:05:18 -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	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
Nick Winter	36615ae39f	Unlocked all levels again until we can figure out the achievement timing problems.	2014-10-01 17:02:04 -07:00
Nick Winter	5c77e103f3	Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle.	2014-09-30 16:18:32 -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	adbfa42f25	Merge branch 'master' into feature/webgl	2014-09-30 10:27:26 -07:00
Matt Lott	136af8a0b4	Fixes for world simulation without Web Workers Primarily for IE9, which is still blocked by box2d issues with these changes. Forcing vendor.js instead of vendor_with_box2d.js in main.html allows you to load a level in IE9, but without Collision-based movement. Work in progress.	2014-09-28 23:24:18 -07:00
Scott Erickson	f081d9ed4b	Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again.	2014-09-28 14:00:48 -07:00
Scott Erickson	8adbd87401	Merge branch 'master' into feature/webgl	2014-09-28 10:38:19 -07:00
Nick Winter	cf9cf6f98b	Stopped locking levels for now, since the achievements aren't quite unlocking them correctly.	2014-09-26 03:52:57 -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
Nick Winter	61aa2d8b6f	Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.	2014-09-25 13:29:20 -07:00
Nick Winter	2ed6b737c2	Added WorldMapView ambient sounds.	2014-09-25 11:37:29 -07:00
Scott Erickson	8fe2ed4438	Resolved conflicts.	2014-09-25 10:52:36 -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	9ea24f4c74	Added a workaround for Surface resize failure on realtime playback end that Maksym had seen.	2014-09-25 09:48:14 -07:00
Nick Winter	c0c436189f	Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks.	2014-09-25 00:02:53 -07:00
Nick Winter	cce36333dd	Set letterbox during real-time playback.	2014-09-24 22:59:13 -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	5e0b42068a	Scrubber auto-pauses when dragging from ended position.	2014-09-24 22:12:00 -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	b8d59cb179	Fixed a bug with playback never quite getting to the end.	2014-09-24 20:25:30 -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	6b6d1d3e74	Changed 'Available Spells' to 'Your Skills' in hero levels.	2014-09-24 15:48:18 -07:00
Nick Winter	a786b1e096	Changed world map to click on iPad, hover otherwise.	2014-09-24 15:21:39 -07:00
Nick Winter	ada65cc290	Lowered master volume temporarily until per-sound instance volumes are fixed.	2014-09-24 15:06:22 -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	e493855578	Hiding spell tab hover docs for plan().	2014-09-23 18:32:07 -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	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	33080e5a65	Fixed #1586 .	2014-09-23 10:56:52 -07:00
Nick Winter	00e2fc99a2	Fixed some issues with the sample code.	2014-09-23 08:58:23 -07:00
Nick Winter	6a8d3082f3	Propagated i18n. Added a fallback for cast button for now until the new run button can be translated.	2014-09-23 08:08:29 -07:00
Nick Winter	f3511a5dde	Fixed another bug with loading heroes between levels.	2014-09-22 23:01:19 -07:00
Nick Winter	b0ee2224ae	Start hero levels playing from the beginning on unveil. Fixed some of the bugs with heroes not equipping.	2014-09-22 22:26:09 -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	1b4e75e7e8	Fix for earned achievement default null worths. Misc other fixes.	2014-09-22 20:15:51 -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	6cb8a2a019	Hero always centered in camera in new hero levels when playing and not panning to drag.	2014-09-21 20:49:45 -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	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	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	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	a700b7844f	Added a bit of error handling for weird equipment error we were seeing.	2014-09-16 11:13:03 -07:00
Nick Winter	d2491dba4f	Disabled autocast even more.	2014-09-15 11:56:29 -07:00
George Saines	040b901e41	removed merge junk	2014-09-11 11:08:25 -07:00
George Saines	b81288cf52	changing volume for some SFX	2014-09-11 10:16:56 -07:00
George Saines	f5a4442e8a	trying to change SFX volume	2014-09-11 09:59:50 -07:00
Nick Winter	68808d0e07	Some fixes for how audio is triggered.	2014-09-11 08:38:30 -07:00
Nick Winter	f53f6bf0a3	Misc changes, wishing I could get sounds to work at lower volumes.	2014-09-10 19:55:00 -07:00
Nick Winter	2396f9c26d	Updates to go along with latest iPad app spell palette loading.	2014-09-08 21:40:52 -07:00
Nick Winter	8dad2bf12d	Fixed some typo.	2014-09-08 14:26:17 -07:00
Nick Winter	6ed89a2d79	Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView.	2014-09-08 12:29:49 -07:00
Nick Winter	ffdf48dadb	Fixed typo in spell palette event.	2014-09-08 09:01:34 -07:00
Nick Winter	1bd1ca0ced	Fixed #1530 . Propagated i18n. Starting to add some more events for the iOS app.	2014-09-07 20:54:25 -07:00
Nick Winter	2f07c3e8d3	Adding communication with iPad app.	2014-09-06 19:50:31 -07:00
Nick Winter	8de75024fc	Implemented placeholders for a bunch of sound triggers.	2014-09-05 13:04:05 -07:00
Nick Winter	d3eb7a7438	Fixed a few issues with real-time multiplayer flags.	2014-09-04 20:10:04 -07:00
Nick Winter	b698200cf0	A few minor fixes.	2014-09-04 15:14:27 -07:00
Nick Winter	8c45e22741	Protection and logging for #1463 . Fixed an issue with spectate camera script bounds.	2014-09-04 11:04:23 -07:00
Nick Winter	35f22e0f8c	Fixed a few tome / canvas resizing bugs.	2014-09-03 18:35:14 -07:00
Nick Winter	6b6c8dd683	Merged master into feature/realtime-multiplayer; looks good.	2014-09-03 16:14:33 -07:00
Nick Winter	24a2373d54	Fixed editor config change event schema.	2014-09-03 13:08:09 -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	1329d31a63	Hot-swapping inventory works now.	2014-08-31 16:05:20 -07:00
Nick Winter	a8644d030e	Fixed #1355 .	2014-08-30 14:30:53 -07:00
Nick Winter	85a9a558ef	Fixed #1329 .	2014-08-30 13:43:56 -07:00
Nick Winter	051f1a77ae	Fixed #1152 .	2014-08-30 09:19:41 -07:00
Matt Lott	437ab0feb2	PVP waiting screen in real-time view	2014-08-29 21:46:26 -07:00
Scott Erickson	7a9c53e424	All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.	2014-08-29 18:04:50 -07:00
Scott Erickson	21e0889a86	All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.	2014-08-29 18:02:29 -07:00
Nick Winter	cb14149816	Fixed #1286 . Sort of.	2014-08-29 17:52:47 -07:00
Nick Winter	5503b3a2bc	Fixed #1147 .	2014-08-29 17:03:02 -07:00
Matt Lott	8143d9c5ba	Real-time multiplayers to 'coding' after playback	2014-08-29 15:26:39 -07:00
Matt Lott	92cad5f46f	Real-time multiplayer subscription schemas	2014-08-29 15:10:04 -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
Scott Erickson	9406a8c920	Merge branch 'master' into feature/defaults	2014-08-28 17:58:58 -07:00
Nick Winter	e67b4ae064	Fixed #1090 .	2014-08-28 17:08:05 -07:00
Scott Erickson	2dde77f8b0	Merge branch 'master' into feature/defaults	2014-08-28 15:26:04 -07:00
Nick Winter	f79a2848fd	Fixed #1038 . Focus should now remain on code editor when after clicking on Surface.	2014-08-28 14:00:54 -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	a50f6b9224	Fixed a bug with reloading non-writable code.	2014-08-28 09:41:47 -07:00
Nick Winter	ec6b3d7e5f	Fixed #1481 . More Mediator schema fixes.	2014-08-28 09:27:42 -07:00
Nick Winter	28431703f5	Fixed #953 .	2014-08-27 22:23:24 -07:00
Nick Winter	02255044e3	Fixed #847 . Fixed some subscription schemas.	2014-08-27 18:43:17 -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
Nick Winter	1864cb09bc	Fixed #712 . Fixed a bug with listing files/musics in admin files view due to removed trailing slashes.	2014-08-26 15:42:33 -07:00
Scott Erickson	5d804c6d9a	Fixed merge conflict.	2014-08-26 15:41:59 -07:00
Nick Winter	35b107cf58	Refactored grid. Fixed #158 .	2014-08-26 13:56:57 -07:00
Nick Winter	3e9adf6b1a	Fixed issue with IndieSprites no longer coloring properly.	2014-08-26 12:39:30 -07:00
Nick Winter	38dcb7fcef	Fixed #5 .	2014-08-26 11:29:16 -07:00
Scott Erickson	f92a665b8b	Merge conflicts.	2014-08-26 09:53:04 -07:00
Nick Winter	e666ee1dac	Added stop playback button and real-time countdown screen.	2014-08-25 22:05:30 -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	08f2ee248b	No longer constructing SpellViews for non-readable methods.	2014-08-24 22:02:22 -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	1a7e4554f0	Fixed a few minor bugs.	2014-08-24 16:48:59 -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	be07f9cfb9	Many improvements to real-time streaming and flags.	2014-08-23 22:24:00 -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
Scott Erickson	0721b49216	Refactoring defaults.	2014-08-23 15:51:59 -07:00
Nick Winter	2e23247521	Fixed #811 , a bug where you could pause the world if you clicked on a letterboxed playback scrubber.	2014-08-23 14:55:58 -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	9c0869e566	Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!	2014-08-22 21:35:08 -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	92f0a68dd1	World streaming is getting there!	2014-08-22 14:59:32 -07:00
Nick Winter	9b31e28536	More improvements to world streaming.	2014-08-21 21:23:45 -07:00
Nick Winter	d55afa77b7	Began streaming a mighty stream.	2014-08-21 16:27:52 -07:00
Nick Winter	28176c7f72	Misc workarounds.	2014-08-20 13:26:48 -07:00
Nick Winter	91db8397a0	Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators.	2014-08-19 08:09:15 -07:00
Nick Winter	2c6fc67db2	Some simulation and ladder fixes. Preparing Criss-Cross tournament.	2014-08-18 21:49:58 -07:00
Darredevil	1f51eabe48	Added new 'Minimax Tic-Tac-Toe' level	2014-08-18 18:39:16 +03: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	68828b67bb	removed console.log	2014-08-15 02:04:46 +02:00
Dominik Kundel	755a86e3d3	moving some styling	2014-08-15 01:56:01 +02:00
Nick Winter	69c22db434	Moved Hero Placeholder replacement logic to Level's denormalizeThang.	2014-08-14 16:35:03 -07:00
Matt Lott	9b79e2ca27	Instrument user code problems	2014-08-14 13:32:00 -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
Darredevil	1b1174d460	Added 'Classic Algorithms' level section	2014-08-12 23:23:43 +03:00
Nick Winter	291b44f0a6	Fix typo introduced in last commit. Like a boss.	2014-08-12 12:56:55 -07:00
Nick Winter	2ab83328f3	Added item editor level preview window.	2014-08-12 12:50:41 -07:00
Nick Winter	023fd40767	Renamed inventory to collectedThangIDs for Collects. #59	2014-08-11 12:52:40 -07:00
Dominik Kundel	d2c63f4b98	fixed undo manager to not remove all code	2014-08-11 21:34:02 +02:00
Dominik Kundel	14f96a7eac	Merge remote-tracking branch 'upstream/master'	2014-08-11 15:30:05 +02:00
Nick Winter	d1e26b40c2	I retook the Nick name.	2014-08-10 17:47:18 -07: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	dc59aff9d0	Starting skeleton for GameMenuModal and its subviews.	2014-08-08 11:36:41 -07:00
Darredevil	bea6e12a3a	Minor name fix	2014-08-08 03:26:13 +03:00
Darredevil	3dfe7987ea	Added new level 'QuickSort the Spiral'	2014-08-08 02:04:02 +03:00
Dominik Kundel	84c0fbd01f	use shortName as fallback for some entries if no snippet	2014-08-05 11:19:15 +02:00
Nick Winter	3bbdee583d	Better problem alert layout for alerts that include hints.	2014-08-04 20:16:12 -07:00
Nick Winter	a0b75ddb8e	Put Sky Span up for testing.	2014-08-04 19:46:00 -07:00
Dominik Kundel	f09b3c4792	Merge remote-tracking branch 'upstream/master'	2014-08-04 23:03:28 +02:00
Dominik Kundel	50517431db	added support for inserting snippets by shift+click	2014-08-04 23:02:54 +02:00
Dominik Kundel	86eea93e2f	merged changes	2014-08-04 22:37:15 +02:00
Ruben Vereecken	39c01c0bcb	Finished refactoring of LevelGuideModal (renamed from docs_modal)	2014-07-29 19:50:50 +02: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	beef508e76	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-07-23 07:09:12 -07:00
Scott Erickson	65375aa5fc	Renamed problem and spell to their new, capitalized names.	2014-07-23 07:09:05 -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	4f6ca5335f	fixed spell palette sliding behind HUD	2014-07-23 15:50:47 +02:00
Dominik Kundel	be50927fb6	disabled editor works again	2014-07-23 14:38:12 +02:00
Dominik Kundel	5db634d6a8	fullscreen on keyboard shortcut	2014-07-22 21:47:36 +02: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
Nick Winter	1537754a16	A few bugfixes, plus gigantic child window convenience for me editing levels.	2014-07-19 20:26:13 -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	59b723b890	Refactoring View to ModalView.	2014-07-17 17:22:26 -07:00
Scott Erickson	e18b4de583	Refactoring View to CocoView.	2014-07-17 17:20:11 -07:00
Scott Erickson	0e042ee61c	Refactoring View to RootView. Refactoring some RootViews to be routed manually.	2014-07-17 17:16:32 -07:00
Nick Winter	6b028513fd	Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.	2014-07-17 15:50:29 -07:00
Nick Winter	42af807e5c	Merged in geometry work from #51 .	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	906ab3ac2b	Stopped language-excluded docs from showing up undocumented in the 'this' area of the spell palette.	2014-07-15 18:54:55 -07:00
Nick Winter	da73975f20	Fixed #1095 .	2014-07-15 09:47:13 -07:00
Nick Winter	3318d4a171	Fixed #1010 .	2014-07-15 09:35:14 -07:00
Nick Winter	d7586025d9	Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.	2014-07-14 11:05:59 -07:00
Nick Winter	1a016394fe	Starting to show opponent code languages.	2014-07-13 20:19:51 -07:00
Michael Schmatz	2a5a366c12	Made language selection in opponent modal	2014-07-13 17:22:06 -07:00
Nick Winter	6dc2a48b75	Tracking time spent reading initial guides.	2014-07-13 16:07:15 -07:00
Nick Winter	c62f5f3fa0	Skipping docs for language-inappropriate entries in spell palette.	2014-07-11 18:42:55 -07:00
Nick Winter	17ba4bc8a7	Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.	2014-07-11 18:07:00 -07:00
Michael Schmatz	fede037e89	Fixed time NaN	2014-07-11 13:55:31 -07:00
Nick Winter	9ee373428f	Fixed some schema issues related to snippets and code languages.	2014-07-10 08:31:40 -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
Nick Winter	c19a31a58c	Fixed some wizard positioning issues in multiplayer.	2014-07-08 18:51:10 -07:00
Scott Erickson	1263d4724a	Fixed the title in the gold view to handle when goldEarned isn't available.	2014-07-07 16:56:47 -07:00
Scott Erickson	908772d8fe	Fixed an instance where a level loading callback was erroring if called before the surface was built.	2014-07-07 16:44:18 -07:00
Scott Erickson	61e6c8dfc3	Fixed the gold view not showing numbers until the first change.	2014-07-07 16:05:23 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	1ce55e356c	Making the ladder tab reload when social network friends load. See #1196 .	2014-07-04 17:32:16 -07:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Dominik Kundel	004a14ae3c	fixed autocomplete issue related to switching the programming language	2014-07-02 20:52:16 +02:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Nick Winter	802d43651e	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -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
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
Nick Winter	dd9b8a0018	Migrating from tileGroupNumber to tileGroupLetter.	2014-06-24 16:32:44 -07:00
Nick Winter	580d002a98	Messing with marks.	2014-06-24 15:45:33 -07:00
Scott Erickson	0363166736	Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.	2014-06-24 13:23:31 -04:00
Nick Winter	6a31e0bcd3	Fixed bug showing spell palette for languages missing any code snippets.	2014-06-24 10:17:38 -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	1f29a923cf	Fixed playing multiplayer levels without an opponent, against the AI.	2014-06-21 12:24:14 -07:00
Nick Winter	a8f4baebbc	Restricted some more analytics.	2014-06-21 09:47:48 -07:00
Nick Winter	dde71485bf	A bit of cleanup.	2014-06-20 20:52:50 -07:00
Nick Winter	60ca6e46d3	Ooops, that's a function.	2014-06-20 18:45:57 -07:00
Nick Winter	c9dcc290cb	Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.	2014-06-20 17:19:18 -07:00
Nick Winter	bb8b9b2e93	bid -> makeBid.	2014-06-19 17:27:41 -07:00
Nick Winter	7b59c42f5d	Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.	2014-06-19 15:41:35 -07:00
Nick Winter	cf57411b5c	Added another logging message for more easily seeing when transpiled code might be misfiring.	2014-06-19 13:42:38 -07:00
Scott Erickson	20589db6be	Fixed a bug with logging missing documentation.	2014-06-19 16:15:38 -04:00
Michael Schmatz	51923459e0	Changed autocomplete to on by default	2014-06-19 10:44:44 -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	59654da24b	Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.	2014-06-17 22:17:44 -07:00
Nick Winter	9a64ca5973	A few misc fixes.	2014-06-16 10:49:20 -07:00
Dominik Kundel	25a0447d77	autocomplete	2014-06-16 14:29:01 +01:00
Dominik Kundel	e756c83d9e	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:14:31 +01:00
Dominik Kundel	603766b8c5	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:12:55 +01:00
Nick Winter	28264d5ace	Added tournament results and a way to email them out.	2014-06-12 17:52:08 -07:00
Nick Winter	77920b5416	Improvements to profile views. Added links to players' code.	2014-06-11 19:38:47 -07:00
Scott Erickson	8a728cbb64	More switching of user objects from save to patch.	2014-06-11 14:17:31 -07:00
Scott Erickson	f0cdf6b2e2	Fixed #1111 .	2014-06-06 16:47:48 -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	f3adc216ed	Protecting our replacement of Math.random via Aether.	2014-05-29 12:26:08 -07:00
Nick Winter	c01bd69625	Better recoverability for non-UserCodeProblem errors during world generation.	2014-05-26 18:45:00 -07:00
Nick Winter	ec0027043b	Added experimental Io language from Aether.	2014-05-26 08:59:48 -07:00
Nick Winter	3dd362c01e	Added support for blaming infinite loops.	2014-05-25 12:15:32 -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
Nick Winter	33408020f1	Merge pull request #1054 from dpen2000/patch-2 Update simulate_tab.coffee	2014-05-25 08:27:54 -07:00
Dominik Maier	f62cd7f38b	+ added shortcut for frame single-stepping + fixed single stepping for frames	2014-05-24 17:31:59 +02:00
Nick Winter	690fbc6919	Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking.	2014-05-23 12:04:42 -07:00
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
Nick Winter	48f5347075	Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.	2014-05-21 21:56:11 -07:00
Nick Winter	4fc1341a64	Added a way to remove SuperModel resources to fix ladder tab refreshing.	2014-05-21 15:33:28 -07:00
Scott Erickson	037dbe97c6	Some remaining work to get the delayed show guide script set up.	2014-05-21 14:50:27 -07:00
dpen2000	ce661a5493	Update simulate_tab.coffee Add back in current user to nearby simulators	2014-05-21 15:06:52 +01:00
Nick Winter	88ef5ffe93	Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L.	2014-05-20 15:24:57 -07:00
Scott Erickson	93c6f72f07	Asynchronously building things again.	2014-05-20 10:49:19 -07:00
Nick Winter	a04130f26a	Fixed a bug with ladder tab not reloading.	2014-05-20 10:40:15 -07:00
Nick Winter	248cec1e6e	Transpile code properly.	2014-05-20 08:23:25 -07:00
Nick Winter	d058b16283	Fixed some memory leaks.	2014-05-20 08:00:49 -07:00
Scott Erickson	04da5b4714	Fixed thang avatar view thang loading some more.	2014-05-19 23:02:02 -07:00
Scott Erickson	042fd7ac0d	Made the guide, when it shows up the first time, only show the first doc.	2014-05-19 22:25: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
Scott Erickson	b816055f9e	Fixed goal states to handle teams.	2014-05-19 21:55:30 -07:00
Nick Winter	39178daff6	Trying to show loading ready and initialize the Surface earlier.	2014-05-19 20:49:17 -07:00
Nick Winter	341097c5ca	A couple improvements for the LadderSubmissionView.	2014-05-19 19:51:24 -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
Nick Winter	af31bcf008	Fleshed out tournament prizes tab.	2014-05-19 17:40:06 -07:00
Scott Erickson	b410d91203	Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier.	2014-05-19 17:10:41 -07:00
Scott Erickson	62ad8dd26a	Added a status message to the goals view.	2014-05-19 16:36:45 -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
Michael Schmatz	38d732d8bc	Disable hover debugger when spell changed	2014-05-18 11:51:31 -07:00
Michael Schmatz	5c72ccdce1	Add support for Aether globals in hover debugger	2014-05-18 11:41:42 -07:00
Nick Winter	3c9428ffd3	Refactored game ranking buttons into a LadderSubmissionView.	2014-05-17 11:55:51 -07:00
Nick Winter	736fc8c12f	Remove overeager transpile problem showing for JS again.	2014-05-17 09:58:35 -07:00
Nick Winter	418c2f1a2c	Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization.	2014-05-16 17:38:33 -07:00
Nick Winter	f64e50f85b	Recording flow only for frame of interest.	2014-05-16 16:52:55 -07:00
Michael Schmatz	891471b80a	Add time to hover debugger	2014-05-16 16:04:10 -07:00
Michael Schmatz	21ccaa2d8a	Adjust histogram height downwards Make room for ranking text	2014-05-16 13:33:41 -07:00
Michael Schmatz	ab1b0cac42	Added "Rank your session" message	2014-05-16 13:30:55 -07:00
Michael Schmatz	bd1261802d	Fix rank for unranked sessions on ladder histogram	2014-05-16 13:27:42 -07:00
Michael Schmatz	934c853789	Live simulation count and fixed double simulator leaderboard session	2014-05-16 13:16:35 -07:00
Michael Schmatz	60342cc40e	Hover debugger optimization for "this"	2014-05-16 10:19:36 -07:00
Michael Schmatz	206d63231e	Fixed teamSpells instantiation	2014-05-16 09:47:15 -07:00
Nick Winter	7811bda6c3	Use ace/mdoe/python for Python instead of ace/mode/lua.	2014-05-16 08:55:59 -07:00
Nick Winter	cff00f90b5	Stopped bug with useTranspiledCode; it will need more work later to get right.	2014-05-15 21:53:23 -07:00
Nick Winter	c7ca081df9	Merged ProblemAlertView fixes.	2014-05-15 15:36:06 -07:00
Nick Winter	c2a7530b62	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-15 15:35:08 -07:00
Michael Schmatz	0bb1422d6c	Switch spectate and level view to use transpiled code	2014-05-15 15:18:17 -07:00
Nick Winter	763e0500b2	Tracking simulator clicks.	2014-05-15 15:10:50 -07:00
Nick Winter	b973b749c0	Merged.	2014-05-15 14:57:24 -07:00
Nick Winter	8909d218bc	Moved random seed initialization to Existence System, where it can be configured.	2014-05-15 14:54:31 -07:00
Vicky Chijwani	0a14681e7b	Correctly parse multi-line error messages in the editor.	2014-05-16 01:41:26 +05:30
Nick Winter	c1f9d51b37	Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world.	2014-05-15 11:27:51 -07:00
Michael Schmatz	338b613074	Added transpiledCode to victory modal	2014-05-15 09:30:59 -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	dd1acb94ed	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-14 16:06:09 -07:00
Nick Winter	c420209a6b	Improved GoldView tooltip.	2014-05-14 16:06:00 -07:00
Michael Schmatz	f32a0ca963	Added transpile to in-game rank button	2014-05-14 15:45:38 -07:00
Nick Winter	d61922ae42	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-14 15:31:19 -07:00
Nick Winter	cc7808251f	Zoom/scroll, ModelModal, and coordinate grabber fixes.	2014-05-14 15:29:55 -07:00
Scott Erickson	7a381df348	Merge branch 'feature/thangload'	2014-05-14 11:48:19 -07:00
Michael Schmatz	a1360d6cb8	Include transpiled code in submission process	2014-05-14 11:42:15 -07:00
Scott Erickson	0be813e424	Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.	2014-05-14 10:35:16 -07:00
Scott Erickson	cab1adf8fc	Merge branch 'master' into feature/thangload	2014-05-14 09:31:59 -07:00
Scott Erickson	4b404ae124	Finished tuning the supermodel loading and progress.	2014-05-13 14:39:45 -07:00
Nick Winter	53870a89a5	Python allowed, and better support for transpile errors.	2014-05-13 11:04:04 -07:00
Scott Erickson	66af855497	Merge branch 'master' into feature/thangload	2014-05-13 10:27:10 -07:00
Scott Erickson	1d88b6eefe	Most of the way there getting it to work with loading thang types dynamically throughout the play view.	2014-05-13 10:26:33 -07:00
Nick Winter	69dc96c7c8	Fixed Rank My Game on my matches.	2014-05-12 19:56:12 -07:00
Nick Winter	802889d115	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-12 13:28:51 -07:00
Nick Winter	1a5e30d5b5	Dynamic Canvas sizing.	2014-05-12 13:28:46 -07:00
Michael Schmatz	687872a97b	Moved debug cache onto main thread UI responsiveness greatly improved	2014-05-12 11:16:02 -07:00
Nick Winter	1aa72541ff	Merged master into feature/thangload.	2014-05-12 09:57:31 -07:00
Nick Winter	0b5854765a	Adding Clojure and Lua as choosable languages.	2014-05-11 22:51:44 -07:00
Nick Winter	74ef9bc987	Experimental support for preloading worlds when we would have autocast if manual cast is on.	2014-05-11 17:42:32 -07:00
Nick Winter	1e18f0b42f	Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds.	2014-05-10 18:24:50 -07:00
Nick Winter	df88be1ab1	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-09 15:07:55 -07:00
Nick Winter	6040d3b225	Shouldn't use much CPU when totally paused on Surface.	2014-05-09 15:07:30 -07:00
Michael Schmatz	1bbd4e6c68	Fixed frame-related bug	2014-05-09 15:05:50 -07:00
Nick Winter	589410ed8e	Merged master into feature/thangload.	2014-05-09 12:56:58 -07:00
Nick Winter	c4819c647c	Removed includeeFlow, since we're going to do it lazily with the debug worker.	2014-05-09 09:29:50 -07:00
Nick Winter	3819778bee	Updating everything to Aether 0.2.0.	2014-05-08 11:43:00 -07:00
Michael Schmatz	7110f023f2	Merge branch 'feature/hover-debugger-performance' Conflicts: app/lib/God.coffee app/views/play/level/tome/spell_debug_view.coffee	2014-05-07 11:37:03 -07:00
Michael Schmatz	806b159aab	Fixed another off-by-one error	2014-05-07 10:20:22 -07:00
Michael Schmatz	6fd89f10b9	Fixed various debugger UI bugs	2014-05-07 10:03:49 -07:00
Michael Schmatz	da575f8945	Refactored hover debugger is functional Still needs optimizations and a few bug fixes, but it’s better than the existing code existing to Nick	2014-05-06 15:07:06 -07:00
Nick Winter	ca8d5c1f3b	Stop bobbing and more marks when world ended.	2014-05-06 11:02:53 -07:00
Michael Schmatz	dddd617a08	userCodeMap issues fixed Now beginning hooking up the UI	2014-05-06 10:06:32 -07:00
Nick Winter	2e6bec5454	Some fixes for my accidental merge of #970 .	2014-05-06 09:49:04 -07:00
Nick Winter	1f3cc8a004	Merge branch 'master' of git://github.com/domenukk/codecombat	2014-05-06 08:00:39 -07:00
Dominik Maier	6d244e8560	+ Merged Simulators	2014-05-06 05:07:34 +02:00
Dominik Maier	c9bb488794	Created headless-client and an alternative implementation of god	2014-05-06 02:37:14 +02: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	82529c781b	Fixed some ladder home links.	2014-05-05 15:33:08 -07:00
Nick Winter	b6a53a83e7	Fixed issue with play button not turning into rewind.	2014-05-03 13:26:37 -07:00
Nick Winter	73222a1a98	Don't start drawing Surface until needed.	2014-05-03 09:13:26 -07:00
Scott Erickson	db9a82d58a	Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload	2014-05-02 17:03:53 -07:00
Scott Erickson	aee90c72bb	Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.	2014-05-02 17:03:30 -07:00
Nick Winter	afbe5b063b	Fix HTML icon syntax in the Markdown.	2014-05-02 15:51:07 -07:00
Nick Winter	a04f74de8b	Implemented George's gold design.	2014-05-02 15:12:30 -07:00
Nick Winter	d54149d0f3	Reworked LevelView loading priorities to try to get world simulating earlier.	2014-05-02 12:32:41 -07:00
Scott Erickson	2952d7702c	Merge branch 'master' into feature/thangload Conflicts: app/lib/LevelLoader.coffee app/views/play/level_view.coffee	2014-05-02 08:20:03 -07:00
Scott Erickson	92687b17de	Merge branch 'master' into feature/thangload Conflicts: app/lib/LevelLoader.coffee app/views/play/level_view.coffee	2014-05-02 08:19:47 -07:00
Nick Winter	9f18811701	Fixed logic for displaying runtime errors from last run based on code being the same as last cast.	2014-05-01 17:41:06 -07:00
Scott Erickson	26cafd2f19	Fixed #941 . Actually it was no longer crashing probably because of the fix for #934 , but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.	2014-05-01 16:38:27 -07:00
Nick Winter	5376a42f94	Fixed serialization of tracked property arrays.	2014-05-01 13:23:14 -07:00
Nick Winter	bebe5a0620	Improved hover debugger tokenization specificity to not extend past end of line.	2014-05-01 11:18:20 -07:00
Nick Winter	eca35ce371	Several minor bugfixes, and enabled API protection on all levels by default.	2014-04-29 15:25:59 -07:00
Nick Winter	40fbf336c2	Using new level loading sound.	2014-04-28 17:59:02 -07:00
Nick Winter	bd3c059c2a	Several performance improvements based on profiling.	2014-04-28 16:31:51 -07:00
Scott Erickson	b9f4093b08	Set up the LevelLoader to load names instead of whole ThangTypes.	2014-04-28 14:58:58 -07:00
Nick Winter	7e16fa5bd6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-28 14:01:43 -07:00
Nick Winter	6d75b5593a	Fixed bug with pointer animation.	2014-04-28 14:01:33 -07:00
Scott Erickson	3a28f190a1	Merge branch 'master' into feature/loading-views	2014-04-28 11:55:17 -07:00
Scott Erickson	02a74ae40c	Migrated and fixed the rest of the views using the new loading system.	2014-04-28 11:52:04 -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	a7179ae3b2	Fixed some more gold view stuff.	2014-04-27 15:33:16 -07:00
Nick Winter	2ec225b0d0	Enabled API protection for Find the Spy.	2014-04-27 14:30:32 -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
Nick Winter	fa0e7f04f7	Fixed a thing.	2014-04-26 14:21:26 -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	d8d2a57c38	Listed a few new levels.	2014-04-25 15:00:46 -07:00
Scott Erickson	3dc3f62473	Merge branch 'master' into feature/loading-views Conflicts: app/views/editor/components/main.coffee	2014-04-25 14:31:58 -07:00
Scott Erickson	278d6752c3	Refactored SuperModel, CocoModel and LevelLoader. Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader. Simplified SuperModel.	2014-04-25 14:30:06 -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	b7cb4696f0	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
Nick Winter	b9173a5ea5	Fixed #913 , I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
Michael Schmatz	c408196814	Fix for runtime errors	2014-04-23 16:44:31 -07:00
Nick Winter	86aa4cd0fe	Updated janky include_flow skip levels.	2014-04-23 16:11:47 -07:00
edtrist	3962d37681	#889 - moved CocoCollection.coffee to app/collections and updated references	2014-04-22 20:42:26 +01:00
Michael Schmatz	7419b269f1	Merge pull request #894 from codecombat/feature/worker-lint Background linting/transpilation/hasChangedSignificantly	2014-04-22 12:05:03 -07:00
Michael Schmatz	6122d31e28	Removed web worker logging listener	2014-04-22 12:03:33 -07:00
Michael Schmatz	3110e6e56a	Renamed test_worker to aether_worker	2014-04-22 11:58:27 -07:00
Michael Schmatz	392dbb9f8d	Removed superfluous comment	2014-04-22 11:51:51 -07:00
Michael Schmatz	3bbedbc100	Added background transpile	2014-04-22 11:46:17 -07:00
Nick Winter	675db1b76f	Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.	2014-04-22 11:11:08 -07:00
Michael Schmatz	e0f8d1343e	Fixed race condition	2014-04-22 11:04:56 -07:00
Michael Schmatz	81809956b8	hasChangedSignificantly async refactor Still checking for bugs	2014-04-22 08:54:35 -07:00
Michael Schmatz	0f435b41ae	Merge pull request #885 from codecombat/master Merge master into worker-lint	2014-04-21 14:13:43 -07:00
Ting-Kuan	974e5e1b24	remove debugging msg.	2014-04-19 13:09:50 -04:00
Ting-Kuan	7321052c18	Fix supermodel with resource value and fix ladder view under supermodel resource management.	2014-04-19 13:06:47 -04:00
Ting-Kuan	375aca2c0a	Fix: Some level systems load forever.	2014-04-19 12:08:40 -04:00
Ting-Kuan	692693c181	Merge branch 'master' into feature/loading-views Conflicts: app/locale/en.coffee app/views/editor/level/edit.coffee app/views/kinds/CocoView.coffee app/views/play/ladder/ladder_tab.coffee app/views/play/ladder_view.coffee app/views/play/level/level_loading_view.coffee	2014-04-19 01:15:04 -04:00
Michael Schmatz	a7867e5e2d	Added background linting Background hasChangedSignificantly is soon!	2014-04-18 14:59:08 -07:00
dpen2000	b20f8fd260	Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee	2014-04-18 21:06:57 +01:00
Nick Winter	844c1391ca	Reworked top nav. Many improvements to job profile form.	2014-04-18 09:53:28 -07:00
Ting-Kuan	1c1cf2f189	Fix loading of Level.	2014-04-17 19:23:35 -04:00
Ting-Kuan	fe96289bf6	debugging: ladder_view doesn't show loading bar.	2014-04-17 15:57:08 -04: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
dpen2000	a6ed7c9bff	Fix players above the current player coming out in wrong order in original and simulators leaderboard	2014-04-16 18:20:59 -04: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
Ting-Kuan	2e50d7b15d	Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views Conflicts: app/views/play/ladder/ladder_tab.coffee app/views/play/ladder_view.coffee	2014-04-16 11:38:05 -04:00
Ting-Kuan	c53eb562a3	Remove debug msg.	2014-04-16 02:31:18 -04:00
dpen2000	a74f89c30c	Implement rank column in simulators leaderboard	2014-04-15 23:13:10 +01:00
Nick Winter	f762d95ab8	ModelModal and simple leaderboard pagination.	2014-04-15 15:01:54 -07:00
Ting-Kuan	af399f4415	Merge branch 'master' into feature/loading-views	2014-04-15 13:34:20 -04:00
Nick Winter	e908ae2fb4	Fixed #772 .	2014-04-14 14:49:38 -07:00
Nick Winter	1794e5e040	Fixed #813 (sort of).	2014-04-14 11:18:02 -07:00
Nick Winter	8aa36178af	Fixed #769 . Added some analytics timing tracking. Added replacement for $.browser.	2014-04-13 20:31:23 -07:00
dpen2000	2345a7d8e8	Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code	2014-04-13 19:58:50 -04:00
Nick Winter	af0b8aa5e2	A few fixes and cleanup for #831 .	2014-04-13 15:28:16 -07:00
Nick Winter	3d945492b0	Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2	2014-04-13 14:48:45 -07:00
Nick Winter	a9725f2dc6	A bit of error handling.	2014-04-13 14:48:36 -07:00
dpen2000	ec3c292b72	Implement simulators leaderboard	2014-04-13 02:35:58 +01:00
Ting-Kuan	77c4c586dd	Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 Conflicts: app/locale/en.coffee	2014-04-12 17:13:06 -04:00
Ting-Kuan	508b570fea	Merge branch 'master' into feature/loading-views Conflicts: .gitignore app/locale/en.coffee app/models/SuperModel.coffee app/views/editor/thang/edit.coffee app/views/kinds/CocoView.coffee	2014-04-12 17:07:30 -04:00
Ting-Kuan	0e08a4106b	Merge branch 'master' of https://github.com/codecombat/codecombat Conflicts: scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/localization/de.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat scripts/windows/coco-dev-setup/recycle_bin/git-test.bat	2014-04-12 16:52:14 -04:00
Ting-Kuan	7ae3bd5a60	Fix style and supermodel based on #815 . Fix ladder_view and ladder_tab. Change error handling functions in CocoView.	2014-04-12 16:29:49 -04:00
Nick Winter	f0aa5e1d5e	Fixed #681 by removing full-screen button in Safari.	2014-04-11 18:19:52 -07:00
Nick Winter	99b430c1b4	Fixed #714 with a hack.	2014-04-11 17:55:47 -07:00
Nick Winter	97d4017869	Hacky way to get play background to fit with new loading image.	2014-04-11 16:15:26 -07:00
Nick Winter	10bb17c38a	Added getThangByID method to Thang. Handled a few error corner cases with the time popup.	2014-04-11 14:03:13 -07:00
Scott Erickson	e3a1f170cf	Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader Conflicts: app/views/kinds/CocoView.coffee app/views/play/level/level_loading_view.coffee	2014-04-11 11:19:16 -07:00
Ting-Kuan	a5e6496a7c	Make resources as static class to avoid loading multiple times. Clean debug message.	2014-04-10 16:59:08 -04:00
Michael Schmatz	a796d88967	Fixed tutorial modal for nonexistent tutorials	2014-04-10 11:42:22 -07:00
Michael Schmatz	42bf2996af	Made Aether ignore variable hoisting See #813	2014-04-10 10:36:32 -07:00
Nick Winter	76054345d7	Fixed #805 .	2014-04-09 09:04:59 -07:00
Nick Winter	13f34341b2	Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat	2014-04-06 14:55:14 -07:00
Ting-Kuan	4e41676219	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-05 10:51:40 -04:00
Scott Erickson	abaf32fc7a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 14:57:55 -07:00
Michael Schmatz	2411269f2b	Added rank/number of sessions text	2014-04-04 14:55:55 -07:00
Michael Schmatz	0684bcff9c	Improved styling on graphs	2014-04-04 14:22:30 -07:00
Michael Schmatz	06f164525f	Merge branch 'master' of https://github.com/codecombat/codecombat Conflicts: app/views/play/ladder/ladder_tab.coffee	2014-04-04 13:48:39 -07:00
Michael Schmatz	7019bb6dea	Added score histogram to ladder tab	2014-04-04 13:38:36 -07:00
Ting-Kuan	de9337820b	Merge branch 'master' of https://github.com/codecombat/codecombat Conflicts: app/assets/main.html scripts/windows/coco-dev-setup/batch/config/finished_header.coco scripts/windows/coco-dev-setup/batch/config/github_header.coco scripts/windows/coco-dev-setup/batch/config/install_header.coco scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco scripts/windows/coco-dev-setup/batch/config/readme.coco scripts/windows/coco-dev-setup/batch/localisation/de.coco scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_array.bat scripts/windows/coco-dev-setup/batch/scripts/get_config.bat scripts/windows/coco-dev-setup/batch/scripts/get_download.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1 scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_file.bat scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_info.bat scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_license.bat scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat scripts/windows/coco-dev-setup/batch/scripts/run_script.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat	2014-04-04 14:32:42 -04:00
Scott Erickson	1971ddcefb	Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time.	2014-04-04 10:12:22 -07:00
Ting-Kuan	fe27756b06	Pull from upsatream.	2014-04-04 12:52:22 -04: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
Nick Winter	9a70abb104	Don't need to explicitly skip Mobile Artillery's next level now.	2014-04-03 16:37:24 -07:00
Michael Schmatz	3aa31c7246	Graphs with D3!	2014-04-02 18:41:11 -07:00
Nick Winter	670f94cc22	Fixed #418 , no more print/save dialogues evaaarr.	2014-04-02 14:42:34 -07:00
Aditya Raisinghani	44979c074d	Integrated nanoscroller.	2014-04-03 03:10:06 +05:30
Nick Winter	389323953b	Fixed #180 .	2014-03-31 13:56:13 -07:00
Dominik Kundel	1c6aea9c1c	Merge remote-tracking branch 'upstream/master'	2014-03-31 20:35:32 +02:00
Nick Winter	a79fe37ca1	Merged; made a couple tweaks.	2014-03-29 17:30:12 -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
Nick Winter	c58a1682f4	Fixed #519 for real, I think.	2014-03-29 14:09:45 -07:00
Nick Winter	5bcaf2c746	Fixed #64 (I hope; let's UX test.)	2014-03-28 17:06:21 -07:00
Nick Winter	cf81d51a89	Fixed #46 .	2014-03-28 15:23:12 -07:00
Nick Winter	c4a56dc9a5	Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11 .	2014-03-28 12:22:53 -07:00
Nick Winter	62867534a7	Fixed #727 .	2014-03-28 09:52:07 -07:00
Dominik Kundel	267d033997	initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline	2014-03-28 14:42:08 +01:00
Dominik Kundel	35a16b47ff	Merge remote-tracking branch 'upstream/master'	2014-03-28 14:37:14 +01:00
Nick Winter	b0b37aa9d8	Made play/pause and scrubber look even more disabled when disabled.	2014-03-27 15:07:37 -07:00
Nick Winter	2677751dc5	Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog	2014-03-27 14:58:06 -07:00
Nick Winter	31119f402a	Cleaned up readyToRank logic a bit.	2014-03-27 14:55:45 -07:00
Nick Winter	1cab83236c	Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master	2014-03-27 14:22:44 -07:00
Nick Winter	127c4a4e0f	Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.	2014-03-27 13:36:33 -07:00
Jayant Jain	648df5eb41	Updated rank my game check, fixes #666	2014-03-27 03:36:27 +05:30
Scott Erickson	37beb1bc6b	Made the ladder tab better able to handle unloaded gplus and facebook apis.	2014-03-26 14:53:09 -07:00
Scott Erickson	fae9034dfc	Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master Conflicts: app/models/SuperModel.coffee	2014-03-26 14:29:16 -07:00
Scott Erickson	462d365ce0	Sorted the friend sessions a bit.	2014-03-26 14:22:04 -07: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
Scott Erickson	ad70a7f0c6	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-26 11:48:47 -07:00
Scott Erickson	3b8cba291d	Removed some unnecessary callbacks.	2014-03-26 11:48:40 -07:00
Jayant Jain	71294f14b2	Updates fb and g+ functions to be called on api load, fixes #695	2014-03-26 22:03:20 +05:30
swapnesh	1118324b41	Migrate from .on, .once to .listenTo, .listenToOnce	2014-03-26 03:25:11 +05:30
Dominik Kundel	fe8a4901de	Merge remote-tracking branch 'upstream/master' Conflicts: app/locale/de.coffee bower.json	2014-03-25 17:07:36 +01:00
Shrihari	aee18523b0	Fix for #506	2014-03-25 13:28:22 +05:30
Scott Erickson	bda499b561	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:43:08 -07:00
Scott Erickson	2c329a256f	Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.	2014-03-24 14:42:56 -07:00
Nick Winter	97613f12b4	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:38:35 -07:00
Nick Winter	a42e33764e	Merged, fixed.	2014-03-24 14:38:18 -07:00
Scott Erickson	53118984ff	Undid a listenTo on a jQuery elem.	2014-03-24 14:29:53 -07:00
Scott Erickson	57f6f4d244	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:27:28 -07:00
Ruben Vereecken	3f3eeab02a	Fixed NaN in ladder in case a player has never played before	2014-03-24 19:46:50 +01:00
Michael Schmatz	83bfc28a9e	Partially refactored scoring callback pyramid of hell	2014-03-24 10:58:43 -07:00
Scott Erickson	f55cef5ced	Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents	2014-03-24 10:38:57 -07:00
Shrihari	f085b0d319	Refactored cast-button events	2014-03-24 22:41:27 +05:30
Shrihari	0160538b44	More migrations	2014-03-24 22:28:34 +05:30
Shrihari	69ee16f77f	Fixed wrong migrations	2014-03-24 21:37:09 +05:30
Nick Winter	92c87dc4ad	Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view	2014-03-24 08:28:48 -07:00
Ting-Kuan	e9118142db	Fix issue #662	2014-03-24 10:54:59 -04:00
Shrihari	67f5270bfc	Migrate .on, .once - Batch 1	2014-03-24 12:23:41 +05:30
Nick Winter	dbeb3d445b	Give focus back to spell view on palette click.	2014-03-23 16:48:30 -07:00
Nick Winter	656b34fc34	Fixed comment gutter icons jumping all over the place.	2014-03-23 16:00:23 -07:00
Scott Erickson	8ca5f23749	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-23 09:30:46 -07:00
Scott Erickson	72b88a3ee9	First pass on setting up gplus friends on the ladder page.	2014-03-23 09:30:01 -07:00
dpen2000	970552a6d6	Fix "Simulating game between" line to only have one "and"	2014-03-23 13:35:24 +00:00
Nick Winter	96fe1e42f0	Merge pull request #657 from adi2412/reloadCode Made changes to reloadAllCode to reload only the team's code.	2014-03-22 10:36:17 -07:00
Aditya Raisinghani	bee5d528ec	Made changes to reloadAllCode to reload only the team's code.	2014-03-22 22:56:41 +05:30
Nick Winter	29e7b8e5c1	Fixed mail to correctly capture the matches.	2014-03-22 09:48:36 -07:00
Michael Schmatz	5141873725	Added resimulateAllSessions method	2014-03-22 09:07:01 -07:00
Scott Erickson	0df09f7f35	Fixed an ever-reloading bug.	2014-03-21 21:11:51 -07: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
Scott Erickson	14ee9c30ce	Added facebook friends to the ladder page.	2014-03-21 19:50:54 -07:00
dpen2000	a35d0cb651	Implement saving lastLevel in database re #627	2014-03-22 00:01:32 +00:00
dpen2000	b1b0579cb3	Save autocastDelay as a setting on User re #627	2014-03-21 22:46:14 +00:00
Nick Winter	b30bf35945	Fixed #638 , I hope.	2014-03-21 08:09:08 -07:00
Nick Winter	ca1e3742c0	Added simulation counts.	2014-03-20 15:40:02 -07:00
Scott Erickson	22555790b5	Set up a trimmed down leaderboard showing just top players and your rank.	2014-03-20 14:40:17 -07:00
Nick Winter	ff1e64e1f6	Less useless ladder refresh requests.	2014-03-19 18:26:38 -07:00
Scott Erickson	b6c9b6276c	Tweaked logging of sprite building.	2014-03-19 17:11:45 -07:00
Scott Erickson	74e068af0b	Fixed some bugs from the migration from _.cloneDeep to $.extend	2014-03-18 13:47:51 -07:00
Scott Erickson	a461a14d6e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-18 13:08:34 -07:00
Scott Erickson	37a9b7f319	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00
Nick Winter	4355813d69	Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.	2014-03-18 11:26:15 -07:00
Dominik Kundel	c55b608886	Merge remote-tracking branch 'upstream/master' Conflicts: app/templates/play/level/modal/editor_config.jade	2014-03-17 19:39:38 +01:00
Nick Winter	6c2a78c060	Show videos in HD if possible. Use ready state on level loader.	2014-03-17 05:52:19 -07:00
Nick Winter	833c310a91	Merge pull request #579 from ItsLastDay/popover Fix for issue #496	2014-03-17 04:30:57 -07:00
Mikhail Koltsov	df3739517d	fixed issue #496	2014-03-17 12:28:49 +04:00
Scott Erickson	db4ae0cd2d	Made some tips show up more rarely.	2014-03-17 00:12:11 -07:00
Scott Erickson	7555dce172	Tweaked the loading page progress bar.	2014-03-17 00:05:45 -07:00
Nick Winter	65c53a9e43	Check anonymous for clicking link.	2014-03-16 22:17:56 -07:00
Scott Erickson	dc4252a94d	Moved the tips into the level loader screen and gave them i18n.	2014-03-16 22:01:21 -07:00
Scott Erickson	5a8d1b0a2b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:43:21 -07:00
Scott Erickson	de34896a9a	Playback is now disabled during casting. Also cleaned out some remaining hover logic.	2014-03-16 21:43:14 -07:00
Nick Winter	f02f4e77d0	Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.	2014-03-16 21:33:46 -07:00
Scott Erickson	e88c79681d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:04:44 -07:00
Scott Erickson	c663bd74cf	Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.	2014-03-16 21:04:36 -07:00
Nick Winter	ffb9ec2908	Merged.	2014-03-16 20:36:18 -07:00
Nick Winter	9a64fb5dac	Work on /multiplayer modal.	2014-03-16 20:32:24 -07:00
Scott Erickson	296a7584a6	Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.	2014-03-16 20:28:02 -07:00
Dominik Kundel	6a983dcb8c	changed name of event triggered when config is changed and introduced new event when language is changed	2014-03-17 02:14:04 +01:00
Scott Erickson	dd8ea18186	Merge remote-tracking branch 'origin/master'	2014-03-16 17:13:18 -07:00
Scott Erickson	f23e3285cd	Fixed a bug.	2014-03-16 17:12:55 -07:00
Nick Winter	b550708113	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 17:07:24 -07:00
Nick Winter	6db33fd967	Brawlwood protectAPI on!	2014-03-16 17:07:10 -07:00
Scott Erickson	eee8fbba2c	New level page with new artwork.	2014-03-16 16:59:48 -07:00
Dominik Kundel	ce6533de59	changing ace edit mode based on setting	2014-03-15 23:14:57 +01:00
Dominik Kundel	46133ab85d	added select statement for programming language	2014-03-15 22:00:29 +01:00
Michael Schmatz	efba8a0654	Fixed control bar leaderboard button for #429	2014-03-15 11:34:59 -07:00
Michael Schmatz	6dcbaddbbd	Merge branch 'master' of https://github.com/codecombat/codecombat Conflicts: app/views/play/spectate_view.coffee	2014-03-15 09:20:44 -07:00
Michael Schmatz	2c6e667bb7	Added API for queue messages count	2014-03-15 09:20:13 -07:00
honam bang	e63e787a30	Removed spaces for coding convention	2014-03-15 08:30:47 -07:00
Nick Winter	95cd3782a1	Oops, don't keep sending ladder updates just to me.	2014-03-15 07:45:44 -07:00
Nick Winter	8276dbf2d1	Merge branch 'loading-view'	2014-03-14 19:44:33 -07:00
Nick Winter	b2efb1bba5	More work on the loading view.	2014-03-14 19:44:19 -07:00
Nick Winter	efd0d82dea	Working on new loading view design.	2014-03-14 17:06:08 -07:00
Michael Schmatz	357b73be93	Fixed bug in next game button, fixed wizard positions	2014-03-14 16:14:35 -07:00
Michael Schmatz	075ea23be9	Fixed random sessions fetching	2014-03-14 12:54:54 -07:00
Michael Schmatz	71aa6cc2c6	Added random session pair choosing Due to a bug I cannot test this immediately	2014-03-14 11:30:06 -07:00
Nick Winter	5c76ca71e3	Added configuring of behaviors to the editor config.	2014-03-14 10:14:48 -07:00
Nick Winter	3c0b496033	Fix for if aceConfig doesn't exist yet.	2014-03-14 07:46:36 -07:00
Nick Winter	c28d2bb576	Merge pull request #545 from dkundel/master Implemented editor config to allow Vim & Emacs key bindings as proposed in #99	2014-03-14 07:35:11 -07:00
Nick Winter	6e9945040f	Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.	2014-03-13 19:20:22 -07:00
Dominik Kundel	7e955c72b8	apply config to editor	2014-03-14 02:49:58 +01:00
Dominik Kundel	8a5aeb6227	save editor config to database	2014-03-14 02:09:11 +01:00
Nick Winter	42a8862fa9	Merge pull request #541 from dkundel/master Easy use of coordinates as discussed in #10 and minor fixes	2014-03-13 18:05:04 -07:00
Dominik Kundel	6f2a04c5c0	added new editor config modal	2014-03-14 00:54:06 +01:00
Dominik Kundel	f618338d32	added button to access new modal for editor config	2014-03-14 00:53:29 +01:00
Dominik Kundel	4cbdc3cb4b	highlight lines after insertion	2014-03-14 00:52:18 +01:00
Nick Winter	8554de7c4b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-13 15:35:31 -07:00
Nick Winter	e2d2e96cf5	Fixed several bugs with Thang selection and the SpellView and HUD.	2014-03-13 15:35:28 -07:00
Michael Schmatz	3262ad81f2	Merge branch 'master' of github.com:codecombat/codecombat Conflicts: app/views/play/spectate_view.coffee	2014-03-13 15:24:04 -07:00
Michael Schmatz	7aa506e58c	Various changes to spectate view	2014-03-13 15:22:35 -07:00
Scott Erickson	b2e9768127	Set up a build queue for async sprite sheet building, which lessens blocking the main thread.	2014-03-13 13:25:03 -07:00
Nick Winter	c8103154a9	Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.	2014-03-13 09:02:19 -07:00
Nick Winter	28d56f526e	Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.	2014-03-12 20:59:19 -07:00
Michael Schmatz	6eda2d24a5	Commented out line 133	2014-03-12 17:52:05 -07:00
Michael Schmatz	aea9e9d1a6	Spectate view is nearing completion	2014-03-12 17:51:13 -07:00
Dominik Kundel	8990b9d194	paste coordiante if click + shift	2014-03-13 01:50:59 +01:00
Nick Winter	ac8f12ef20	I don't think we need this template any more.	2014-03-12 16:03:32 -07:00
Nick Winter	ddea7d1531	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-12 15:44:33 -07:00
Scott Erickson	19184a88b0	Fixed showing the guide at the beginning of the level.... more.	2014-03-12 13:49:28 -07:00
Nick Winter	1ca9b2d3e5	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-12 12:45:46 -07:00
Scott Erickson	ed60f5932f	Fixed showing the guide at the beginning of the level.	2014-03-12 12:44:06 -07:00
Nick Winter	77c9217357	Better handling of refreshing ladder and matches views depending on idle state.	2014-03-12 11:39:09 -07:00
Nick Winter	49ab47e3fe	Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.	2014-03-12 10:01:31 -07:00
Nick Winter	2e354a7f11	Fixed #519 , pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.	2014-03-12 09:10:36 -07:00
Michael Schmatz	a6fb2a3994	Various changes to spectate view	2014-03-12 07:32:30 -07:00
Scott Erickson	9cb80783ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-11 22:01:47 -07:00
Scott Erickson	8ddbb49845	Trying out promises to simplify view loading.	2014-03-11 22:01:38 -07:00
Nick Winter	b560827e32	Working on cleaning up some server errors.	2014-03-11 19:17:58 -07:00
Nick Winter	40ea643f67	Merge pull request #523 from dkundel/master Avoid flickering of editor when executing the script.	2014-03-11 18:07:17 -07:00
Nick Winter	8c57b31c54	Fixed a couple bugs with the matches tab.	2014-03-11 18:06:48 -07:00
Dominik Kundel	c7ca878c69	added class property that got missing	2014-03-12 01:26:11 +01:00
Nick Winter	392534878a	Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.	2014-03-11 16:31:39 -07:00
Dominik Kundel	714c6ddf9b	Merge remote-tracking branch 'upstream/master'	2014-03-11 23:50:51 +01:00
Dominik Kundel	4c7da1ea69	update Gutter only if changed	2014-03-11 23:47:27 +01:00
Nick Winter	852b1c97ac	Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.	2014-03-11 13:59:12 -07:00
Michael Schmatz	4062bba245	Created initial spectate level view	2014-03-11 13:12:45 -07:00
Nick Winter	eac219a2be	Inserted score history graph into ladder update emails.	2014-03-10 22:03:33 -07:00
Nick Winter	32baf2ae79	Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.	2014-03-10 21:30:46 -07:00
Nick Winter	6ce65488aa	Added simple rank history graph. Improving ladder update mail.	2014-03-10 20:22:25 -07:00
Nick Winter	234b3f105d	Reworked ladder game victory modal main call to action to actually submit game for ranking.	2014-03-10 10:36:28 -07:00
Nick Winter	6a71e97204	Improvements to HUD actions.	2014-03-10 09:37:05 -07:00
Nick Winter	3d71fcbc70	Wins, losses, and realizing that I'm not doing server code right.	2014-03-09 18:46:11 -07:00
Nick Winter	2d32bc1ac4	Reduced unnecessary name fetching.	2014-03-09 13:22:22 -07:00
Nick Winter	3e82e0b599	Disallow submission of non-denormalized sessions to ladders.	2014-03-09 12:53:11 -07:00
Nick Winter	34983059aa	Fixed bug with trying to show challenger modals with no hash to indicate we should.	2014-03-09 11:52:05 -07:00
Nick Winter	39c4657204	Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.	2014-03-08 15:43:56 -08:00
Nick Winter	b0238d74a4	Let's just show 200 leaderboard entries for now until we have paging.	2014-03-08 11:50:10 -08:00
Nick Winter	1c44e3df1e	Fixed bug with linking to #my-matches tab.	2014-03-08 11:37:33 -08:00
Nick Winter	68099bbd7c	Victory modal for ladder games takes you back to the ladder matches.	2014-03-07 21:20:09 -08:00
Michael Schmatz	2f378106ca	Added checking level ladder status before submitting	2014-03-07 18:16:50 -08:00
Alexei Nikitin	98b36d299c	Update article model	2014-03-08 05:05:35 +04:00
Nick Winter	b6ae73ef29	Merge pull request #492 from Shrihari/issue464 Fixed Spell Debug View width bug	2014-03-07 16:14:57 -08:00
Scott Erickson	8fa9c9c410	Set up the level play view to show the guide on startup based on the showGuide property.	2014-03-07 15:18:56 -08:00
Scott Erickson	13b9a9cb58	Added dungeon arena tutorial to a few hardcoded places.	2014-03-07 15:16:13 -08:00
Scott Erickson	be03485538	Set up the ladder play modal to be more forthright getting new players to play the tutorial.	2014-03-07 12:58:17 -08:00
Scott Erickson	d8d917ecf9	Set up better teardown for the ladder view.	2014-03-07 12:15:16 -08:00
Shrihari	5274f22467	Fixed Spell Debug View width bug	2014-03-08 01:10:12 +05:30
Scott Erickson	d14f862359	Ladder view can now be linked to to play against a specific team.	2014-03-07 11:23:06 -08:00
Nick Winter	6e47416d24	Fixed some level IDs.	2014-03-06 19:09:15 -08:00
Michael Schmatz	45cd7e31ca	Made simulator level-independent	2014-03-06 18:48:41 -08:00
Nick Winter	2d69abf674	Merge pull request #481 from dkundel/master Proposed UX improvement for #6	2014-03-05 13:45:14 -08:00
Dominik Kundel	a033a80722	Merge remote-tracking branch 'upstream/master'	2014-03-05 22:18:53 +01:00
Dominik Kundel	b0d571c7ad	highlight only the executing statement	2014-03-05 22:17:34 +01:00
Scott Erickson	0a8d5b5b97	Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master	2014-03-05 10:35:06 -08:00
Shrihari	f6324807b3	Moved "Skip (esc)" next to Continue button	2014-03-05 23:36:18 +05:30
Dominik Kundel	d16d024782	further changes in design of highlighting lines in code	2014-03-05 17:06:46 +01:00
Shrihari	0ec431f90a	Moved 'skip tutorial' text to locales.	2014-03-05 13:46:21 +05:30
Dominik Kundel	a0e39480e3	new UI design for executing and executed lines in ACE editor	2014-03-05 02:00:38 +01:00
Nick Winter	4556536df4	Hooked up new HUD icons.	2014-03-04 11:15:31 -08:00
Nick Winter	65d9186ef1	Fixed actions showing up under dialogue bubbles on repeated toggling.	2014-03-03 16:55:36 -08:00
Nick Winter	7b25eeec47	HUD properties now flow into columns more evenly, have max styling.	2014-03-03 16:45:03 -08:00
Nick Winter	c944e78271	Ladder views now show level descvription content if present.	2014-03-03 14:59:39 -08:00
Scott Erickson	d66a9d6be0	Set up a generic choose tab for root views so hash->tab behavior is baked in.	2014-03-03 13:21:05 -08:00
Nick Winter	0c45b6c0e3	Fixes for ladder refreshing.	2014-03-03 12:21:59 -08:00
Michael Schmatz	a5864c4f0c	Live leaderboard updating	2014-03-03 12:10:27 -08:00
Scott Erickson	fb75ad36e7	Added team icons to the ladder play view.	2014-03-03 12:04:31 -08:00
Scott Erickson	65d39e658d	Removed the old team view cruft.	2014-03-03 11:15:46 -08:00
Scott Erickson	0d054bec8e	Refactored the universal wizard loading to happen silently when you import ThangType.	2014-03-03 10:42:11 -08:00
Scott Erickson	feaeb1dc98	Made the wizard icons colored based on user settings.	2014-03-03 10:21:51 -08:00
Scott Erickson	d3b6836a06	Fixed some bugs with the new ladder view when you haven't played before.	2014-03-03 09:20:14 -08:00
Scott Erickson	5bb56ac818	Merge branch 'feature/new-ladder-view'	2014-03-03 09:05:52 -08:00
Scott Erickson	22e80f6d24	Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.	2014-03-03 09:03:44 -08:00
Nick Winter	86fd098159	Localized WizardSprite movement hey handling to WizardSprite file.	2014-03-03 07:28:40 -08:00
Nick Winter	f2f0a993af	Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat	2014-03-03 07:22:44 -08:00
Nick Winter	82b250b9a3	protectAPI off again for Brawlwood, too slow for now.	2014-03-02 17:51:57 -08:00
Nick Winter	a8ef87c9ea	Fixed a few bugs; re-enabled protectAPI for Brawlwood.	2014-03-02 16:06:22 -08:00
Scott Erickson	956e2b3c40	Set up the my matches tab in the new ladder view.	2014-03-02 13:24:41 -08:00
Scott Erickson	d0f416f668	Rearranging the ladder view.	2014-03-02 12:43:21 -08:00
Muhammed Thanish	da2ebf857a	Increase delay	2014-03-02 14:02:30 +05:30
Muhammed Thanish	d7e031fd00	Use key.isPressed() to get movement direction	2014-03-02 03:27:06 +05:30
Muhammed Thanish	7ea9260322	Use WizardSprite	2014-03-02 01:45:49 +05:30
Nick Winter	2f130da090	HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing.	2014-03-01 11:06:44 -08:00
Muhammed Thanish	8cc8103288	Add keyboard shortcuts to move the wizard	2014-03-01 19:58:15 +05:30
Scott Erickson	4de425bd58	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-28 13:59:33 -08:00
Scott Erickson	10795df7d9	Renamed hardcoded project-dotas to brawlwoods.	2014-02-28 13:59:02 -08:00
Nick Winter	52903cc0de	Using String and Array docs when appropriate now.	2014-02-28 12:43:31 -08:00
Nick Winter	6db8051122	Only show action timeline when 'action' is in the hudProperties.	2014-02-28 11:38:41 -08:00
Scott Erickson	d12b923eaf	Made a casting progress bar on the canvas to test vs having it shown in the cast button.	2014-02-28 11:05:41 -08:00
Nick Winter	aef1bc63ba	Smarter infinite loop detection vs. web-worker-is-still-loading detection.	2014-02-27 20:01:27 -08:00
Scott Erickson	df196cc531	Modals now stop the level from starting until they close.	2014-02-27 16:44:11 -08:00
Michael Schmatz	53a317df77	Merge pull request #434 from yangshun/play-button Deferred saving of latest level	2014-02-27 09:07:27 -08:00
Michael Schmatz	9deadad99f	Merge pull request #427 from yangshun/music-button Blur the music button after click so that subsequent space and enter keydown events do not trigger it.	2014-02-27 09:06:18 -08:00
Tay Yang Shun	04895a9204	Merge branch 'master' into play-button	2014-02-27 14:09:37 +08:00
Tay Yang Shun	514fe358c1	Trigger storage of latest level only after the level is guaranteed to be able to load	2014-02-27 14:08:25 +08:00
Nick Winter	c26995a3a9	Home button on ladder level goes to ladder.	2014-02-26 18:58:25 -08:00
Nick Winter	48122000ed	Gold shows up as an int in the HUD now.	2014-02-26 18:09:09 -08:00
Nick Winter	0cf20b577d	Added a delay to the property documentation on spell debug hover.	2014-02-26 17:23:59 -08:00
Nick Winter	172242d226	Re-denormalize session if things have changed. Removed some logs.	2014-02-26 17:06:21 -08:00
Scott Erickson	ea73d91a6b	Made the docs modal larger.	2014-02-26 15:44:46 -08:00
Tay Yang Shun	b48a9fabc6	Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306 .	2014-02-27 02:42:25 +08:00
Scott Erickson	f89768d76d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-25 17:15:01 -08:00
Scott Erickson	02d1dc2445	Added a screen for when playback ends.	2014-02-25 17:14:39 -08:00
Nick Winter	3c5902a1d2	Trying to get session code merging to work again.	2014-02-25 14:46:48 -08:00
Nick Winter	b86c32c3e2	Merge pull request #422 from yangshun/level-not-found Redirect to play page for non-existent levels. Fixes issue #396	2014-02-25 14:17:44 -08:00
Tay Yang Shun	11c5f7419a	Used internationalised strings for level not found message	2014-02-26 05:54:33 +08:00
Tay Yang Shun	8a24407d3e	Redirect to play page for non-existent levels. Fixes issue #396	2014-02-26 04:59:35 +08:00
Scott Erickson	1b4699556a	Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily.	2014-02-25 12:39:22 -08:00
Nick Winter	0380a30522	Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards.	2014-02-25 10:48:23 -08:00
Nick Winter	3472b3da97	Working on different shadow shapes. Fixed bug with palette property ownership.	2014-02-24 17:53:35 -08:00
Scott Erickson	7f738562e9	Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly.	2014-02-24 16:53:55 -08:00
Nick Winter	ab8d63f545	Improved grouping of palette properties.	2014-02-24 15:48:30 -08:00
Scott Erickson	34205a0789	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 14:58:02 -08:00
Nick Winter	32c45b80a9	Fixed performance problem with duplicate user code problem annotations.	2014-02-24 14:12:41 -08:00
Scott Erickson	e48bdfa1a7	Added your score to the ladder/team view.	2014-02-24 13:03:04 -08:00
Scott Erickson	43a49b3e6f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 12:52:43 -08:00
Scott Erickson	77f923752f	Fixed #411 .	2014-02-24 12:52:35 -08:00
Nick Winter	21975bedd2	Fixed #408 .	2014-02-24 11:21:51 -08:00
Nick Winter	91412ccd69	Playback and level editor shortcut tweaks.	2014-02-24 09:58:12 -08:00
Nick Winter	af43f18c23	Fixed selective includeFlow.	2014-02-24 08:59:50 -08:00
Nick Winter	af965ccb93	Fixes for ThangListEntryView popover hover states.	2014-02-23 17:11:27 -08:00
Nick Winter	933bcf9e6b	Showing property documentation when hovering in code in addition to clicking on palette entries.	2014-02-23 16:34:03 -08:00
Nick Winter	68497b2cf3	Added arg names or ... for functions which take arguments in spell palette entries.	2014-02-23 13:27:02 -08:00
Nick Winter	11f742ff0f	Included Hour of Code explanation in play footer.	2014-02-23 11:48:34 -08:00
Nick Winter	60eb0db1aa	A few fixes for IE, anonymous errors, and cast button overflow.	2014-02-23 11:23:26 -08:00
Nick Winter	43c1240a03	Fixed cast button moving around due to anticipated errors early.	2014-02-22 18:02:58 -08:00
Nick Winter	c21952646a	Stop cast button progress overlay before cast settings gear.	2014-02-22 17:50:45 -08:00
Nick Winter	8565e3f315	Adding the button, not just the shortcut, for beautification.	2014-02-22 17:18:58 -08:00
Nick Winter	9eb8bb97f5	Trying out a Ctrl+Shift+B code beautifier option.	2014-02-22 16:58:54 -08:00
Nick Winter	b3009ae909	Fixed #7 with a nice cast-end sound (just reverse of cast sound).	2014-02-22 15:26:38 -08:00
Nick Winter	702eca5c81	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-22 12:04:10 -08:00
Nick Winter	72cfcf96ed	Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.	2014-02-22 12:01:05 -08:00
Scott Erickson	5c85f227c6	Removed the hover playback control.	2014-02-21 17:11:16 -08:00
Nick Winter	26f11f40a9	Fix for destroying level.	2014-02-20 17:21:15 -08:00
Nick Winter	4e5ecb0c9e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 17:21:03 -08:00
Scott Erickson	bf80b806c6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 17:06:25 -08:00
Scott Erickson	da0238ceba	Switched the level view to grab opponent code from submittedCode instead of code.	2014-02-20 16:53:08 -08:00
Nick Winter	06f1e284c9	Added comment highlighting icon.	2014-02-20 16:14:31 -08:00
Nick Winter	edcb7f45b6	Merge pull request #395 from tips48/master Block Ctrl-S while playing	2014-02-20 15:29:16 -08:00
Scott Erickson	d9b86b84dc	Fixed a bug with the coloring of avatars in the hud.	2014-02-20 15:13:15 -08:00
Aidan Matzko	e3ab7a4d7e	Block Ctrl-S while playing	2014-02-20 18:11:20 -05:00
Nick Winter	3c651abe20	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 14:05:37 -08:00
Nick Winter	97b6094fe8	Tweaks for ladder views.	2014-02-20 13:58:35 -08:00
Scott Erickson	5cefb8fc30	Merge branch 'production'	2014-02-20 11:47:02 -08:00
Michael Schmatz	a2b811d52f	Added visual feedback for simulation buttons	2014-02-20 10:40:19 -08:00
Nick Winter	bce184b9da	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 10:39:19 -08:00
Nick Winter	f81e0c85ef	Fixes for popover behavior.	2014-02-20 10:39:16 -08:00
Michael Schmatz	cb0c22f0c9	Replaced rank button with button going to ladder page	2014-02-20 10:14:25 -08:00
Michael Schmatz	7c5192820f	Put more security on the session submissions and improved simulation status rendering	2014-02-20 09:44:44 -08:00
Michael Schmatz	e593fd23b4	Improved interface for simulating games	2014-02-20 08:06:14 -08:00
Nick Winter	f85a55c8b7	Cast -> Cast Spell	2014-02-19 18:20:21 -08:00
Nick Winter	7c2960f2ce	Improved visibility of cast button progress overlay.	2014-02-19 18:04:37 -08:00
Nick Winter	0469c918db	Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch.	2014-02-19 17:02:39 -08:00
Nick Winter	01374d63c4	Better comment formatting. Manual cast by default on Project DotA.	2014-02-19 14:00:54 -08:00
Scott Erickson	26af051cca	Set up indie sprites and their avatars to use the new colorConfig property.	2014-02-19 13:43:44 -08:00
Scott Erickson	613e7848dc	Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams.	2014-02-19 11:45:29 -08:00
Scott Erickson	86f94cb5fd	Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading.	2014-02-19 11:42:33 -08:00
Scott Erickson	ece08ba366	Fixed the matches order on the ladder team page.	2014-02-19 08:19:13 -08:00
Nick Winter	a8794f4e7e	Merged	2014-02-18 12:55:18 -08:00
Nick Winter	1c82fc5bb0	Fix for opponent teams not working.	2014-02-18 12:54:47 -08:00
Scott Erickson	f383e5b9fa	Fixes for the ladder team view.	2014-02-18 12:27:10 -08:00
Scott Erickson	5a436ce10b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-18 11:41:29 -08:00
Scott Erickson	d2d2099c4a	Fixing a bug with the tome problem view.	2014-02-18 11:39:11 -08:00
Scott Erickson	cacf6539c1	Working on the ladder and team views.	2014-02-18 11:38:49 -08:00
Nick Winter	9cdc07d07c	Fixed spell palette doc duplication.	2014-02-18 11:23:01 -08:00
Nick Winter	d45f67a8c3	Fixed some popover and modal layout and bugs.	2014-02-18 10:03:57 -08:00
Scott Erickson	452a43cae9	Working on the ladder and team views.	2014-02-17 17:42:41 -08:00
Nick Winter	6f0ed9040a	Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.	2014-02-17 17:38:49 -08:00
Nick Winter	e3824d7698	Many improvements to the spell palette.	2014-02-16 15:30:00 -08:00
Scott Erickson	5bbe829586	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 17:36:40 -08:00
Scott Erickson	be83b5420f	Fixed the goals view, which wasn't being properly shown.	2014-02-15 17:36:27 -08:00
Nick Winter	f3b58a9416	Merged.	2014-02-15 15:45:53 -08:00
Nick Winter	3c7cac8ba9	Trying to do some memory cleanup.	2014-02-15 15:44:45 -08:00
Scott Erickson	72712a349c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 12:07:28 -08:00
Scott Erickson	663a09ed4b	Spell list updates based on the existence of thangs now.	2014-02-15 09:22:13 -08:00
Michael Schmatz	c418e282ae	Put in pairwise simulation button	2014-02-14 16:53:37 -08:00
Nick Winter	50f683534f	Support for seeing this.now() in spell palette.	2014-02-14 16:52:50 -08:00
Scott Erickson	597ace25cc	Fixed the spell list tab entry view popover to not popover when using the dropdown.	2014-02-14 16:08:01 -08:00
Scott Erickson	1349a59084	Refactored destroy functions to have super be the last thing.	2014-02-14 10:57:47 -08:00
Scott Erickson	693fa06afb	Fixed a bug in the competitor code session setting when the player has no code yet.	2014-02-14 10:38:20 -08:00
Nick Winter	da866a418c	Fixed cast options clicking.	2014-02-13 17:43:42 -08:00
Michael Schmatz	db0695513e	Implemented reverse sorting of backbone collection	2014-02-13 17:30:59 -08:00
Scott Erickson	4001d1c7fe	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 16:42:49 -08:00
Scott Erickson	476cc87628	Set up the ladder to be able to compete against other sessions.	2014-02-13 16:42:35 -08:00
Nick Winter	9a835ffc0a	Re-enabled spell tab entry docs.	2014-02-13 16:09:32 -08:00
Scott Erickson	8775e86161	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 15:54:01 -08:00
Scott Erickson	97b4e7661d	Level loader now loads session based on the team property in the url.	2014-02-13 15:51:41 -08:00
Scott Erickson	9327d420bc	Fixed a bug.	2014-02-13 15:51:18 -08:00
Michael Schmatz	d6e99273bc	Quick fix for team not being detected	2014-02-13 15:42:00 -08:00
Michael Schmatz	ad0590f9ba	Merged in Scott's changes manually	2014-02-13 15:14:10 -08:00
Scott Erickson	1d3e013cc6	Merge remote-tracking branch 'origin/master' Conflicts: app/views/play/ladder_view.coffee	2014-02-13 15:11:11 -08:00
Scott Erickson	32337df156	Trimmed down the ladder view for now.	2014-02-13 15:09:40 -08:00
Michael Schmatz	480de71eb6	Leaderboard is starting to work	2014-02-13 15:02:49 -08:00
Nick Winter	aa282c3a35	Updates for formatting palette docs.	2014-02-13 11:18:20 -08:00
Scott Erickson	2b742da9e4	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 10:38:43 -08:00
Michael Schmatz	14530b779a	Refactored scoring submissions, added beginnings of spectator view	2014-02-13 10:37:44 -08:00
Scott Erickson	2e280fad6b	Set up the multiplayer modal with a submit button for the ladder queue.	2014-02-13 10:16:27 -08:00
Nick Winter	9ac0939bb8	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
Nick Winter	adaedc240c	Fixed cast button click bug.	2014-02-12 20:45:29 -08:00
Nick Winter	04abe36837	Don't need that Docs import.	2014-02-12 20:36:17 -08:00
Nick Winter	8a80b9770d	More work on docs. Got rid of Docs.coffee.	2014-02-12 18:54:45 -08:00
Nick Winter	d2345432ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 16:42:31 -08:00
Nick Winter	dc8c4394e1	Spell palette entries now using property docs from components.	2014-02-12 16:42:09 -08:00
Scott Erickson	8176e2258f	Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.	2014-02-12 16:20:25 -08:00
Nick Winter	b7be08ac19	Fixed one more leak.	2014-02-12 13:43:17 -08:00
Nick Winter	5655084981	Fixed a ton more leaks.	2014-02-12 12:41:41 -08:00
Michael Schmatz	1a2fa68473	Merge branch 'feature/task-queue' Conflicts: app/views/play/level/tome/spell.coffee	2014-02-11 15:58:38 -08:00
Scott Erickson	d9f4594c9f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 15:39:02 -08:00
Scott Erickson	ac49e5eec1	More memory fixes.	2014-02-11 15:38:36 -08:00
Nick Winter	c29e4d6c9c	Stupid casting sound effect.	2014-02-11 15:05:54 -08:00
Scott Erickson	2a19da5ba2	More memory fixes.	2014-02-11 14:58:45 -08:00
Scott Erickson	b904e1f939	More memory fixes.	2014-02-11 14:24:06 -08:00
Michael Schmatz	a6b15663a4	Merge branch 'master' into feature/task-queue Conflicts: app/views/play/level/tome/spell.coffee	2014-02-11 13:10:59 -08:00
Scott Erickson	b0a74e5b1a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 12:24:25 -08:00
Nick Winter	2d9606a8eb	includeFlow only on the currently selected Thang.	2014-02-11 12:16:53 -08:00
Scott Erickson	166bb6db45	More memory cleanup.	2014-02-11 12:10:21 -08:00
Nick Winter	d22c716dce	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 12:02:53 -08:00
Scott Erickson	aa4cc8d9c4	Added a whole bunch of view teardown.	2014-02-11 12:02:49 -08:00
Nick Winter	d2a7bfd11c	Added GoldView.	2014-02-11 12:02:27 -08:00
Scott Erickson	8ff38a724d	Fixing some event tearing down.	2014-02-11 11:31:02 -08:00
Michael Schmatz	612a374b3f	Progress on simulator	2014-02-11 11:27:39 -08:00
Michael Schmatz	c0d43ea32b	Merge branch 'master' into feature/task-queue	2014-02-10 17:10:26 -08:00
Nick Winter	7d5db41f5d	God prepares Workers for Angelic consumption ahead of time.	2014-02-10 17:09:19 -08:00
Michael Schmatz	cc3b93a0f8	Transfer teamSpellMap from tome to levelBus	2014-02-10 16:18:39 -08:00
Nick Winter	f812241bd5	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-10 14:50:35 -08:00
Nick Winter	9507be4c9a	Turned off includeFlow for horrific performance reasons on project-dota for now.	2014-02-10 14:19:54 -08:00
Michael Schmatz	465ea22b1a	More progress with queues and client-side simulation	2014-02-10 13:18:39 -08:00
Scott Erickson	9f5b51da19	Made goals for other teams invisible.	2014-02-10 12:49:38 -08:00
Nick Winter	26016f48e2	Skip protectAPI for now. Defer worker termination until after it reports stats.	2014-02-09 18:44:31 -08:00
Nick Winter	f2bcf019fa	Should update code when other player changes it again.	2014-02-08 15:32:14 -08:00
Nick Winter	b2bf4db222	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-07 16:47:38 -08:00
Scott Erickson	0365998658	Began work on a ladder view.	2014-02-07 15:51:05 -08:00
Nick Winter	2efb9a0ea1	Simple team switch links in multiplayer menu.	2014-02-07 10:51:21 -08:00
Nick Winter	86de427204	Messing with team setting.	2014-02-06 17:31:08 -08:00
Nick Winter	2a3e47b08f	Using playable team config from Alliance system.	2014-02-06 16:05:41 -08:00
Nick Winter	6af2d34f59	Fixed a ton of memory leaks, but not all of them.	2014-02-06 14:00:27 -08:00
Nick Winter	2a8d0eb694	Updates for ThangsList refreshing its Thangs.	2014-02-05 20:08:28 -08:00
Nick Winter	cc3465fd6f	Improvement for errors updating action of non-existent Thangs in HUD.	2014-02-05 15:54:34 -08:00
Nick Winter	cec52d70f3	Improvements to how Tome subviews manage Thang updates.	2014-02-05 15:16:59 -08:00
Nick Winter	738b791683	Updated to new Aether range info, fixing error line numbers.	2014-02-03 13:58:25 -08:00
Nick Winter	068f798d58	Fixed bugs in Tome spell views swapping.	2014-02-02 10:26:42 -08:00
Nick Winter	7ba6e5d0f2	Fixed #316 .	2014-01-31 16:32:46 -08:00
Nick Winter	ee7d8a06fe	A few SpellView / debugger fixes.	2014-01-31 16:16:59 -08:00
Nick Winter	632316314e	Don't include flow for invisible methods, don't include protectAPI for non-writable methods.	2014-01-31 14:51:06 -08:00
Nick Winter	d79d66c175	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-30 16:36:40 -08:00
Nick Winter	6e40fa09a6	Updated some Bootstrap event names.	2014-01-30 16:36:36 -08:00
Michael Schmatz	fe89c9fbad	Fix for #290	2014-01-30 15:03:55 -08:00
Nick Winter	a6bfb6770c	Matched gradient background colors in HUD to ThangAvatarView.	2014-01-30 12:03:33 -08:00
Nick Winter	067d3abd75	Improved handling of spawning Programmables in Tome after the fact.	2014-01-29 16:26:08 -08:00
Nick Winter	e0108a3166	A few fixes for the Bootstrap 3 migration. Fixed #280 .	2014-01-29 12:18:37 -08:00
Scott Erickson	f065406cf5	Merge branch 'feature/bootstrap3'	2014-01-29 10:40:34 -08:00
Scott Erickson	bac4fbcd7d	Fixed naming. Improved tome updating of programmable spell thangs.	2014-01-29 10:14:12 -08:00
Nick Winter	01efb2f92b	Improvements to SpellDebugView hover.	2014-01-29 08:38:37 -08:00
Nick Winter	fb7739727c	Updates for Aether's protectAPI stuff.	2014-01-28 15:24:08 -08:00
Scott Erickson	fa3ab69dab	Level preview now loads from backups so that brunch reloads don't cause the preview to break.	2014-01-27 11:00:36 -08:00
Nick Winter	47c78d1758	Revamped SpellToolbarView.	2014-01-25 15:11:29 -08:00
Nick Winter	d262dfaca7	A few visual tweaks to the spell view flow.	2014-01-24 17:48:11 -08:00
Nick Winter	45329df4cd	Temp fix for debugger bug on a relevant session.	2014-01-24 13:46:51 -08:00
Nick Winter	6fa38bd889	Several improvements to hover debugging.	2014-01-24 13:03:04 -08:00
Nick Winter	9b9df12ea0	Huge Aether performance fix; spells now scroll while debugging.	2014-01-24 08:01:00 -08:00
Nick Winter	3b7a908dcd	Handled a couple errors.	2014-01-22 10:56:49 -08:00
Nick Winter	24c4051442	Merge branch 'feature/time-travel-debugger'	2014-01-21 09:04:09 -08:00
Nick Winter	6ea4f645f8	Added spell toolbar view. Made many time-travel debugger improvements.	2014-01-21 09:03:04 -08:00
Scott Erickson	68567c1366	Fixed level editor preview.	2014-01-20 23:14:34 -08:00
Nick Winter	f87c3a37e8	More progress on debugger.	2014-01-19 09:14:42 -08:00
Nick Winter	0a8d64046a	Starting work on time-travel debugging interface.	2014-01-19 07:08:28 -08:00
dristic	7f39693d70	Save latest level played to local storage. Change play link when latest level is available on home page.	2014-01-18 23:15:59 -08:00
Nick Winter	5267febd8f	Couple fixes for small errors when running with no Programmables.	2014-01-16 14:29:57 -08:00
GlenDC	553ad833ed	Merge https://github.com/codecombat/codecombat	2014-01-16 22:27:09 +01:00
GlenDC	5cc24ea1b2	Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.	2014-01-16 22:26:34 +01:00
GlenDC	b557c43f60	Hotfix for previous commit, forgot to uncommit some stuff	2014-01-16 22:22:42 +01:00
GlenDC	926b31f62f	Resolved issue #160	2014-01-16 22:18:38 +01:00
Nick Winter	1fb68ae717	Fixed bug with team assignments and spell permissions.	2014-01-16 11:37:04 -08:00
Scott Erickson	c5b9b103c5	Merge branch 'feature/team-colors' Conflicts: app/lib/world/world.coffee app/models/ThangType.coffee	2014-01-16 10:14:21 -08:00
Nick Winter	af7344175a	Merged and tweaked phansch's save indicator from #205 .	2014-01-16 10:10:27 -08:00
Nick Winter	6f5b37e86d	Possible fix for Grab the Mushroom problems.	2014-01-16 09:20:02 -08:00
Philipp Hansch	3a63428c0c	Add jquery fading Also using the level:session-will-save callback	2014-01-16 17:13:14 +01:00
Scott Erickson	f230e8983c	Fixed the level preview view.	2014-01-15 18:37:47 -08:00
Scott Erickson	47effcd50e	Got the rest of team colors set up.	2014-01-15 15:16:31 -08:00
Nick Winter	172d97ed83	Fixed #87 I hope; at least, dramatically reduced memory leakage.	2014-01-15 13:04:48 -08:00
Philipp Hansch	17afb62dc9	Add basic code-saved indicator Using the tome:spell-changed callback to determine when to start showing the code-saved indicator	2014-01-15 20:58:39 +01:00
Scott Erickson	bf4011044f	Initially working on using team colors, but it's not working yet.	2014-01-14 13:16:30 -08:00
Nick Winter	8ab997680e	Turned off A/B test for Break the Prison.	2014-01-12 12:00:38 -08:00
Nick Winter	69df0079af	Fixed bug returning to normal selection from talking portrait in HUD.	2014-01-09 18:30:18 -08:00
Scott Erickson	2d5ca50e89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 14:04:53 -08:00
Scott Erickson	3c3e38b585	Set up thang avatar views with the new db portraits.	2014-01-09 14:04:46 -08:00
Nick Winter	98245d0fb9	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 11:28:14 -08:00
Nick Winter	3a954ff91c	A bit more CoffeeScript-y.	2014-01-09 11:28:08 -08:00
Scott Erickson	4e34b38c83	Merge branch 'master' of https://github.com/codecombat/codecombat Conflicts: app/views/play/level/hud_view.coffee	2014-01-09 11:05:51 -08:00
Scott Erickson	8077c62ceb	Set up talking portraits in the hud.	2014-01-09 11:04:22 -08:00

... 15 16 17 18 19 ...

1659 commits