442 commits

Author	SHA1	Message	Date
Scott Erickson	5bb1275cea	Tweaked how movie clips are animated and copied from, sidestepping how adding children from movie clips removes them from the movie clips, and making inheritence fully recursive.	2014-10-02 16:55:03 -07:00
Scott Erickson	b1f4dc996d	Fixed a handful of bugs with the thang editor and sprite animation.	2014-10-02 10:42:21 -07:00
Scott Erickson	e044a660eb	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-10-02 09:28:31 -07:00
Nick Winter	2491861d76	A few tweaks for the iPad app.	2014-10-01 22:02:52 -07:00
Scott Erickson	1b1bc4e95a	Fixed adding thangs in the level editor, and moving them around.	2014-10-01 15:02:14 -07:00
Scott Erickson	e9222f34bd	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-10-01 13:26:45 -07:00
Scott Erickson	3205821ee9	Got the level editor mostly working again.	2014-10-01 13:26:38 -07:00
Nick Winter	0290db9cd4	Starting to try to get iPad to work during real-time playback.	2014-10-01 12:08:14 -07:00
Scott Erickson	bab7598ce0	Fixed an error wizard sprites were having.	2014-09-30 14:01:29 -07:00
Scott Erickson	ffdb2ef6b4	Fixed position updating for indie sprites.	2014-09-30 14:01:20 -07:00
Scott Erickson	c05cc1c0ad	Fixed text box pointers being cut off from caching.	2014-09-30 14:00:47 -07:00
Scott Erickson	528383c0dc	Undid the attempted optimization of having the normal stage update half as often.	2014-09-30 13:45:15 -07:00
Scott Erickson	90e21c6085	Did some more missed refactorings from sprite -> lank.	2014-09-30 13:44:03 -07:00
Scott Erickson	34cf6240c1	Refactored heroSprite -> heroLank, replaced a call to LankBoss.spriteFor with LankBoss.lankFor.	2014-09-30 13:41:42 -07:00
Scott Erickson	4a6e8018e4	Fixed choosing the first frame for segmented sprites.	2014-09-30 13:34:55 -07:00
Scott Erickson	b06cd12c5c	Some more optimizations, this time in LankBoss update operations.	2014-09-29 11:47:12 -07:00
Scott Erickson	ce9a7e2ed4	Improved performance of the non-webgl stage.	2014-09-29 10:18:27 -07:00
Scott Erickson	326057a816	Fixed another bug from the refactoring.	2014-09-28 14:16:56 -07:00
Scott Erickson	b65b553f2d	Fixed some tests broken from the refactoring.	2014-09-28 14:04:01 -07:00
Scott Erickson	f081d9ed4b	Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again.	2014-09-28 14:00:48 -07:00
Scott Erickson	8adbd87401	Merge branch 'master' into feature/webgl	2014-09-28 10:38:19 -07:00
Scott Erickson	024cd9c955	Fixed a bunch of tests, and a child animations bug from the MovieClip pooling optimization.	2014-09-28 10:33:24 -07:00
Scott Erickson	6d595705f2	Made the placeholder color and shape different for each layer.	2014-09-26 16:15:44 -07:00
Scott Erickson	8234db333e	Reenabled text events.	2014-09-26 15:57:24 -07:00
Scott Erickson	b89a6c41a7	Fixed the surface to not restore state until it's done dropping frames.	2014-09-26 15:23:27 -07:00
Scott Erickson	332f4700f6	Fixed the mark toggle equivalency check. This bug was causing the target mark to be turned on repeatedly.	2014-09-26 15:22:46 -07:00
Scott Erickson	f0e879295c	Set back up debug marks.	2014-09-26 14:09:44 -07:00
Scott Erickson	f21083acf5	Set back up highlight mark.	2014-09-26 13:58:35 -07:00
Scott Erickson	2505f50eec	Set back up selection and target marks.	2014-09-26 13:45:11 -07:00
Scott Erickson	5b9c7dc8a7	Removed layer's cache function (wasn't used before webgl factoring anyway?). Removed TRANSFORM_CHILD layer transform setting.	2014-09-26 13:02:01 -07:00
Scott Erickson	37e9d7bb2d	Enabled the Surface's normalStage and all its layers.	2014-09-26 12:45:27 -07:00
Scott Erickson	c1e7423a64	Fixed sprite coloring and the thangtype-not-yet-loaded placeholder.	2014-09-26 12:17:46 -07:00
Scott Erickson	6f45eee81d	Fixed registration points for scaled raster image thang types.	2014-09-26 11:33:07 -07:00
Scott Erickson	be805ff3c1	Update scale and rotation after playing a new action, since with segmented sprites that often means a new image object.	2014-09-26 11:25:36 -07:00
Scott Erickson	627c56dbb5	Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema.	2014-09-26 11:07:01 -07:00
Nick Winter	b7d2bcd222	Decreased severity of camera jerkiness during real-time playback.	2014-09-25 15:01:06 -07:00
Scott Erickson	8aeb6555ec	Added MovieClip pooling, improving WebGL performance.	2014-09-25 14:48:17 -07:00
Scott Erickson	14f3fb6486	Fixed one last instance of cocoSprite using its resolutionFactor value.	2014-09-25 14:03:44 -07:00
Scott Erickson	4b87607599	Fixed animations where the frame stays the same for periods of time.	2014-09-25 13:26:05 -07:00
Scott Erickson	d77b87ed22	Fixed raster thang types, and level destruction.	2014-09-25 13:12:47 -07:00
Scott Erickson	10314b8bfa	Fixed sprites often disappearing when idle.	2014-09-25 12:43:51 -07:00
Scott Erickson	d4b1849eaf	Fixed one other little thing.	2014-09-25 12:22:33 -07:00
Scott Erickson	8fe2ed4438	Resolved conflicts.	2014-09-25 10:52:36 -07:00
Scott Erickson	06b106f42b	Merged from master.	2014-09-25 10:52:27 -07:00
Scott Erickson	c7e7066aef	Migrating surface to webgl. It sorta works!	2014-09-25 10:47:53 -07:00
Nick Winter	9fc7fca528	Hooked up real-time playback music.	2014-09-25 10:30:43 -07:00
Nick Winter	9ea24f4c74	Added a workaround for Surface resize failure on realtime playback end that Maksym had seen.	2014-09-25 09:48:14 -07:00
Nick Winter	2aa274cb2d	Fixed bugs with Surface fast-forwarding too fast on short levels and rewinding non-instantaneously when rerunning.	2014-09-24 22:07:55 -07:00
Nick Winter	b2592aad8c	Fixed more off-by-one errors in playback ratios. Fixed some clickability problems with the scrubber handle.	2014-09-24 21:01:58 -07:00
Nick Winter	b8d59cb179	Fixed a bug with playback never quite getting to the end.	2014-09-24 20:25:30 -07:00