David Beckley
71569d61e0
Fix issue #1472
2014-09-19 18:34:11 -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
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
Nick Winter
4f2daf1a1d
Merge pull request #1579 from glls/patch-2
...
Update el.coffee
2014-09-19 13:59:04 -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
George Litos
43d027df45
Update el.coffee
...
typographic and grammatical errors fix
2014-09-19 23:37:16 +03:00
Nick Winter
4689659533
Merge pull request #1578 from keenanjohnson/master
...
#53 Adding more names
2014-09-19 11:30:44 -07:00
keenanjohnson
bb8f5c41ba
#53 Adding more names
2014-09-19 13:25:48 -05:00
Nick Winter
ec21637adf
Showing the new hero levels instead of the old campaign levels on the /play-hero map.
2014-09-19 11:03:38 -07:00
Nick Winter
bbb6300f1f
Merge pull request #1576 from ThatOtherPerson/fix-misnaming
...
Renamed sendUnauthorizedUser to sendForbiddenError
2014-09-19 08:19:42 -07:00
Nick Winter
40227e32e5
Merge branch 'ThatOtherPerson-unpublished_playable'
2014-09-19 08:17:41 -07:00
Nick Winter
d610b1633f
A bit more CoffeeScripty on the style. Fixes #1558 .
2014-09-19 08:17:30 -07:00
Nick Winter
c2d81c3f32
Merge branch 'unpublished_playable' of git://github.com/ThatOtherPerson/codecombat into ThatOtherPerson-unpublished_playable
2014-09-19 08:12:20 -07:00
Nick Winter
6a5f8b810b
Fixed an issue with infinite loops polling workers who weren't working.
2014-09-19 08:11:08 -07:00
David Beckley
527c1ed79d
Fix issue #8
2014-09-19 03:52:34 -07:00
David Beckley
b9a511155e
Remove sendUnauthorizedError, as it merely returned the same value (HTTP 403) as sendForbiddenError
2014-09-19 02:26:18 -07:00
Nick Winter
121ff0a4af
Fixed a couple issues with DOM highlight pointer; removed the noise for now. Minor tweaks to the world map view; hiding the items for non-admins for now.
2014-09-18 18:25:33 -07:00
Nick Winter
791c23c7e7
Fixed #1573 .
2014-09-18 16:39:50 -07:00
Nick Winter
8042f27ba7
Added the rest of the custom TreemaNodes to the SystemsTabView as well.
2014-09-18 15:26:06 -07:00
Nick Winter
8e17a54dc3
Fixed not being able to add properties in the Systems tab Treemas.
2014-09-18 15:13:17 -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
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
Matt Lott
3209e4f838
Add loop statement to JavaScript and Python
2014-09-18 09:47:29 -07:00
Scott Erickson
63758acd2e
Fixed some tests when run on karma.
2014-09-18 09:46:02 -07:00
Scott Erickson
f77f229b09
Fixed rotation not being updated after a new SpriteSheet is built.
2014-09-18 09:03:33 -07:00
Nick Winter
d26548cf20
Merge branch 'master' into production
2014-09-18 08:13:15 -07:00
Nick Winter
5ddbbe7707
Fixed a bug with spectate not loading opponent code language. Improved Criss-Cross winners formatting.
2014-09-18 08:12:46 -07:00
Nick Winter
dca6eb6f11
Merge branch 'master' into production
2014-09-17 22:37:44 -07:00
Nick Winter
689a4241d4
Final Criss-Cross tournament results.
2014-09-17 22:37:34 -07:00
Nick Winter
95e37fa3b2
Starting new front view (at /front for now) and play view (at /play-hero for now).
2014-09-17 18:56:08 -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
