321 commits

Author	SHA1	Message	Date
Scott Erickson	939c5faa1a	Fixed a bug when a thang has multiple effects.	2014-03-12 09:15:37 -07:00
Scott Erickson	9cb80783ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-11 22:01:47 -07:00
Nick Winter	b560827e32	Working on cleaning up some server errors.	2014-03-11 19:17:58 -07:00
Nick Winter	4f9db0a7f7	Merged in all names.	2014-03-11 18:11:48 -07:00
Darredevil	012c25a817	Added GetALLToLocations and KeepALLFromLocations	2014-03-12 01:57:30 +02:00
Alexandru	5f2587da18	Merge remote-tracking branch 'upstream/master'	2014-03-12 01:38:54 +02:00
Alexandru	4552455284	Merge branch 'master' of https://github.com/Darredevil/codecombat	2014-03-12 01:23:55 +02:00
Scott Erickson	da58b68fa0	Fixed a bug with the music player where sometimes it wouldn't loop.	2014-03-11 16:23:04 -07:00
Sam Epps	11ca60765d	Added some additional names to names.coffee	2014-03-11 17:16:09 +01: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	c6b1d9089c	Fixed sounds spamming on last frame.	2014-03-10 08:45:36 -07:00
Darredevil	c9a56048ca	Update GoalManager.coffee	2014-03-09 20:35:33 +02:00
Nick Winter	b3964571e1	Fixed bug importing animations into existing ThangTypes that had only containers.	2014-03-08 15:04:11 -08:00
Nick Winter	5bde534757	Fixed parsing for ThangTypes that don't have lib.properties.	2014-03-08 14:53:17 -08:00
Nick Winter	be12d38e34	Taking into account null rects and library width/height subtraction on sprite parsing.	2014-03-08 14:38:35 -08:00
Nick Winter	085fb82cc9	Fixed a multiplayer link and debug mark alpha.	2014-03-07 21:02:10 -08:00
Scott Erickson	2fa40fb2db	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-07 17:37:19 -08:00
Scott Erickson	fe2ced1a67	Gave the health bar a border, made it a little more high res.	2014-03-07 17:37:11 -08:00
Nick Winter	ec86a07906	Changed Camera min/max zoom.	2014-03-07 15:20:54 -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	d8d917ecf9	Set up better teardown for the ladder view.	2014-03-07 12:15:16 -08:00
Scott Erickson	610fc0694b	Turning off view caching by default now. Should help lower the memory footprint.	2014-03-07 11:57:15 -08:00
Scott Erickson	34278a8648	Merge remote-tracking branch 'origin/master'	2014-03-06 17:27:01 -08:00
Scott Erickson	a4edb76c98	Fixed a couple of the bugs with marks.	2014-03-06 17:25:40 -08:00
Nick Winter	40e896868b	Fixed CocoSprite getOffset to not apply scale to registration points.	2014-03-06 17:21:24 -08:00
Scott Erickson	5b11e132b2	Fixed the effect marks so they properly go away.	2014-03-06 17:13:16 -08:00
Nick Winter	b6335a30ae	More fixes for empty string array serialization.	2014-03-06 16:32:13 -08:00
Scott Erickson	2fb1c184f9	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-06 16:22:19 -08:00
Scott Erickson	1b61b928b0	Couple tweaks to the cocosprite for effect marks.	2014-03-06 16:21:06 -08:00
Nick Winter	ea406bd3c7	Fixed some event listeners on destroyed loaders.	2014-03-06 15:52:51 -08:00
Scott Erickson	2ac5a94055	Merge remote-tracking branch 'origin/master'	2014-03-06 15:52:14 -08:00
Scott Erickson	041f4512e8	Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple.	2014-03-06 15:52:09 -08:00
Nick Winter	40a32d7b43	Fixed array / string ThangState key serialization conflicts. Fixed #333.	2014-03-06 14:53:37 -08:00
Nick Winter	a03403de94	Started some more name categories.	2014-03-06 09:35:58 -08:00
Nick Winter	fddd210d34	Fixed Archer M names conflict.	2014-03-06 09:27:06 -08:00
Nick Winter	b5c72e4b4a	Merge pull request #477 from iraladson/patch-1 ... Update names.coffee	2014-03-06 09:25:37 -08:00
Akaza Akari	030da44c23	Added volume manipulation, adjusted panning parameters	2014-03-05 20:12:42 -08:00
Akaza Akari	51d7bd656d	Made updatePosition use getWorldPosition	2014-03-05 19:54:58 -08:00
Akaza Akari	99f43028a0	Add thang sound panning for #454	2014-03-05 19:39:14 -08:00
Scott Erickson	7a2d5b4bff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-05 12:53:57 -08:00
Scott Erickson	af265ebee8	Tweaked an error message to be more generally useful.	2014-03-05 12:53:11 -08:00
Jayant Jain	db0fc82eb0	Minor bugfix for freezing editor due to out of bounds frame index	2014-03-06 01:54:09 +05:30
iraladson	8d046c31b9	Update names.coffee ... "Added more names for #53	2014-03-05 14:06:29 -06:00
iraladson	7885b21b4b	Update names.coffee	2014-03-05 14:03:57 -06:00
Nick Winter	5ec06159a6	Fixed ChallengePost utm link. Tweaked God worker timeout for more reliable performance logging.	2014-03-05 12:00:29 -08:00
Scott Erickson	03b60838b6	Merge remote-tracking branch 'origin/master'	2014-03-04 12:21:07 -08:00
Scott Erickson	9726840d8a	Trying to handle a case where a user did not have their user account created.	2014-03-04 12:21:02 -08:00
Scott Erickson	3680d628e7	Fixed showing generic errors.	2014-03-04 12:06:31 -08:00
Yos Riady	195b1941ea	Added even more names for #53	2014-03-05 02:53:54 +08:00
Nick Winter	2f653c966e	Simulator now swaps in empty methods when code doesn't compile.	2014-03-04 08:30:50 -08:00