George Saines
|
ee88c0870e
|
pushing my fix
|
2014-10-13 16:24:54 -07:00 |
|
George Saines
|
6350debf26
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-10-13 15:51:48 -07:00 |
|
Nick Winter
|
f80380784a
|
Levels save right away on victory.
|
2014-10-10 19:20:00 -07:00 |
|
George Saines
|
3927371427
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-10-10 16:55:12 -07:00 |
|
George Saines
|
95afb6c4d3
|
playing with FPS
|
2014-10-10 16:55:09 -07:00 |
|
Nick Winter
|
f9409488ff
|
Fixed a bug with jerky camera udpates due to dropped frames and camera updating before positions update. Fleshed out default level scripts. Tweaked style on Dropper code.
|
2014-10-08 12:38:23 -07:00 |
|
Nick Winter
|
589c3b090c
|
Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map.
|
2014-10-08 10:46:10 -07:00 |
|
Nick Winter
|
c6b398aae2
|
Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure.
|
2014-10-08 09:46:56 -07:00 |
|
Nick Winter
|
8fdd2c0688
|
Redid my bobbing fix b286b24 in a way that doesn't break the LankBoss position test.
|
2014-10-06 18:18:39 -07:00 |
|
Nick Winter
|
b286b24f27
|
Fixed bobbing. Increased LayerAdapter cleanup vengeancy. Allow dragging without snapping when playback is at the end.
|
2014-10-06 15:04:42 -07:00 |
|
Scott Erickson
|
b78c91997c
|
Tweaked associating lanks with layers.
|
2014-10-03 12:06:04 -07:00 |
|
Scott Erickson
|
e504932e5e
|
Added yet another fine tuning of camera movement in the level editor.
|
2014-10-03 11:54:06 -07:00 |
|
Scott Erickson
|
cc04626a5a
|
Fixed walls not updating when you edit them in the ThangsTabView.
|
2014-10-03 11:21:05 -07:00 |
|
Scott Erickson
|
d65ade7a97
|
Couple teardown fixes.
|
2014-10-03 10:44:02 -07:00 |
|
Scott Erickson
|
ca9c387964
|
Fixed singular sprite animations frame ordering.
|
2014-10-03 09:51:07 -07:00 |
|
Scott Erickson
|
67bd01b397
|
Fixed a bug where SegmentedSprite would sometimes error out (particularly the door on death).
|
2014-10-03 09:36:47 -07:00 |
|
Scott Erickson
|
64acbe4580
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-10-03 09:11:12 -07:00 |
|
Scott Erickson
|
d02d58ed4e
|
Improved the LayerAdapter to more accurately adjust its size downward if it renders a spritesheet, handle when a single thang is too large, and cancels in-progress async builds if a new one starts.
|
2014-10-02 17:38:50 -07:00 |
|
Nick Winter
|
3cdb8ff416
|
Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map.
|
2014-10-02 17:21:06 -07:00 |
|
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 |
|
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 |
|
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 |
|