247 commits

Author	SHA1	Message	Date
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	fdf1e21e72	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-14 16:52:54 -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	a25b1be916	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-14 15:57:54 -08:00
Michael Schmatz	63a5769bcf	Fixed various bugs in simulator and put in home view	2014-02-14 15:50:42 -08:00
Scott Erickson	7faa401177	Trying to improve memory by clearing out all properties of destroyed objects.	2014-02-14 13:31:26 -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
Michael Schmatz	6011ac0df4	Changed subscription frequency to prevent multiple score registrations	2014-02-13 17:19:43 -08:00
Michael Schmatz	ca7376b794	Worked around mongoose toObject ... Also tried elementary memory leak fix	2014-02-13 17:10:01 -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
Michael Schmatz	d33c39c21e	Added continuous simulation and fix for "no team"	2014-02-13 15:59:40 -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
Michael Schmatz	40c26bb395	Scoring queues mostly working	2014-02-13 12:59:24 -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
Scott Erickson	f3489a6c2f	Added a 'stop' button for viewing end animations on thang types.	2014-02-12 16:18:25 -08:00
Nick Winter	b7be08ac19	Fixed one more leak.	2014-02-12 13:43:17 -08:00
Nick Winter	cdf268ce4f	Merged.	2014-02-12 13:10:58 -08:00
Nick Winter	5655084981	Fixed a ton more leaks.	2014-02-12 12:41:41 -08:00
Scott Erickson	2f48925e86	Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.	2014-02-12 12:27:02 -08:00
Scott Erickson	59f0d8a93e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 09:55:35 -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