14281 commits

Author	SHA1	Message	Date
Seth Alves	2d804555de	minor cleanups	2015-12-03 08:59:15 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	33b859df33	Merge pull request #6416 from kencooke/audio-reverb ... New reverb	2015-12-02 11:22:12 -08:00
Ken Cooke	fbd7549430	Better reverb script defaults	2015-12-02 11:05:06 -08:00
Brad Hefta-Gaub	112cdaf028	Merge pull request #6512 from AndrewMeadows/remove-debug-cruft ... remove debug option for disabling physics updates	2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub	75a57c3cb8	Merge pull request #6500 from Atlante45/octree_crash ... Octree crash fix	2015-12-02 09:59:56 -08:00
Ken Cooke	f005afd7c0	Fix stdint.h includes	2015-12-02 09:33:47 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Brad Davis	9b6ec34f09	Fixing avatar orientation in recordings	2015-12-01 20:51:07 -08:00
James B. Pollack	52d6fdac1a	Merge pull request #6487 from ctrlaltdavid/20740 ... Get the Leap Motion working again	2015-12-01 15:40:48 -08:00
Seth Alves	b8d800f5b8	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-01 11:59:10 -08:00
Howard Stearns	ef32853d46	When AvatarData parses the .fst, store the (merged) .fbx filename. ... (Interface gets the .fbx by a separate path, but agents don't have that chance.)	2015-12-01 11:51:22 -08:00
Andrew Meadows	ab6367ff4e	remove debug option for disabling physics updates	2015-12-01 11:13:01 -08:00
Stephen Birarda	7dbf29821a	don't persist the octree if it never loaded	2015-12-01 10:00:25 -08:00
Ken Cooke	a725c8b12e	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb	2015-12-01 09:12:24 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	3402585d1a	fix a crash from previous commit	2015-11-30 16:54:29 -08:00
Howard Stearns	6f50d91208	Merge pull request #6461 from hyperlogic/tony/remove-joint-states ... Refactor of Rig and MyAvatar animation JavaScript interface	2015-11-30 16:28:15 -08:00
Seth Alves	9b54924524	edit.js can now manipulate children without flipping the table	2015-11-30 16:21:14 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Seth Alves	02c4730388	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 14:09:31 -08:00
Anthony J. Thibault	e2d9e37eb8	Fix for head offset for models with no eyes ... This was causing in correct body poses while wearing an HMD.	2015-11-30 14:08:21 -08:00
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Seth Alves	941dfe5bd2	initialize _parentJointIndex	2015-11-30 13:30:47 -08:00
Seth Alves	4b87e09848	clean up some unneeded consts. get edit.js closer to working on parented entities	2015-11-30 13:23:55 -08:00
Atlante45	5019f79947	Fix header name	2015-11-30 11:48:34 -08:00
Anthony J. Thibault	11bfed4185	Merge branch 'master' into tony/remove-joint-states	2015-11-30 11:21:44 -08:00
James B. Pollack	85b8266537	Merge pull request #6494 from ctrlaltdavid/20744 ... Fix menu shortcuts created in JavaScript not working	2015-11-30 11:20:10 -08:00
Seth Alves	081174fe69	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 10:18:01 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Seth Alves	4add3e2e91	rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space	2015-11-30 09:41:15 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
David Rowe	d6b13ef42c	Fix crash when try to remove invalid menu item in JavaScript	2015-11-30 08:33:38 +13:00
Seth Alves	204c3d839e	added localToWorld calls, put locks around access to _children hashtable	2015-11-29 10:17:21 -08:00
Seth Alves	eb50c9de5f	aabox delivered to scripts in properties should be in world space	2015-11-29 10:16:56 -08:00
Seth Alves	facf91faac	minimize diff vs master	2015-11-26 07:13:43 -08:00
Seth Alves	6062691c2a	minimize diff vs master	2015-11-26 07:04:27 -08:00
Seth Alves	10cf85bad9	fix some rotation handling in EntityItem, minimize diff vs master	2015-11-26 07:02:53 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Ken Cooke	a5b64473af	Fix bugs	2015-11-25 16:15:04 -08:00
Anthony J. Thibault	7c9cb97783	Merge branch 'master' into tony/remove-joint-states	2015-11-25 15:48:51 -08:00
Andrew Meadows	527408c7c1	Merge pull request #6292 from huffman/physics-continuous-collision-detection ... Physics continuous collision detection	2015-11-25 15:45:18 -08:00
Atlante45	cd2e610e17	Remove OctreeElement's UpdateHooks	2015-11-25 15:35:15 -08:00
Anthony J. Thibault	5072339a22	Warning fix	2015-11-25 14:04:01 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Anthony J. Thibault	2a9adafc09	Bumped avatar packet version number	2015-11-25 12:13:40 -08:00
Anthony J. Thibault	97a2eb62d4	Fix for incorrect avatar bounds after changing avatars	2015-11-25 12:06:50 -08:00