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
64a8322ec0
Fixed some more tests.
2014-09-28 10:47:01 -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
Nick Winter
61aa2d8b6f
Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.
2014-09-25 13:29:20 -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
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
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
2183b7dac1
A couple other minor tweaks to a test suite.
2014-09-19 15:00:45 -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
7fb261f577
Removed some unnecessary expectations.
2014-09-18 12:22:54 -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
7db73a5ddf
Fixed a test.
2014-09-18 11:12: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
f2765e05b0
Added some explanations for the SpriteBoss test setup.
2014-09-18 11:04:16 -07:00
Scott Erickson
0b948d4a1e
Got the SpriteBoss to handle removing sprites again.
2014-09-18 10:03:13 -07:00
Scott Erickson
63758acd2e
Fixed some tests when run on karma.
2014-09-18 09:46:02 -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
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
Scott Erickson
9343d1e645
Tweaked the most recent tests.
2014-09-15 15:09:27 -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
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
632559f7db
Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'.
2014-09-01 20:53:53 -07:00
Scott Erickson
154b91c753
Changed LevelLoader to always deeply load components and thang types, not just for hero levels.
2014-08-28 15:19:04 -07:00
Scott Erickson
8b056cfb8f
Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.
2014-08-28 11:24:45 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Scott Erickson
98752159ca
Made the SuperModel a little bit more clever about handling duplicate loaded models.
2014-08-26 16:31:53 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -07:00
Scott Erickson
6091eaea6f
Bunch of fixes to the thang component edit view.
2014-08-26 09:48:33 -07:00
Nick Winter
e48b218533
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
2014-08-25 15:39:47 -07:00
Scott Erickson
1c5db3f2b7
First round of getting the site to use the new defaults system, in particular the job profile view.
2014-08-23 11:07:52 -07:00
Scott Erickson
86ba46b64c
Refactored LevelLoader's loading of session dependencies a bit so it's easy to have it load them on demand.
2014-08-18 13:43:17 -07:00
Nick Winter
03e39c3f5c
Fixed Level denormalize test.
2014-08-15 11:15:48 -07:00
Matt Lott
98bed57751
Merge pull request #1441 from differentmatt/master
...
Instrument user code problems
2014-08-14 16:17:47 -07:00
Scott Erickson
9404c40b47
Another stab at fixing the tests.
2014-08-14 14:22:02 -07:00
Scott Erickson
2060bb5ac5
Turning off a test that for some reason is breaking on Travis but nowhere else.
2014-08-14 14:07:20 -07:00
Scott Erickson
827f6ee8b8
Added a swap button, as well as moving my testing to the demo view and adding some specifications, fixing bugs and tweaking interactions along the way.
2014-08-14 14:04:03 -07:00
Matt Lott
9b79e2ca27
Instrument user code problems
2014-08-14 13:32:00 -07:00
