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 |
|
Scott Erickson
|
358b36c1bf
|
Set up custom graphics to be copied from old spritesheets when possible as well.
|
2014-09-24 18:47:10 -07:00 |
|
Scott Erickson
|
fb30f07f2e
|
Re-enabled effect marks.
|
2014-09-24 18:42:04 -07:00 |
|
Scott Erickson
|
91f33e49dc
|
Re-enabled shadows.
|
2014-09-24 17:52:44 -07:00 |
|
Scott Erickson
|
7f90ed18cc
|
Bunch more work on scaling for everything and hit testing for segmented sprites. Also got health bars working again.
|
2014-09-24 16:53:38 -07:00 |
|
Scott Erickson
|
6669a01c14
|
Got rid of some cache functions. Set up area of effect animations in the new spriteSheet system.
|
2014-09-24 12:08:55 -07:00 |
|
Scott Erickson
|
c49f894ef2
|
Refactored SPRITE_PLACEHOLDER_RADIUS to SPRITE_PLACEHOLDER_WIDTH.
|
2014-09-24 10:55:33 -07:00 |
|
Scott Erickson
|
2cbe498f9a
|
Fixed scaling for singular sprites for all cases.
|
2014-09-24 09:37:49 -07:00 |
|
Nick Winter
|
8d6b23274b
|
Zoom in on hero during real-time playback.
|
2014-09-23 22:10:18 -07:00 |
|
Nick Winter
|
5397c51819
|
Fixed world-threatening typo.
|
2014-09-23 18:59:08 -07:00 |
|
Nick Winter
|
019f634d9f
|
Respecting coordinates setting.
|
2014-09-23 18:39:52 -07:00 |
|
Scott Erickson
|
16cb596a12
|
Set up scaling and mouse events for segmented sprites with container actions.
|
2014-09-23 12:08:50 -07:00 |
|
Scott Erickson
|
5de5d5658e
|
Working on SegmentedSprite mouse events, hit tests and scaling.
|
2014-09-23 11:37:05 -07:00 |
|
Nick Winter
|
8640369b26
|
Improved solidity of victory modal. Fixed error with empty sound groups in Thang editor.
|
2014-09-22 21:50:48 -07:00 |
|
Nick Winter
|
42b52f5593
|
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
|
2014-09-21 22:10:52 -07:00 |
|
Nick Winter
|
6cb8a2a019
|
Hero always centered in camera in new hero levels when playing and not panning to drag.
|
2014-09-21 20:49:45 -07:00 |
|
Nick Winter
|
949f4594af
|
Showing goals on level loading view.
|
2014-09-21 15:52:49 -07:00 |
|
Nick Winter
|
0d495ba36e
|
Press Start to begin playing levels. Fixed #1574.
|
2014-09-21 14:35:59 -07:00 |
|
Scott Erickson
|
39b6b9ef84
|
Couple remaining refactoring tidbits for the new LayerAdapter.
|
2014-09-19 15:46:37 -07:00 |
|
Scott Erickson
|
3b7ce76d7d
|
Refactored WebGLLayer and SpriteContainerLayer/ContainerLayer into a single LayerAdapter class that has a Container or SpriteContainer.
|
2014-09-19 15:46:02 -07:00 |
|
Scott Erickson
|
cc7c65115c
|
Renamed WebGLLayer to LayerAdapter.
|
2014-09-19 14:59:29 -07:00 |
|