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
6bd6b2eea2
Tweaked when and how we shift the bounds of imported sprites. For things like Anya, especially Anya's attack, it wasn't working correctly.
2014-10-02 16:54:58 -07:00
Nick Winter
abf28c2c19
Fixed bug with world deserialization missing state batches.
2014-10-02 15:33:23 -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
adbfa42f25
Merge branch 'master' into feature/webgl
2014-09-30 10:27:26 -07:00
Matt Lott
405c21cba4
Clean up sync world running GoalManager creation
2014-09-30 10:15:33 -07:00
Matt Lott
8f85e37713
Fix for main thread GoalManager creation
...
Using @shared.goalManager.constructor was yielding an incomplete
GoalManager in IE9.
Also fixing up console.debug in CocoModel for IE10 and earlier.
2014-09-29 17:31:58 -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
Matt Lott
136af8a0b4
Fixes for world simulation without Web Workers
...
Primarily for IE9, which is still blocked by box2d issues with these
changes.
Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.
Work in progress.
2014-09-28 23:24:18 -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
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
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
Nick Winter
68bb1dc135
Sped up "real-time" playback for the maze levels.
2014-09-25 11:17:04 -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
Nick Winter
c1023b137f
Better pointing out of submit button when victory is ready.
2014-09-23 18:21:27 -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
00e2fc99a2
Fixed some issues with the sample code.
2014-09-23 08:58:23 -07:00
Nick Winter
f3511a5dde
Fixed another bug with loading heroes between levels.
2014-09-22 23:01:19 -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
1b4e75e7e8
Fix for earned achievement default null worths. Misc other fixes.
2014-09-22 20:15:51 -07:00
Nick Winter
de85d8c170
Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion.
2014-09-22 14:05:13 -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
600e985259
Removed Wizards from hero levels. Fixed issues with GameMenuModal width and swapping of hero config. No need to click start with ?dev=true. Hero is always selected in hero levels. GameMenuModal shows up while loading if no heroConfig is detected.
2014-09-21 20:19:27 -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
Nick Winter
ae14bd1ced
Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564 .
2014-09-20 15:18:21 -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
keenanjohnson
bb8f5c41ba
#53 Adding more names
2014-09-19 13:25:48 -05:00
Nick Winter
6a5f8b810b
Fixed an issue with infinite loops polling workers who weren't working.
2014-09-19 08:11:08 -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
Matt Lott
3209e4f838
Add loop statement to JavaScript and Python
2014-09-18 09:47:29 -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
0a29a374e1
Changed the way numbering works on collect goals.
2014-09-15 17:01:34 -07:00
Nick Winter
925588dfc2
Extended team-based goal completion to collection and leaving sides goal types.
2014-09-15 16:49:08 -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
f53f6bf0a3
Misc changes, wishing I could get sounds to work at lower volumes.
2014-09-10 19:55:00 -07:00
Nick Winter
1bd1ca0ced
Fixed #1530 . Propagated i18n. Starting to add some more events for the iOS app.
2014-09-07 20:54:25 -07:00
Nick Winter
df131ca90a
Merge pull request #1519 from keenanjohnson/master
...
Added Potion Master names for #53
2014-09-06 19:55:02 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
keenanjohnson
d79fc4c62f
Added Potion Master names for #53
2014-09-05 20:18:05 -05: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
Scott Erickson
1094487072
Fixed #1511
2014-09-03 17:47:29 -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
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
Nick Winter
b7d9e7a095
Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs.
2014-09-01 20:07:50 -07:00
Nick Winter
72eb59b7c3
Fixed a few bugs.
2014-09-01 16:14:50 -07:00
Nick Winter
195e027b53
Fix for null/undefined objects in the diffs.
2014-09-01 14:27:47 -07:00
Nick Winter
6df5ca00b2
Fixed #69 .
2014-09-01 13:51:30 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -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
Nick Winter
a8644d030e
Fixed #1355 .
2014-08-30 14:30:53 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -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
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Nick Winter
f74a152942
Fixed #1104 .
2014-08-28 18:55:33 -07:00
Scott Erickson
9406a8c920
Merge branch 'master' into feature/defaults
2014-08-28 17:58:58 -07:00
Nick Winter
e67b4ae064
Fixed #1090 .
2014-08-28 17:08:05 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -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
Nick Winter
0fa5d264f4
Fixed #1072 by raising selection state so that we can see it if we're selecting an obstacle.
2014-08-28 14:25:37 -07:00
Nick Winter
f79a2848fd
Fixed #1038 . Focus should now remain on code editor when after clicking on Surface.
2014-08-28 14:00:54 -07:00
Nick Winter
1094d09aa5
Fixed #1226 . Fixed #1156 . Fixed two other issues with spectate mode.
2014-08-28 11:23:52 -07:00
Nick Winter
d7ae07c012
Fixed Facebook login bug.
2014-08-28 11:16:55 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
ec6b3d7e5f
Fixed #1481 . More Mediator schema fixes.
2014-08-28 09:27:42 -07:00
Nick Winter
cd3bf4d0db
Fixed a few bugs.
2014-08-27 18:05:18 -07:00
Nick Winter
92b29915e2
Finished fixing #841 .
2014-08-27 17:26:56 -07:00
Nick Winter
3f16aaab61
Fixed a few more Backbone Mediator event validation issues.
2014-08-27 16:31:44 -07:00
Nick Winter
ee9e453896
Fixed #828 . Added many other minor refactorings.
2014-08-27 12:24:11 -07:00
Scott Erickson
ac2c39a266
Fixed an infinite loop bug in CoordinateGrid.
2014-08-27 09:49:37 -07:00
Nick Winter
6ff01f7deb
Fixed #814 .
2014-08-26 18:11:35 -07:00
Scott Erickson
5d804c6d9a
Fixed merge conflict.
2014-08-26 15:41:59 -07:00
Nick Winter
a5c18a4140
Fixed #453 .
2014-08-26 15:22:13 -07:00
Nick Winter
7300c4b3b8
Finished removing grid from playback options menu.
2014-08-26 14:00:03 -07:00
Nick Winter
35b107cf58
Refactored grid. Fixed #158 .
2014-08-26 13:56:57 -07:00
Nick Winter
3e9adf6b1a
Fixed issue with IndieSprites no longer coloring properly.
2014-08-26 12:39:30 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Nick Winter
898bb69477
Added missing Countdown Screen file.
2014-08-26 08:18:06 -07:00
Nick Winter
e666ee1dac
Added stop playback button and real-time countdown screen.
2014-08-25 22:05:30 -07:00
Scott Erickson
1406a970ea
Bunch of fixes to get the level editor working again.
2014-08-25 20:34:46 -07:00
Nick Winter
6fb0073eae
Fixed harmless Wizard startup animation error.
2014-08-25 16:15:34 -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
Nick Winter
9df0cfb93f
A few changes to flags UX.
2014-08-25 14:02:23 -07:00
Scott Erickson
d392994a83
Merge branch 'master' into feature/defaults
2014-08-25 13:00:33 -07:00
Nick Winter
718d586f07
A ton of misc bug fixes and performance improvements, getting ready to merge world streaming and flags back in.
2014-08-24 21:39:34 -07:00
Nick Winter
1a7e4554f0
Fixed a few minor bugs.
2014-08-24 16:48:59 -07:00
Nick Winter
3125c2b129
Add flag cursor and pending flags.
2014-08-24 16:09:06 -07:00
Nick Winter
f44d802934
Fixed a couple bugs. Flags are now colored.
2014-08-24 12:33:46 -07:00
Nick Winter
be07f9cfb9
Many improvements to real-time streaming and flags.
2014-08-23 22:24:00 -07:00
Nick Winter
2dca4d72fc
Rudimentary flag buttons are in.
2014-08-23 19:00:35 -07:00
Nick Winter
f59084e651
Sending flag history to the World for to make flag Thangs during simulation.
2014-08-23 17:26:56 -07:00
Scott Erickson
0721b49216
Refactoring defaults.
2014-08-23 15:51:59 -07:00
Nick Winter
c79541f669
Full-screen playback during real-time mode.
2014-08-23 13:54:52 -07:00
Nick Winter
f2adb7ec7f
Skipping serialization/deserialization of needless Programmable clones.
2014-08-23 11:16:02 -07:00
Nick Winter
0431f70954
Improved Surface playback fast-forwarding.
2014-08-23 09:52:05 -07:00
Nick Winter
9c0869e566
Press Ctrl+Shift+Enter to cast in real-time, and click on the ground to use your wizard as a flag. OMG, it not only works, but it is really fun!
2014-08-22 21:35:08 -07:00
Nick Winter
6fee881efd
Fixed a few more issues with playback.
2014-08-22 17:11:40 -07:00
Nick Winter
ee41796b73
Fixed some wonkiness with the playback scrubbing while streaming worlds.
2014-08-22 15:32:23 -07:00
Nick Winter
92f0a68dd1
World streaming is getting there!
2014-08-22 14:59:32 -07:00
Nick Winter
611ecbf470
Fixed many issues with world streaming.
2014-08-22 12:39:29 -07:00
Nick Winter
9b31e28536
More improvements to world streaming.
2014-08-21 21:23:45 -07:00
Nick Winter
bd380e4a09
World streaming is starting to work!
2014-08-21 17:30:46 -07:00
Nick Winter
d55afa77b7
Began streaming a mighty stream.
2014-08-21 16:27:52 -07:00
Nick Winter
3755cb9d66
Fixed some bugs with sprite layer ordering.
2014-08-20 18:57:33 -07:00
Nick Winter
28176c7f72
Misc workarounds.
2014-08-20 13:26:48 -07:00
Nick Winter
df7f1b2b9b
Now have 'free' rotationType, equivalent to previous default of undefined.
2014-08-19 22:33:33 -07:00
Nick Winter
def4d01c8e
Starting to let us control the size of the achievements popup, although much more Sass math is needed.
2014-08-19 19:21:36 -07:00
Nick Winter
91db8397a0
Fixed problem with loading levels with no Programmable Thanags, and fixed infinite loops while simulating single games when swapping out Simulators.
2014-08-19 08:09:15 -07:00
Nick Winter
2c6fc67db2
Some simulation and ladder fixes. Preparing Criss-Cross tournament.
2014-08-18 21:49:58 -07:00
Nick Winter
2588ec67ff
Fix for buildLoop still trying to loop after LevelLoader destruction for some reason.
2014-08-18 14:09:28 -07:00
Nick Winter
8ca9374de0
Zoom-aware, ratio-based edge avoidance (polish for #1448 ).
2014-08-18 14:08:54 -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
Pete DiSalvo
a011f118e3
Added CoordinateDisplay edge detection. Doesn't account for camera zoom.
2014-08-16 18:51:47 -04:00
Pete DiSalvo
eed68c0a1c
Working orientation. Doesn't account for camera zoom
2014-08-16 18:30:41 -04:00
Pete DiSalvo
31e609c0c8
Added edge detection to camera, and worked on orientations
2014-08-16 18:30:41 -04:00
Pete DiSalvo
dc7529344c
Working on orientation
2014-08-16 18:30:41 -04:00
Pete DiSalvo
8f6d162542
Beginning work on edge detection
2014-08-16 18:30:41 -04:00
Nick Winter
5f20e6f05e
Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet.
2014-08-15 12:09:56 -07:00
Ruben Vereecken
40818fd7bc
GitHub Login implemented
2014-08-15 16:20:45 +02:00
Nick Winter
69c22db434
Moved Hero Placeholder replacement logic to Level's denormalizeThang.
2014-08-14 16:35:03 -07:00
Nick Winter
0f983bdcf1
Crude steps towards using your hero equipment in items levels.
2014-08-14 15:12:15 -07:00
Nick Winter
7286d069a0
Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.
2014-08-14 10:28:50 -07:00
Nick Winter
652d47fb81
Merge pull request #1432 from jayant1992/undo-redo
...
Undo redo descriptions
2014-08-14 09:58:28 -07:00
Ruben Vereecken
3fd396974d
Merge branch 'master' into achievements
...
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
2014-08-13 10:43:42 +02:00
Jayant Jain
76c784b1de
Adds default scripts whenever a new level is created
2014-08-13 12:11:37 +05:30
Nick Winter
4cc79e985e
A few fixes for adding items to inventories in ThangTypes.
2014-08-11 17:09:44 -07:00
Nick Winter
9a5cd22069
Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels.
2014-08-11 16:15:46 -07:00
Nick Winter
31d7e641e6
Fixes for equipping items and adding them to the World.
2014-08-11 11:04:38 -07:00
Nick Winter
cf7e2042c9
Got bitten by another case of #1108 .
2014-08-11 10:02:39 -07:00
Nick Winter
706ab7a251
Trying to get item ThangType nodes and inventory loading working.
2014-08-10 22:09:13 -07:00
Ruben Vereecken
e6569539dc
User page now uses the supermodel for user loading
2014-08-08 19:26:24 +02:00
Ruben Vereecken
47f00f9b5e
Added achievement deleting and automatic achievement filling
2014-08-08 17:20:07 +02:00
Ruben Vereecken
3bfd341363
Goal states are now tracked in level sessions (state.goalStates)
2014-08-08 13:10:31 +02:00
Scott Erickson
94ca62f4c5
Fixed a bug I added in some minor final changes.
2014-08-07 18:48:30 -07:00
Scott Erickson
cc025942f8
Extended the LevelLoader to load thang types and components dynamically for hero levels.
2014-08-07 18:27:47 -07:00
Scott Erickson
0c5364eebb
Removed editorMode.
2014-08-07 14:22:43 -07:00
Nick Winter
4d4e321265
Fixed #1062 . Added Item kind to level editor Thang filters.
2014-08-06 08:24:50 -07:00
Nick Winter
852dabc17a
Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance.
2014-08-06 07:43:56 -07:00
Nick Winter
74283bafed
Made sure items equip themselves within the SpriteBoss, too.
2014-08-05 21:47:51 -07:00
Ruben Vereecken
5d66560673
Merge remote-tracking branch 'upstream/master' into achievements_progress
...
Conflicts:
app/views/editor/level/LevelEditView.coffee
server/levels/sessions/LevelSession.coffee
2014-08-05 11:55:46 +02:00
Ruben Vereecken
c165d46e17
Fixed missing errors bug
2014-08-04 20:02:26 +02:00
Ruben Vereecken
6267352c6e
Drastically changed the way achievements get grayscaled
2014-08-04 15:29:46 +02:00
Ruben Vereecken
30a6cf1cca
Merged in name changes from master
2014-07-29 17:28:13 +02:00
Michael Schmatz
c4e3044a81
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d
Merge branch 'pr/1383'
...
Conflicts:
app/views/play/level/tome/SpellListTabEntryView.coffee
2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07:00
Scott Erickson
1c3404d03e
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
2014-07-23 07:02:45 -07:00
Dominik Kundel
9cb704a843
last fix for dimming the editor
2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6
disabled editor works again
2014-07-23 14:38:12 +02:00
Ruben Vereecken
972d231ff5
Refactored router and views to anticipate the renameViews feature
2014-07-21 19:49:16 +02:00
Ruben Vereecken
1c6da9711b
Added the Recently Played collection and endpoint
2014-07-21 14:36:10 +02:00
Nick Winter
99e1a8b30a
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
...
Changed point marker to crosshair, made it bigger, and changed color to white
2014-07-20 16:04:29 -07:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed
Changed point marker to crosshair, and changed color to white
2014-07-19 20:12:56 -04:00
Scott Erickson
97964f7853
More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.
2014-07-18 17:06:20 -07:00
Scott Erickson
0e042ee61c
Refactoring View to RootView. Refactoring some RootViews to be routed manually.
2014-07-17 17:16:32 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Nick Winter
42af807e5c
Merged in geometry work from #51 .
2014-07-16 16:01:37 -07:00
nemoyatpeace
f17112ecf8
Minor adjustment to the aoe script
2014-07-17 00:53:52 +08:00
Nick Winter
085951fa4a
Removed more counselor stuff.
2014-07-16 07:47:41 -07:00
Nick Winter
03cc2d1af0
Fixed Grass01-Grass05 scaling issues.
2014-07-15 18:08:00 -07:00
Scott Erickson
fb83028d87
Added watchers to list of properties to skip in deltas/patches.
2014-07-15 11:23:35 -07:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Ruben Vereecken
40ba28f49b
Basics for account and user home pages
2014-07-15 16:15:21 +02:00
Nick Winter
b3e8eb8504
Working on something for #1327 .
2014-07-14 19:32:35 -07:00
Nick Winter
7b39bd06f3
Fixed #1321 .
2014-07-14 17:54:32 -07:00
Scott Erickson
9d22a35194
Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat
2014-07-14 15:13:52 -07:00
Nick Winter
23dc8d2947
Removed a bad log.
2014-07-14 11:21:03 -07:00
Ruben Vereecken
e748417007
GET /auth/name/<name> now serves possible free names
...
anonymous users are now warned if their new name is already chosen
User Settings is now without auto-save
Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.
Refactored conflicted name checking so it can be used in more places
Signup form now has an optional name field
Covered extra case where the debounced check happened too late. Support for submitting on enter.
Worked in scott's comments and got tests working again
2014-07-14 20:07:58 +02:00
Nick Winter
d7586025d9
Improved behavior of lint/runtime/transpilation problem error alert showing when not in JS mode.
2014-07-14 11:05:59 -07:00
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Ruben Vereecken
d261f888d7
Refactored profile view to be a userView. Would still like to test remarks though
2014-07-14 12:18:28 +02:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Nick Winter
b1b9f87ebe
Fixed root test view URL to not need the trailing slash.
2014-07-13 17:34:51 -07:00
Nick Winter
f92b29a4a3
Added rotate to Vector APIs.
2014-07-13 17:25:24 -07:00
Nick Winter
daff7a2640
Merge pull request #1314 from TheSecretSquad/issue#1213
...
Added point marker shape, and split updateSize method into helpers.
2014-07-13 17:08:11 -07:00
Nick Winter
6eea28dc19
Error handling for syntax errors in component code.
2014-07-13 16:40:03 -07:00
Pete DiSalvo
ffb8f9575e
Added point marker shape, and split updateSize method into helpers.
2014-07-13 19:31:34 -04:00
Ruben Vereecken
9db84befa6
Set up a 301 Redirect for account/profile instead of a backbone redirect
2014-07-13 22:34:32 +02:00
Scott Erickson
ebfb329da7
Fixed a bug where pressing escape would not properly end scripts in the session state.
2014-07-13 13:11:45 -07:00
Scott Erickson
3b6d17286b
Small tweak to lower the number of repeated calls to SpriteBoss.updateSounds.
2014-07-13 12:19:51 -07:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Scott Erickson
843ed97643
Another fix for mongoose i18n locale object hack.
2014-07-13 10:05:58 -07:00
Nick Winter
89dc724d31
Merge pull request #1298 from TheSecretSquad/issue#1213CoordinateDisplay
...
Centered CoordinateDisplay background and label
2014-07-11 20:48:53 -07:00
Pete DiSalvo
e3183650c5
Centered CoordinateDisplay background and label
2014-07-11 22:10:13 -04:00
Nick Winter
17ba4bc8a7
Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter.
2014-07-11 18:07:00 -07:00
Nick Winter
3d5cd29519
Removed some logging.
2014-07-10 17:35:59 -07:00
Nick Winter
f17e24013b
Fixed #1217 (scaleFactor, debug shapes).
2014-07-10 14:22:15 -07:00
Scott Erickson
a3c524424c
Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users
2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f
Fixed some schema issues related to snippets and code languages.
2014-07-10 08:31:40 -07:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Ruben Vereecken
b065a524c1
Got down the basic layout for achievement overview
...
Achievement style is now compatible between overview and popup
2014-07-09 15:06:47 +02:00
Nick Winter
c19a31a58c
Fixed some wizard positioning issues in multiplayer.
2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03
Working on flippable tile highlight bounds marks.
2014-07-08 16:43:36 -07:00
Scott Erickson
c1f77e3f07
Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch
2014-07-07 18:48:26 -07:00
Scott Erickson
49c8360d5b
Fixed me emitting 'me:synced' and anything listening for that.
2014-07-07 16:53:34 -07:00
Scott Erickson
aea1d0e8f2
Changed the angel logigng to use info instead of log, to more easily differentiate.
2014-07-06 15:01:39 -07:00
Ruben Vereecken
e33bb44ffc
Start of new user routing and views are there
2014-07-06 20:45:27 +02:00
Ruben Vereecken
51bc8e5a7c
Merged master
2014-07-06 20:07:47 +02:00
Ruben Vereecken
1f02b99942
Refactored showNotFound into notFoundView
2014-07-06 20:01:47 +02:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Scott Erickson
41a8d21bfe
Merged conflicts.
2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af
Merged conflicts.
2014-07-04 18:11:26 -07:00
Scott Erickson
eed521fb8c
Merged conflicts.
2014-07-04 17:54:30 -07:00
Scott Erickson
85a6b648a5
Merged conflicts.
2014-07-04 17:54:24 -07:00
Scott Erickson
4e284d81b7
Handled conflicts, throwing out changes to ladder_tab.coffee.
2014-07-04 17:36:10 -07:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b
All edits are now tracked
...
intermediate
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
a933f9737d
Creating achievement demo
...
intermediate
2014-07-04 19:27:37 +02:00