925 commits

Author	SHA1	Message	Date
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	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