Nick Winter
66c728210b
Fixing flag coloring in new WebGL rendering.
2014-10-18 18:18:12 -07:00
Nick Winter
56a80e3615
Started getting hero-ladder level type working.
2014-10-18 14:51:49 -07:00
Nick Winter
2491861d76
A few tweaks for the iPad app.
2014-10-01 22:02:52 -07:00
Scott Erickson
adbfa42f25
Merge branch 'master' into feature/webgl
2014-09-30 10:27:26 -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
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
Nick Winter
cf9cf6f98b
Stopped locking levels for now, since the achievements aren't quite unlocking them correctly.
2014-09-26 03:52:57 -07:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
Scott Erickson
06b106f42b
Merged from master.
2014-09-25 10:52:27 -07:00
Nick Winter
c0c436189f
Better preserving supermodel when navigating between new hero levels. Fixed a problem with garbage collection of large CocoModel error callbacks.
2014-09-25 00:02:53 -07:00
Nick Winter
ec548fa33a
AUto-assigning leather boots starting at mazes. Fixed issue with stat display comparison.
2014-09-22 16:09:27 -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
0d495ba36e
Press Start to begin playing levels. Fixed #1574 .
2014-09-21 14:35:59 -07:00
Nick Winter
2872de71ce
Fixed a bug with hero placeholder loading. Improved game menu modal close button usability.
2014-09-21 13:26:56 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Scott Erickson
63758acd2e
Fixed some tests when run on karma.
2014-09-18 09:46:02 -07:00
Scott Erickson
5af1741333
Merged conflicts.
2014-09-17 16:53:08 -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
c3573b2fbd
Adding more error handling for George's inventory saving problems.
2014-09-16 15:22:49 -07:00
Nick Winter
5f1e9e7e4b
Made Plans attach second-to-last always.
2014-09-15 14:06:26 -07:00
Scott Erickson
8e401d6853
Merge branch 'master' into feature/webgl
2014-09-15 13:53:58 -07:00
Nick Winter
589268dc4f
Fixes for initializing Hero Placeholder Components.
2014-09-15 13:15:18 -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
dd2cdf3ef9
Fixed bugs with forking ThangTypes.
2014-09-08 16:03:29 -07:00
Nick Winter
c64c391d74
Workaround for missing document.location inside child window in Windows Chrome.
2014-09-08 14:31:52 -07:00
Nick Winter
2f07c3e8d3
Adding communication with iPad app.
2014-09-06 19:50:31 -07:00
Nick Winter
8c45e22741
Protection and logging for #1463 . Fixed an issue with spectate camera script bounds.
2014-09-04 11:04:23 -07:00
Nick Winter
b1de5e0045
Fixed bug with hero levels not loading inventory. (Might not be in line with the performance that 975c6a was going for.)
2014-09-03 19:19:04 -07:00
Nick Winter
6b6c8dd683
Merged master into feature/realtime-multiplayer; looks good.
2014-09-03 16:14:33 -07:00
Scott Erickson
e1abf115f7
Folderizing thang types in the level editor.
2014-09-03 12:30:08 -07:00
Nick Winter
c1a7b70849
Missed committing part of previous fix.
2014-09-03 10:58:43 -07:00
Scott Erickson
975c6ad2a6
Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid.
2014-09-03 09:33:21 -07:00
Nick Winter
681cc4656f
Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging.
2014-09-02 18:28:02 -07:00
Scott Erickson
4a100a501a
Fixed a bug with new levels in the level editor.
2014-09-02 17:53:39 -07:00
Nick Winter
5b0e996f93
Think I may have fixed the color group setting issue again.
2014-09-02 17:46:52 -07:00
Nick Winter
fa0f904fbb
Fixed a couple bugs with Achievements not getting schema defaults.
2014-09-02 16:48:16 -07:00
Scott Erickson
7e627277e1
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-09-02 12:33:50 -07:00
Scott Erickson
b521aee322
Optimized level serialization a little so that level editing is a bit less painful.
2014-09-02 12:33:34 -07:00
Nick Winter
4b9bf22e22
Thang editor now sets some default Components when you change the kind of a ThangType.
2014-09-02 11:29:33 -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
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
1329d31a63
Hot-swapping inventory works now.
2014-08-31 16:05:20 -07:00
Nick Winter
9b2ee45a4d
Added DPS to item view.
2014-08-31 12:27:52 -07:00
Nick Winter
ef9a983e30
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
2014-08-31 12:21:25 -07:00
Nick Winter
85a9a558ef
Fixed #1329 .
2014-08-30 13:43:56 -07:00
Nick Winter
051f1a77ae
Fixed #1152 .
2014-08-30 09:19:41 -07:00
Matt Lott
437ab0feb2
PVP waiting screen in real-time view
2014-08-29 21:46:26 -07:00
