6569 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	e193b68aea	Merge branch 'master' into production	2014-02-15 18:36:04 -08:00
Nick Winter	1f7cea4e54	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 17:38:50 -08:00
Nick Winter	f94456295e	God needs no options.	2014-02-15 17:38:45 -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	addf4ca245	Improved Simulator memory and performance.	2014-02-15 17:29:54 -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	0fb2018f2a	Added project query param to getLatestVersion.	2014-02-15 14:09:30 -08:00
Scott Erickson	8f938bf6fc	Scrolling with the mouse now zooms based on mouse position.	2014-02-15 13:45:16 -08:00
Esh2349	185963f999	ru.cofee small changes	2014-02-16 00:20:59 +03:00
Scott Erickson	72712a349c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 12:07:28 -08:00
Scott Erickson	ac08490e86	Reworked the multiplayer modal a bit.	2014-02-15 12:06:47 -08:00
Scott Erickson	7eee28422a	Fixed the submitting of scores to only allow logged in users to get on the leaderboard.	2014-02-15 10:31:24 -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	d55e4cd624	Made sure session objects are loaded from the server fresh, no caching.	2014-02-14 15:35:54 -08:00
Michael Schmatz	643cafc89f	Refactored level handler and level session schema	2014-02-14 14:55:30 -08:00
Scott Erickson	13caae2690	Fixed the massive memory leak.	2014-02-14 14:10:55 -08:00
Scott Erickson	a8c483a59f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-14 14:10:35 -08:00
Scott Erickson	55fcad2cc3	Fixed a couple bugs with the wizard.	2014-02-14 14:10:28 -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
Michael Schmatz	7cec574e17	Started simulator refactor	2014-02-14 10:49:19 -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
Michael Schmatz	2b1079912a	Merge pull request #368 from gintau/master ... Revsing Traditional Chinese translation and adding translation of "about".	2014-02-13 21:06:57 -08:00
Nick Winter	da866a418c	Fixed cast options clicking.	2014-02-13 17:43:42 -08:00
Nick Winter	bf030418dc	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 17:35:01 -08:00
Nick Winter	77dbcf9d89	Backbone 1.1.1 gets underscore as a dependency, which we don't want, so back to 1.1.0 in bower.	2014-02-13 17:34:57 -08:00
Michael Schmatz	fc76846aa6	Stopped parsing ladder as int	2014-02-13 17:34:31 -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
Michael Schmatz	128df09ce3	Fixed session by converting toObject	2014-02-13 16:29:02 -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	9bea226677	Fixed the ladder table.	2014-02-13 15:57:07 -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
Scott Erickson	b8051689b3	Fixed the goal manager from polluting the goals in the level with the isPositive property.	2014-02-13 15:50:53 -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