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
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
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
Scott Erickson
fbbfb6c0cc
Refactored WebGLSprite to SegmentedSprite and SingularSprite, and refactored renderStrategy (container/spriteSheet) to spriteType (segmented/singular).
2014-09-19 14:56:40 -07:00
Scott Erickson
3c9b40e8f4
Set up placeholders for when WebGLSprites don't have their raw data built yet. Not finished yet because of scaling, but will come back to it... Got some refactoring to do first.
2014-09-19 13:50:14 -07:00
Scott Erickson
a99cdfb957
WebGLLayer now recycles previous sprite sheets, speeding up rendering additional thang types or animations.
2014-09-18 14:36:05 -07:00
Scott Erickson
cc76458942
Normalized the container renderStrategy resolution so that both renderStrategies are the same.
2014-09-18 13:18:44 -07:00
Scott Erickson
c7279e68a8
The whole WebGL system now dynamically renders needed frames when actions it doesn't support get activated.
2014-09-18 12:19:52 -07:00
Scott Erickson
0404b94e5e
WebGLSprites of all types no longer display anything at all if their required data hasn't been rendered.
2014-09-18 11:56:49 -07:00
Scott Erickson
b1784a1207
Had apparently switched the SpriteBoss tests to use a regular Stage instead of a SpriteStage. Switched it back, and fixed a subsequent bug with the Layer responding to Camera events (apparently SpriteStage does not take regX/Y or scaleX/Y into account).
2014-09-18 11:12:18 -07:00
Scott Erickson
0b948d4a1e
Got the SpriteBoss to handle removing sprites again.
2014-09-18 10:03:13 -07:00
Scott Erickson
f77f229b09
Fixed rotation not being updated after a new SpriteSheet is built.
2014-09-18 09:03:33 -07:00
Scott Erickson
5fe9a02c06
WebGLLayer now re-renders itself at a lower resolution if it's too big.
2014-09-17 17:08:24 -07:00
Scott Erickson
61a25c5693
Merged conflicts.
2014-09-17 16:53:12 -07:00
Scott Erickson
5af1741333
Merged conflicts.
2014-09-17 16:53:08 -07:00
Scott Erickson
dd81d1d5bc
Container renderings are now dependent on resolution.
2014-09-17 16:49:31 -07:00
Scott Erickson
dbfbddeb5d
Added a test to make sure the WebGLLayer ended up with the right number of children after multiple renderings. Fixed something that was breaking WebGLLayer and WebGLSprite tests.
2014-09-17 16:06:23 -07:00
Scott Erickson
7387248ffd
Initial integration of SpriteBoss with the WebGLLayer and all else.
2014-09-17 15:47:25 -07:00
Nick Winter
d96d0d65f3
Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits.
2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9
Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs.
2014-09-16 20:19:52 -07:00
Nick Winter
687da38667
Made some performance optimizations that all relate to messing with walls in the level editor.
2014-09-16 17:31:00 -07:00
Scott Erickson
1ef3d150a8
Integrated WebGLLayer and WebGLSprite with CocoSprite.
...
Disabled some features in CocoSprite that'll have to be added back later.
Moved more logic from CocoSprite, like determining registration points for a given animation, to WebGLSprite.
WebGLSprite can now display either rendering containers or SpriteSheets.
2014-09-16 15:36:59 -07:00
Nick Winter
89aa930803
Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio.
2014-09-15 15:38:07 -07:00
Scott Erickson
9ba11e2354
Got the WebGLSprite to work with nested MovieClips.
2014-09-15 15:08:02 -07:00
Scott Erickson
a633f6f82f
Built most of the WebGLSprite.
2014-09-15 13:53:20 -07:00
Scott Erickson
c96f5d7bcf
Merge branch 'master' into feature/webgl
2014-09-12 16:33:39 -07:00
Scott Erickson
08bdcb2cb6
Built the WebGLLayer which creates sprite sheets based on what CocoSprites are given to it.
2014-09-12 16:33:01 -07:00
Nick Winter
e9968b648f
Fixed bugs with click coordinates messing up mouse-down targeting.
2014-09-11 13:05:31 -07:00
Nick Winter
68808d0e07
Some fixes for how audio is triggered.
2014-09-11 08:38:30 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Scott Erickson
64ea670ebd
Reorganized the Surface into groupings. Changed no logic, just shuffled things around.
2014-09-05 09:21:00 -07:00
Nick Winter
d3eb7a7438
Fixed a few issues with real-time multiplayer flags.
2014-09-04 20:10:04 -07:00
Nick Winter
35f22e0f8c
Fixed a few tome / canvas resizing bugs.
2014-09-03 18:35:14 -07:00
Nick Winter
6b6c8dd683
Merged master into feature/realtime-multiplayer; looks good.
2014-09-03 16:14:33 -07:00
Scott Erickson
c70ffbeef5
Fixed onBackground for surface:stage-mouse-down events.
2014-09-02 16:42:03 -07:00
Scott Erickson
55bac798ee
Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width.
2014-09-02 15:33:23 -07:00
Nick Winter
72eb59b7c3
Fixed a few bugs.
2014-09-01 16:14:50 -07:00
Nick Winter
040ac4ff4e
Fixed bug with black flashes during script playback.
2014-08-31 16:05:21 -07:00
Nick Winter
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
Nick Winter
5503b3a2bc
Fixed #1147 .
2014-08-29 17:03:02 -07:00