815 commits

Author	SHA1	Message	Date
Scott Erickson	ec7028af60	Fixed uploading images for articles.	2014-02-26 19:30:37 -08:00
Scott Erickson	4e8c0b65e2	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-26 18:49:43 -08:00
Scott Erickson	7052b0600b	Made mouse dragging not interrupt selecting units so much.	2014-02-26 18:42:39 -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	5c1c17c8dd	Green Guide button for attention.	2014-02-26 17:52:08 -08:00
Nick Winter	081274579b	Forget old goals.	2014-02-26 17:45:08 -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	0fd1c03b7f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-26 15:56:25 -08:00
Scott Erickson	c86feb13e8	Fixed the region and point choosers for the level editor.	2014-02-26 15:56:05 -08:00
Scott Erickson	ea73d91a6b	Made the docs modal larger.	2014-02-26 15:44:46 -08:00
Michael Schmatz	b648098c95	Implemented espionage mode	2014-02-26 14:14:43 -08:00
Michael Schmatz	a052180250	Improved match scheduling	2014-02-26 12:14:02 -08:00
Michael Schmatz	bb76fb241c	Fixed simulator ... The format of something must have suddenly changed?	2014-02-26 09:21:44 -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	373a618cff	Moved internationalisation of level load error message into template file	2014-02-26 06:14:29 +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	e3a81137e0	Modified locale messages for "level_load_error"	2014-02-26 05:52:49 +08:00
Scott Erickson	a53498224c	Tweaked sprite scripts to use given response buttons even if the script is not skippable.	2014-02-25 13:27:02 -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
Scott Erickson	eee434ab51	Tweaked the coordinate display position to be a bit more above the mouse.	2014-02-25 12:38:47 -08:00
Scott Erickson	356d1b55ed	Added a property to prevent scripts from running after certain other scripts have run.	2014-02-25 11:59:23 -08:00
Scott Erickson	f4084ba5cc	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-25 10:50:53 -08:00
Scott Erickson	45e6fadfe2	Added a property to prevent scripts from running after certain other scripts have run.	2014-02-25 10:50:40 -08:00
Scott Erickson	a1a5d5eea0	Fixed some script handling by not having playback changed when the first world is built.	2014-02-25 10:50:12 -08:00
Nick Winter	a440c4dff0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-25 10:48:33 -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
Scott Erickson	168f268d21	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 19:49:12 -08:00
Scott Erickson	242342315f	Can now drag the mouse to move around the map.	2014-02-24 19:49:05 -08:00
Nick Winter	3472b3da97	Working on different shadow shapes. Fixed bug with palette property ownership.	2014-02-24 17:53:35 -08:00
Nick Winter	4a4a702f1e	Fixed a bug where scrubbing playback wouldn't always update sprite existence properly.	2014-02-24 17:01:36 -08:00
Scott Erickson	01b91eb7e2	Lowered the bob height for the wizard a bit.	2014-02-24 16:59:17 -08:00
Scott Erickson	12b28397e0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 16:54:10 -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	6e557d354e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 16:42:37 -08:00
Nick Winter	2e2f184485	Not sure why beam behaves differently, but fixed its scaling.	2014-02-24 16:42:34 -08:00
George Saines	d62630d0a7	final tweaks to dialogue text styling	2014-02-24 16:03:56 -08:00
George Saines	8192a6153d	fiddling with text formatting	2014-02-24 15:51:10 -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
Scott Erickson	79ce16dbba	Hiding most of the ladder page if not logged in.	2014-02-24 14:57:51 -08:00
Scott Erickson	052d35afe7	Added a screen darkener for when the spell is casting.	2014-02-24 14:40:28 -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