145 commits

Author	SHA1	Message	Date
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