3477 commits

Author	SHA1	Message	Date
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	33d35bbe14	Merge pull request #11770 from AndrewMeadows/sort-and-throttle ... sort and throttle UpdateRenderables work... when necessary	2017-11-19 11:09:08 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
Ryan Huffman	60a222e4b4	Merge pull request #11810 from Atlante45/fix/stuck-acs ... Fix stuck ACs	2017-11-15 14:59:51 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
Atlante45	d8b1cb10df	CR	2017-11-15 11:20:30 -08:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Andrew Meadows	500f381827	collect hard-coded time budgets in one spot	2017-11-14 15:57:17 -08:00
Andrew Meadows	ffe16a754e	another pass through the crucible	2017-11-14 15:57:17 -08:00
Andrew Meadows	f67114a0a8	PrioritySortUtil::Prioritizer doesn't need to be a template	2017-11-14 15:57:17 -08:00
Andrew Meadows	55cc945c78	organize PrioritySortUtil differently	2017-11-14 15:57:17 -08:00
Andrew Meadows	99b4283cbc	fix typo in 'out-of-view' check	2017-11-14 15:57:17 -08:00
Andrew Meadows	d7b84f8a86	fix typo in comment	2017-11-14 15:57:17 -08:00
Andrew Meadows	8707c76a6a	templatize the ViewFrustum-relative sort algorithm	2017-11-14 15:57:17 -08:00
Atlante45	b31118fe00	CR	2017-11-14 11:41:43 -08:00
Atlante45	6b5b905b2a	Exit right away if the parent process died	2017-11-14 11:41:43 -08:00
Atlante45	462ec30cac	Utilise Windows Job Object so child dies w/ parent	2017-11-14 11:41:43 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Andrew Meadows	469b68011c	Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero ... div by zero fixes, detected by address sanitizer	2017-11-10 13:47:40 -08:00
Anthony Thibault	08c12a1ced	Merge pull request #11704 from AndrewMeadows/shape-manager-key ... cleanup ShapeInfo hash generation	2017-11-10 11:31:46 -08:00
Anthony J. Thibault	4169e11e77	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Olivier Prat	09ee69db30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-06 09:47:48 +01:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Atlante45	7616fe193c	Migrate the DS config version to the config file	2017-10-31 17:35:23 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
Stephen Birarda	b8370128ce	remove master config from HifiConfigVariantMap/domain-server	2017-10-31 16:19:50 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Andrew Meadows	b00d158342	remove DoubleHashKey: it is no longer used	2017-10-27 07:52:51 -07:00
Andrew Meadows	45e571dd02	cleanup ShapeInfo::getHash()	2017-10-27 07:52:51 -07:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00