1877 commits

Author	SHA1	Message	Date
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Seth Alves	bfab522ee7	debuging render mode	2015-04-01 17:52:30 -07:00
Andrew Meadows	7fb9427f29	Merge pull request #4549 from jherico/dbg_macro ... Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 17:08:12 -07:00
Brad Hefta-Gaub	d77333953e	Merge pull request #4552 from sethalves/island ... Fix various collision-model related bugs	2015-03-31 15:47:53 -07:00
Seth Alves	55d506bb53	formatting	2015-03-31 14:04:49 -07:00
Bradley Austin Davis	02b69f4a70	Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 13:32:13 -07:00
Brad Hefta-Gaub	e27a89b7c3	Merge pull request #4539 from birarda/settings-thread-delete-later ... fix for cleanup of SettingsManager thread	2015-03-31 13:09:06 -07:00
Seth Alves	52fc75a114	merge upstream	2015-03-31 07:18:04 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI ... Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Stephen Birarda	7d5b8c430a	remove extra added space	2015-03-30 18:06:51 -07:00
Stephen Birarda	b7174b5170	fix for cleanup of SettingsManager thread	2015-03-30 18:03:18 -07:00
Seth Alves	071b6a21de	Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs	2015-03-30 13:44:39 -07:00
Andrew Meadows	10af59296d	Merge pull request #4499 from sethalves/multi-hull-collisions ... Multi hull collisions	2015-03-30 12:11:56 -07:00
Seth Alves	26230cf493	uninitialized variable (quiet valgrind)	2015-03-29 05:40:39 -07:00
ZappoMan	baa2f947e5	classifying FSTReader and moving ModelType into that class	2015-03-27 16:30:00 -07:00
Seth Alves	0d4b0ad11e	Merge branch 'multi-hull-collisions' of github.com:sethalves/hifi into vhacd-knobs	2015-03-26 06:37:35 -07:00
Seth Alves	dd9290bd59	clear points for non-hull shapes	2015-03-25 15:21:28 -07:00
Seth Alves	c68f5dd1fa	added various controls for the convex hull generator	2015-03-25 15:13:40 -07:00
Seth Alves	c8ad82917e	clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation	2015-03-23 16:54:36 -07:00
Seth Alves	bfc5cf99d6	more code for compound hull collisions	2015-03-21 16:11:47 -07:00
Seth Alves	769194f046	first stab at compound hull collisions	2015-03-20 13:41:14 -07:00
Brad Davis	7079b5f978	type & squish again	2015-03-19 17:29:57 -07:00
Brad Davis	bf607e4c9c	Fixing indentation and usage	2015-03-19 15:53:16 -07:00
Brad Davis	2552afffe7	Merge branch 'master' into avatar	2015-03-19 09:47:36 -07:00
Andrew Meadows	c032b29633	proper shape management for ConvexHull shapes	2015-03-18 16:29:57 -07:00
Brad Davis	160f666d89	Merge branch 'master' into avatar	2015-03-18 12:55:56 -07:00
Andrew Meadows	517b2648ca	Merge pull request #4465 from sethalves/avatars-can-collide ... One convex hull shape for models that provide decomposition data.	2015-03-18 12:52:52 -07:00
Seth Alves	2dd75fef2c	remove some unneeded Q_OBJECT macros, diff minimization	2015-03-17 19:12:26 -07:00
Seth Alves	222c3f01eb	minor cleanups, diff minimization	2015-03-17 14:24:46 -07:00
Seth Alves	5475e76516	merge from upstream	2015-03-17 14:16:00 -07:00
Brad Davis	6415ff99f6	Work in progress	2015-03-17 12:04:04 -07:00
Brad Davis	80b5a44cc4	Adding a RAII version of the mutex locker that uses tryLock instead of lock	2015-03-17 11:49:17 -07:00
Seth Alves	bed37ef49a	incorporate code review feedback	2015-03-16 13:57:22 -07:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
Seth Alves	b815c365eb	formatting	2015-03-13 18:57:27 -07:00
Seth Alves	87cc710efc	more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set	2015-03-13 18:43:24 -07:00
Stephen Birarda	9d055f81f4	use a Mozilla user agent for mod security	2015-03-13 18:29:55 -07:00
Stephen Birarda	9f7ed7b12a	update user agent to be HighFidelityInterface	2015-03-13 18:28:09 -07:00
Stephen Birarda	dcff4f5956	use HIGH_FIDELITY_USER_AGENT for DataWebPage	2015-03-13 18:25:17 -07:00
Seth Alves	2368e6e5b7	collision with a hull sort of works. there is a new memory corruption problem	2015-03-13 15:41:57 -07:00
Seth Alves	3c61727a22	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-12 11:56:12 -07:00
Seth Alves	b945ce5e7a	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 11:38:01 -07:00
Atlante45	eb5206f8e6	Naming	2015-03-12 19:05:06 +01:00
Atlante45	0bd97ce40c	Dependency::customDeleter uses a lambda	2015-03-12 18:53:29 +01:00
Seth Alves	9e6c289ab8	move filename utils into shared library	2015-03-12 10:23:57 -07:00
Seth Alves	87ac38c3df	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-11 18:35:13 -07:00
Seth Alves	df29d5365a	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 15:18:55 -07:00
Andrew Meadows	feafa0a60b	remove old Ragdoll and avatar interactions	2015-03-11 14:29:03 -07:00
Seth Alves	3a3e723f4e	trying to figureo out where to download hull models	2015-03-11 14:26:30 -07:00
Seth Alves	1c73f50dbc	started to hook up geometry downloader to ShapeInfo	2015-03-11 07:17:13 -07:00