1897 commits

Author	SHA1	Message	Date
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Atlante45	0b1d4fb1d6	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 21:16:11 +02:00
Atlante45	b340cd06bf	Fix volume formula for capsules	2015-04-23 19:14:07 +02:00
Atlante45	83490051d9	Move shape related contains() to ShapeInfo	2015-04-23 18:55:20 +02:00
Atlante45	6be0910966	Fix contain for collision hulls	2015-04-23 15:58:18 +02:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Atlante45	955723acf1	RenderableEntityItem uses collision hull in contains	2015-04-22 21:03:55 +02:00
Brad Davis	ce6b7e7aec	Merge branch 'master' into offscreen ... Conflicts: interface/src/Menu.cpp	2015-04-16 14:02:40 -07:00
Bradley Austin Davis	36ca9132cc	More build failure fixes	2015-04-16 01:02:13 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Andrew Meadows	da9091a99d	remove SHAPE_TYPE_CONVEX_HULL from libs and tests	2015-04-14 14:54:43 -07:00
Seth Alves	3cfafea5ca	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	bc9e818b95	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 11:12:16 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Seth Alves	9ef9452cf6	make filename extension checking less wrong	2015-04-03 16:39:45 -07:00
Seth Alves	bfab522ee7	debuging render mode	2015-04-01 17:52:30 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -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