4453 commits

Author	SHA1	Message	Date
amerhifi	edb3206a24	adding macos platform. Misisng display and cpu info	2019-05-10 09:55:26 -07:00
amerhifi	0d97543ece	code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform	2019-05-09 12:04:41 -07:00
David Rowe	c3730e41f7	Typos	2019-05-09 08:33:37 +12:00
Andrew Meadows	e770bd6142	build CollisionShapes and load RigidBodies even when not yet stepping	2019-05-06 17:37:35 -07:00
Andrew Meadows	deee159892	unravel physics-vs-entities lib dependencies part 1	2019-05-06 17:35:57 -07:00
Andrew Meadows	7fb7e503f9	reduce footprint of ShapeManager::_shapeMap	2019-05-06 17:35:57 -07:00
David Rowe	9c12a39368	Merge branch 'master' into M22147	2019-05-06 11:28:22 +12:00
jennaingersoll	57b9b18012	Merge pull request #15363 from ctrlaltdavid/M22068 ... Case 22068: Clipboard JSDoc	2019-05-02 11:15:25 -07:00
David Rowe	d8f6e923c7	Paths JSDoc update	2019-05-01 08:18:17 +12:00
Anthony Thibault	2c370d9d74	Merge pull request #15460 from hyperlogic/feature/network-opt-faux ... Avatar network bandwidth optimization	2019-04-26 10:16:30 -07:00
David Rowe	8e69e0b049	Regularize deprecation notices	2019-04-25 20:55:30 +12:00
David Rowe	73fd61dcf0	Picks, PickType, RayPick JSDoc update	2019-04-25 13:19:07 +12:00
Shannon Romano	70c2b8b8c4	Merge pull request #15443 from Atlante45/fix/asset-server-baking-master ... Case 22333: Master: Fix asset server auto-baking	2019-04-24 16:30:14 -07:00
Sam Gateau	dfce7dcaa6	Merge pull request #15405 from SamGondelman/stencil2 ... Case 20060: Grab correct stencil masks from display plugins	2019-04-24 09:52:12 -07:00
Clement	86b6341098	Add error reporting + Make temp dir erase safer	2019-04-23 14:54:12 -07:00
SamGondelman	9deb4e47ad	comment out warning	2019-04-23 08:46:54 -07:00
SamGondelman	06fbc8440e	Merge remote-tracking branch 'upstream/master' into stencil2	2019-04-22 13:28:30 -07:00
Anthony Thibault	0c0b847666	First version of faux joint optimizations ... There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section. Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.	2019-04-22 11:02:13 -07:00
sabrina-shanman	05a2b11c54	Fix mat4FromVariant	2019-04-19 11:29:28 -07:00
sabrina-shanman	7b74561b27	Fix baked models not preserving scale in some cases	2019-04-19 11:29:27 -07:00
Sam Gateau	e6c76cdb19	Merge pull request #15329 from Zvork/amc ... case 22219: Improved ambient maps	2019-04-17 10:20:53 -07:00
Shannon Romano	50f39e88d6	Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check ... Better head vs camera checks for avatar head cauterization	2019-04-16 15:07:46 -07:00
r3tk0n	d0abb86366	Reversed costants because no sleep. >_<	2019-04-15 17:26:22 -07:00
r3tk0n	12d7e35722	Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release.	2019-04-15 10:56:07 -07:00
r3tk0n	a40fdf3f77	Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix	2019-04-15 09:47:26 -07:00
r3tk0n	87deb348a8	Adjust run speed constants.	2019-04-12 14:07:06 -07:00
Shannon Romano	a0ddadc0e7	Merge pull request #15320 from ctrlaltdavid/M21989 ... Case 21989: AvatarList and AvatarManager JSDoc	2019-04-12 12:27:29 -07:00
Shannon Romano	11e5f0a101	Merge pull request #15323 from ctrlaltdavid/M22052 ... Case 22052: Camera JSDoc	2019-04-12 12:26:39 -07:00
SamGondelman	c730e51d1e	wip redo stencil work	2019-04-11 13:22:51 -07:00
David Rowe	ca3f45163f	Merge branch 'master' into M21989	2019-04-11 10:37:34 +12:00
David Rowe	617617736e	Merge branch 'master' into M22052	2019-04-11 10:24:27 +12:00
Sam Gateau	51d1c4b1f3	Merge pull request #15357 from SamGondelman/cauterize ... Case 21417: Fix cauterization of entities that are children of MyAvatar's head	2019-04-10 12:29:40 -07:00
Sam Gateau	89ff63e8bb	Merge pull request #15267 from jherico/fix/tracing ... Case 21930: Don't change OpenGL context state every frame	2019-04-10 09:42:09 -07:00
David Rowe	d587f1227d	Add ResourceRequestObserver JSDoc	2019-04-10 12:09:48 +12:00
Anthony J. Thibault	02d5769991	Better head vs camera checks for avatar head cauterization ... * cameraInsideHead() check now uses detailed avatar collision when possible. * head is now more constantly hidden in first person camera mode * getEyeModelPositions() uses a better estimate when avatar eye joints are missing. * moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp * added isPlayingOverrideAnimation() method to Rig class	2019-04-09 12:57:03 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Sam Gondelman	660818aded	Revert "Case 20060: Grab correct stencil masks from display plugins"	2019-04-05 11:59:46 -07:00
Olivier Prat	08aa133472	Fixed other compilation errors / warnings	2019-04-05 11:32:00 +02:00
Olivier Prat	89ca7ac415	Fixed compilation errors	2019-04-05 10:22:57 +02:00
Olivier Prat	a45b91c4be	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-05 09:01:03 +02:00
Wayne Chen	b10faa8109	Merge pull request #14738 from r3tk0n/project-freeloco ... Case 21777: Locomotion Project	2019-04-04 16:18:32 -07:00
Sam Gondelman	85bf1da0a1	Merge pull request #15266 from SamGondelman/stencil ... Case 20060: Grab correct stencil masks from display plugins	2019-04-04 13:36:25 -07:00
Olivier Prat	b71a8f7902	Switched to split sum model for ambient (as Unreal)	2019-04-04 16:10:33 +02:00
Olivier Prat	acded5488e	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-04 08:58:49 +02:00
David Rowe	1bc38cab28	Camera JSDoc polish	2019-04-04 18:03:14 +13:00
David Rowe	2a17ad3da5	AvatarList and AvatarManager JSDoc	2019-04-04 10:11:54 +13:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
r3tk0n	ac2971894b	Fix sprint mode scalar.	2019-04-03 11:42:40 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Olivier Prat	20f53f5de3	Merge branch 'master' of https://github.com/highfidelity/hifi into amc	2019-04-01 10:04:41 +02:00
SamGondelman	33b3e2afac	try to fix build errors?	2019-03-29 10:57:01 -07:00
Olivier Prat	4a2323f3c2	Just need to write correct textureLod equivalent on CPU cube map	2019-03-27 17:43:26 +01:00
Brad Davis	36cecef166	Support explicit timestamps in tracing, conditional event output based on duration	2019-03-26 13:50:46 -07:00
SamGondelman	4ed7c09016	grab correct stencil masks from display plugins	2019-03-26 13:42:18 -07:00
David Rowe	cf4370ed3a	Merge branch 'master' into M21222	2019-03-26 09:44:48 +13:00
David Rowe	839a03ebe6	Miscellaneous JSDoc fixes noticed in passing	2019-03-26 09:41:07 +13:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	7a8dfe0aaf	Fix run speeds.	2019-03-21 15:06:21 -07:00
SamGondelman	3ff0770441	model emitters!	2019-03-20 21:25:14 -07:00
David Rowe	7445d73857	Merge branch 'master' into M21222 ... # Conflicts: # libraries/avatars/src/AvatarData.h	2019-03-13 16:14:14 +13:00
danteruiz	6303f61cc3	fix lasers scale issue	2019-03-12 14:26:59 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
r3tk0n	cbd841a14d	Update gearing system.	2019-03-11 16:22:48 -07:00
David Rowe	24286273b4	Miscellaneous JSDoc fixes	2019-03-09 19:22:07 +13:00
Shannon Romano	a8f6e74ca4	Merge pull request #15135 from SamGondelman/text81 ... Case 21628: Fix text rendering on AMD/Mac	2019-03-08 14:59:37 -08:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
David Rowe	4779a6b156	Merge branch 'master' into M21222	2019-03-09 07:57:53 +13:00
David Rowe	0b7cddb886	Fill in and tidy MyAvatar JSDoc	2019-03-08 13:49:10 +13:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
Shannon Romano	8be93fd16c	Merge pull request #14891 from kencooke/glm-pack-normals-speedup ... Case 21114: SIMD optimized blendshape packing	2019-03-07 15:28:40 -08:00
Roxanne Skelly	b38fc65372	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-07 10:06:05 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
Dante Ruiz	d33400f6ad	fix GCC compiler warning	2019-02-28 15:25:15 -08:00
David Rowe	aa53ab7492	Distinguish between Mat4 type and Mat4 API in JSDoc	2019-02-27 09:54:11 +13:00
David Rowe	e79594ef53	Fill in and tidy Avatar JSDoc	2019-02-27 09:53:11 +13:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
Roxanne Skelly	2dffd14fa7	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-25 10:20:52 -08:00
Shannon Romano	dc6bdfae8a	Merge pull request #14995 from SamGondelman/parentCrash ... Case 21391: Fix parent loop crash	2019-02-25 10:01:37 -08:00
Shannon Romano	5f99158c25	Merge pull request #14977 from SamGondelman/rot ... Case 21354: Add "modelScale" property to fix pal	2019-02-22 16:36:17 -08:00
Sam Gondelman	30b6b7f21b	let's try that again	2019-02-22 16:30:36 -08:00
Roxanne Skelly	0636579822	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-22 15:43:42 -08:00
SamGondelman	081e62a647	fix parent loop crash	2019-02-22 14:26:15 -08:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
SamGondelman	544f54e69a	fix model scale	2019-02-21 14:10:36 -08:00
amantley	50bc8d3646	added protected function to cubic hermite spline	2019-02-21 13:32:28 -08:00
amantley	de10aebbb5	removed white space	2019-02-21 11:44:18 -08:00
amantley	64ec28ef44	added back missing unity meta files	2019-02-21 11:37:14 -08:00
Roxanne Skelly	8c058f147e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00
Shannon Romano	0b7bdb185e	Merge pull request #14949 from SamGondelman/wearables ... Case 21300, Case 21301: Group cull all entity descendants of avatars	2019-02-20 10:29:40 -08:00
r3tk0n	7092513b7d	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 17:42:58 -08:00
SamGondelman	c8ffb130a3	only update sub items on change	2019-02-19 17:38:47 -08:00
Shannon Romano	07d084d086	Merge pull request #14937 from SamGondelman/pal ... Case 21259: Pal textures don't change	2019-02-19 17:14:15 -08:00
SamGondelman	6765268998	Merge remote-tracking branch 'upstream/master' into wearables	2019-02-19 16:52:00 -08:00
SamGondelman	44e70db4cd	WE DID IT FOLKS	2019-02-19 15:02:36 -08:00
Dante Ruiz	6189aff6b3	Merge pull request #14933 from danteruiz/pick-manager-perf ... Case 21271: Remove unnessary picks for quest	2019-02-19 14:20:56 -08:00
Roxanne Skelly	d957b38f10	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-19 12:34:10 -08:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
danteruiz	b00746c096	Trim picks in use during quest:	2019-02-15 16:24:17 -08:00
Roxanne Skelly	be98fb1ac7	Standalone Tags - checkpoint	2019-02-15 11:21:40 -08:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
Shannon Romano	3b5b077a3e	Merge pull request #14887 from AndrewMeadows/shape-garbage-collector ... Case 21066: restore shape caching in ShapeManager	2019-02-14 17:33:33 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
Andrew Meadows	a3567dea3a	clean HashKey API, reduce dependency tree	2019-02-12 15:37:09 -08:00
Andrew Meadows	17ab0cb92e	more robust ShapeManager garbage collector	2019-02-12 15:37:09 -08:00
David Rowe	5428bb19dc	Add "Avatar Script" JSDoc API classification	2019-02-12 11:49:49 +13:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
Ken Cooke	7236d63da0	Fix tabs	2019-02-09 12:16:26 -08:00
Ken Cooke	68480f6760	Replace glm::packSnorm3x10_1x2() with fast SIMD implementation	2019-02-09 10:49:18 -08:00
Anthony Thibault	e6cdfe3377	Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion ... Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)	2019-02-08 15:10:44 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
John Conklin II	dda310c0b9	Merge pull request #14835 from SamGondelman/textures ... Case 20944: Fix Model textures property	2019-02-07 14:19:01 -08:00
SamGondelman	e74ff18bef	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:49:27 -08:00
SamGondelman	25ca52d892	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-07 09:48:13 -08:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00
Shannon Romano	6a91b54261	Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux ... case 21042: fix interface crash on early shutdown, 0.80.0 redux	2019-02-06 11:53:49 -08:00
Shannon Romano	30a6f25b69	Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor ... case 20048: don't allow MyAvatar to move until physics enabled	2019-02-06 11:52:42 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
John Conklin II	3ee412faf7	Merge pull request #14854 from danteruiz/quest-default ... Case 21037: Allow the script engine to use FileSeclector when loading scriopts	2019-02-06 07:21:03 -08:00
Anthony Thibault	708309fa63	CubicHermiteSplineWithArcLength optimization	2019-02-05 18:11:30 -08:00
Andrew Meadows	16ef30ced0	don't flushRepeatedMessages() in LogHandler dtor	2019-02-05 17:14:25 -08:00
John Conklin II	ec0bdba7fb	Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab ... case 20919: Fix edit in release grab	2019-02-05 14:48:59 -08:00
danteruiz	30bd9774b2	script engine to load platform specific files	2019-02-05 13:11:54 -08:00
Jeff Clinton	35608c35de	Merge pull request #14808 from danteruiz/webengine-fileselector ... Case 20879: Migrate webEngine referencing QML into +webengine folder	2019-02-05 12:57:38 -08:00
Andrew Meadows	5a4960b300	add crash::doAssert() for debug purposes	2019-02-05 09:00:48 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
amantley	61b019d176	added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files	2019-01-31 14:13:51 -08:00
SamGondelman	ee1552661c	fix textures	2019-01-31 12:04:46 -08:00
amantley	f68ee4e7ce	merged with master	2019-01-31 09:56:46 -08:00
luiscuenca	5438bddc84	Fix assertion on shapeInfo when creating multisphere with empty data	2019-01-31 09:43:30 -07:00
r3tk0n	7e9d35a0fb	Add individual speed settings per control mode.	2019-01-30 15:06:35 -08:00
amantley	2e1a4545c6	cache the spine2 spline default offset and ratio	2019-01-30 14:47:03 -08:00
Seth Alves	3ab2db96b6	deactivate grab action when grab is released	2019-01-30 14:43:11 -08:00
Seth Alves	0846eb8ec6	attempt to allow position edits in releaseGrab entity-method	2019-01-30 14:43:11 -08:00
Dante Ruiz	93a91cdba2	webengine fileselector	2019-01-30 13:57:49 -08:00
Antonina Savinova	5d49a3f6df	Merge pull request #14732 from kencooke/audio-distattn-improvements ... Bug fixes and improvements to audio distance attenuation	2019-01-29 14:02:29 -08:00
Jamil Akram	f4ead69549	Merge pull request #14722 from luiscuenca/multiSphereAvatar04 ... Multi-sphere avatar detailed collisions	2019-01-29 10:10:04 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
Sam Gondelman	faeb5b36dc	Merge pull request #14764 from SamGondelman/NOverlays12 ... Case 20722: Ring Gizmo Entities to replace Circle Overlays	2019-01-28 18:09:23 -08:00
luiscuenca	a6dce5dd84	Merge branch 'master' into multiSphereAvatar04	2019-01-28 17:48:22 -07:00
Shannon Romano	d8f781deae	Merge pull request #14719 from jherico/feature/quest_frame_serialization ... case 20883: GPU frame serialization and related tools	2019-01-28 15:47:55 -08:00
SamGondelman	13cb70a6a5	Merge remote-tracking branch 'upstream/master' into NOverlays12	2019-01-28 11:37:15 -08:00
luiscuenca	cc73649ef8	Merge branch 'master' into multiSphereAvatar04	2019-01-28 11:57:04 -07:00
Jeff Clinton	b5a1dc599b	Merge pull request #14725 from SamGondelman/NOverlays11 ... Case 20700: Add missing pulse properties to certain Entity types	2019-01-28 10:51:00 -08:00
SamGondelman	abd7d6bddf	some stuff is working!	2019-01-26 01:39:13 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
SamGondelman	a10f52c66d	merge with master	2019-01-25 14:16:07 -08:00
luiscuenca	f54f9e5bfd	Merge branch 'master' into multiSphereAvatar04	2019-01-25 13:54:01 -07:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	9a734b2011	merge with master	2019-01-23 17:48:24 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
luiscuenca	a947c894c2	Suggested changes	2019-01-23 17:23:36 -07:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
John Conklin II	1768d91780	Merge pull request #14733 from hyperlogic/bug-fix/translation-precision ... Avatar Protocol: Fix for precision issues with translation	2019-01-23 14:07:58 -08:00
Brad Davis	e18e3fc138	Gpu Frame serialization	2019-01-23 13:21:34 -08:00
Anthony Thibault	286f23d512	Updated protocol version and fixed bugs	2019-01-17 15:19:54 -08:00
SamGondelman	611998f799	add pulse group properties to shapes, particles, text, web, image, and grid	2019-01-16 13:34:10 -08:00
Seth Alves	1104e56bc3	fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level	2019-01-16 13:23:27 -08:00
Ken Cooke	328809f008	More robust approximation of distance attenuation at extreme settings. ... Fixes artifacts that occur when attenuation zone coef = 1.0 and distance > 32m.	2019-01-16 11:10:38 -08:00
luiscuenca	71e7023a3e	Refactor and optimizations	2019-01-15 18:07:50 -07:00
SamGondelman	6fd34bf1f0	setup qml surface contexts	2019-01-14 09:26:57 -08:00
luiscuenca	95fca826a5	Add fit AABox for avatar and implement multisphere on shapeManager	2019-01-09 17:49:19 -07:00
SamGondelman	45ec7fe3e1	working on ignorePickIntersection and web entities	2019-01-09 12:03:35 -08:00
Anthony Thibault	5d606981de	Added HMD Avatar Alignment Type ... Adds a new API to set this type, and an option to the Avatar App. * "eye" - Match the user eyes with the avatar eyes. The previous default behavior. If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down. * "head" - Match the user head with the avatar head. The new default behavior. This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.	2019-01-08 18:35:28 -08:00
luiscuenca	39dc25ea92	Merge branch 'master' into multiSphereAvatar04 ... # Conflicts: # interface/src/avatar/OtherAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h	2019-01-08 15:41:33 -07:00
luiscuenca	f19201fc92	Other avatar detailed collisions on motion state	2019-01-08 14:09:13 -07:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
Andrew Meadows	a642af23b7	enable shapeType=ellipsoid and expose zone shapeType to UI	2019-01-04 12:37:23 -08:00
Andrew Meadows	bb15b3a5d5	remove ShapeInfo::contains() which was a Bad Idea	2019-01-04 12:37:23 -08:00
Shannon Romano	9b6dfd17cc	Merge pull request #14585 from SamGondelman/NOverlays7 ... Case 20321: More Entity Property Cleanup	2019-01-03 15:07:50 -08:00
Antonina Savinova	a493f01012	Merge pull request #14551 from Atlante45/fix/headers ... Fix non self-sufficient headers.	2019-01-03 15:04:39 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Seth Alves	3ccbd0bc7b	disable positionand velocity script edits on grabbed entities	2019-01-03 08:17:52 -08:00
Seth Alves	895e8cdba1	fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again	2019-01-03 08:17:52 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
SamGondelman	8dae2502ee	fix overlay picking	2018-12-22 02:21:29 -05:00
SamGondelman	43bc184254	different entity flags for domain/avatar ... (cherry picked from commit 7054188f21)	2018-12-22 00:55:27 -05:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Adam Smith	14ab53571f	Merge pull request #14564 from sabrina-shanman/hfm_prep ... (case 20274) Create the HFM Preparation Step	2018-12-17 15:17:19 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
sabrina-shanman	566d09dc9c	Add model preparation step to ModelCache using new library model-baker	2018-12-11 11:15:54 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Brad Hefta-Gaub	43bbba6635	Merge pull request #14554 from sethalves/break-parenting-loops ... fix some parenting loops crashes	2018-12-11 10:02:17 -08:00
Shannon Romano	bb9a764855	Merge pull request #14517 from luiscuenca/getEntityJointParent ... Add method to check entities joint hierarchy	2018-12-11 01:06:38 +00:00
Seth Alves	c1e2653526	check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete	2018-12-08 07:42:03 -08:00
SamGondelman	7054188f21	different entity flags for domain/avatar	2018-12-07 17:59:47 -08:00
Clement	d179b91f69	Fix non self-sufficient headers.	2018-12-07 15:26:49 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
sabrina-shanman	6ea4769173	Re-name MIMETypeLibrary to MediaTypeLibrary and update related references	2018-12-06 13:39:18 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
SamGondelman	645508de04	add jsdocs for BillboardMode	2018-12-06 09:59:24 -08:00
sabrina-shanman	3c38b43a65	Fix compilation error due to static variable definition in MIMETypeLibrary header file	2018-12-04 09:30:04 -08:00
sabrina-shanman	19459c15a5	Split MIMETypeLibrary file type detection into three separate functions	2018-12-04 09:30:04 -08:00
sabrina-shanman	660d8c4e92	Remove unused mapping parameter from MIME type detection	2018-12-04 09:30:04 -08:00
sabrina-shanman	6ec0e42ded	Remove locks from MIMETypeLibrary	2018-12-04 09:30:04 -08:00
Clément Brisset	62f21822ce	Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash ... Fix Agent crash on shutdown	2018-12-03 14:17:35 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
luiscuenca	ad42f6a590	Add method to check entities joint hierarchy	2018-12-01 12:32:29 -07:00
sabrina-shanman	142e787a9c	Create MIMETypeLibrary for general MIME type detection	2018-11-30 10:28:43 -08:00
Jeff Clinton	0bca290de2	Merge pull request #14485 from sethalves/crash-on-exits ... suppress 'No instance available' messages during shutdown. try a dif…	2018-11-30 10:10:43 -08:00
Clement	181f2b4263	Fix Agent crash on shutdown	2018-11-28 18:40:52 -08:00
Shannon Romano	ff934a8f87	Merge pull request #14394 from sabrina-shanman/hfm_serializer ... (case 20005) Create HFMSerializer interface for model loaders	2018-11-28 11:10:27 -08:00
Seth Alves	fac27553d7	suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.	2018-11-27 17:02:48 -08:00
Seth Alves	8f21ade0c7	make cmake -DDISABLE_QML=1 work again	2018-11-27 12:41:40 -08:00
sabrina-shanman	be511378cd	Merge branch 'master' into hfm_serializer	2018-11-20 13:42:24 -08:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
sabrina-shanman	e08bc7296f	Merge branch 'master' into hfm_serializer	2018-11-13 15:41:49 -08:00
sabrina-shanman	93c7578f54	Convert hfm::Serializer to use hifi-namespaced types	2018-11-12 16:12:21 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
John Conklin II	dc4b967ff5	Merge pull request #14331 from SimonWalton-HiFi/large-avatars-bad-position ... Clamp avatar-joint translations that hit the compressed-format limit	2018-11-11 16:27:56 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	f664421fe0	addressing code review feedback	2018-11-08 09:58:53 -08:00
Andrew Meadows	5bfb9c1f71	fix ShapeInfo::contains() logic for capsule shapes	2018-11-08 08:39:43 -08:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Andrew Meadows	6ecf850159	clarify ShapeInfo::setCapsuleY() API and use it correctly	2018-11-06 12:37:55 -08:00
Simon Walton	26b9e2e162	Fix a URL while we're in the file	2018-11-02 14:47:40 -07:00
Simon Walton	e64557a46c	Clamp the fixed-point network values to their limits	2018-11-02 11:52:40 -07:00
SamGondelman	e64a4d0536	try to fix unnecessary queryAACube updates	2018-10-30 12:47:44 -07:00
John Conklin II	2eb801bdc6	Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements ... Further avatar-mixer improvements	2018-10-25 12:25:32 -07:00
Jeff Clinton	67fe43ebb1	Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars ... Small avatars now have a minimum jump height of 0.25 meters	2018-10-24 17:08:28 -07:00
Simon Walton	e22e0ecb04	Merge branch 'master' into avatar-mixer-improvements	2018-10-24 10:39:23 -09:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
Simon Walton	0a78eeaf1a	Merge branch 'master' into avatar-mixer-improvements	2018-10-23 15:56:56 -07:00
Zach Fox	493262052c	Remove extraneous code changes; remove QUrlAncestry code; remove extra logging	2018-10-22 13:59:52 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Olivier Prat	5f3a299fd9	Merge with master	2018-10-22 14:02:24 +02:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Anthony Thibault	6cc7c861d1	Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest ... Disable user hand controllers if they are too far away or not moving.	2018-10-19 14:02:32 -07:00
Anthony Thibault	ef74014075	Small avatars now have a minimum jump height of 0.25 meters ... This should improve the quality of the jump animation and improve the mobility of small avatars.	2018-10-19 13:55:56 -07:00
Simon Walton	0b2ee35907	Merge branch 'master' into avatar-mixer-improvements	2018-10-18 14:13:39 -07:00
Zach Fox	2f37a2b1a1	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-18 11:12:26 -07:00
John Conklin II	1cc2569bd8	Merge pull request #13596 from SamGondelman/scriptvec3 ... Replace vec2, vec3, and xColor properties with JS prototypes	2018-10-18 09:47:56 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
John Conklin II	8e5bc1678f	Merge pull request #14219 from SamGondelman/materialCull ... QueryAACube fixes and materials expand to include their parent	2018-10-17 15:15:23 -07:00
Sam Gondelman	e3543cf098	Merge branch 'master' into scriptvec3	2018-10-17 13:10:29 -07:00
John Conklin II	9f0b4fb437	Merge pull request #14122 from SamGondelman/skybox ... Rebake default skybox for all platforms	2018-10-17 09:50:00 -07:00
Anthony Thibault	27c495406e	Disable user hand controllers if they are too far away or not moving.	2018-10-16 17:24:47 -07:00
SamGondelman	49b496046b	queryAACube fixes	2018-10-16 14:35:39 -07:00
SamGondelman	ded8d4b547	variant conversions	2018-10-16 11:55:28 -07:00
Sam Gondelman	121fc7205c	Delete Default-Sky-9-cubemap.texmeta	2018-10-14 22:36:22 -07:00
SamGondelman	9788aa307e	remove width/height/depth	2018-10-10 12:38:07 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Olivier Prat	cfcf6f05a2	Merge with master	2018-10-09 14:18:02 +02:00
Simon Walton	6f659db3b5	Merge branch 'master' into avatar-mixer-improvements	2018-10-08 15:18:29 -07:00
Sam Gondelman	67662df760	Merge branch 'master' into scriptvec3	2018-10-08 12:59:34 -07:00
Sam Gondelman	4e96c3297b	Merge branch 'master' into scriptvec3	2018-10-03 17:14:15 -07:00
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Sam Gondelman	5b6e7b2566	Merge branch 'master' into scriptvec3	2018-10-02 08:58:04 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07:00
John Conklin II	3ab83731b9	Merge pull request #14087 from sethalves/quiet-asan ... fix several uninitialized reads	2018-10-01 16:48:54 -07:00
sabrina-shanman	0cf7e954cc	Simplify a RayPick and StylusTip constructor	2018-10-01 09:20:59 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
sabrina-shanman	74937a1979	Serialize PickRay according to its variables	2018-09-27 14:41:38 -07:00
sabrina-shanman	3ac9478101	Assign _mathPick in the Pick constructor	2018-09-27 11:30:57 -07:00
John Conklin II	6c47ba0dc7	Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps ... Use C++ chrono system_clock for timestamps	2018-09-26 11:22:49 -07:00
sabrina-shanman	4011660435	Merge branch 'master' into stt_parenting2	2018-09-26 10:17:45 -07:00
Seth Alves	ff2a47e7e6	fix several uninitialized reads	2018-09-26 09:33:12 -07:00
David Rowe	b98bd741b8	Indent and reword jumping and flying checkbox	2018-09-26 18:14:02 +12:00
David Rowe	af1b4fef5d	Modify layout of rotation mode settings options	2018-09-25 18:03:57 +12:00
Simon Walton	d5977612a1	Merge branch 'master' into avatar-mixer-improvements	2018-09-24 13:29:45 -07:00
David Rowe	e29b403abc	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js	2018-09-24 11:44:28 +12:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
Olivier Prat	9f0201878d	Some work to try to find the odd resolution bug	2018-09-21 17:14:39 +02:00
Simon Walton	7bba4d4bad	Change priorities in the correct place	2018-09-19 18:38:20 -07:00
Simon Walton	f1b7097edb	Priority experiment	2018-09-19 15:32:56 -07:00
John Conklin II	65ef04ae75	Merge pull request #13937 from luiscuenca/stt_teleport_wip ... Safe Teleport Target	2018-09-14 15:11:18 -07:00
Simon Walton	6a1c76d14d	Only sort an estimated number of avatars	2018-09-14 12:19:55 -07:00
sabrina-shanman	237022d304	Refactor new pick parenting system for use with RayPick, ParabolaPick	2018-09-14 10:28:15 -07:00
SamGondelman	c522d1bc93	merge with master	2018-09-14 00:57:13 -07:00
Simon Walton	727aea2025	Remove comment	2018-09-13 18:21:16 -07:00
Simon Walton	74ea1548a9	Use chrono::system_clock for usecTimestampNow() on all platforms	2018-09-13 14:24:49 -07:00
Simon Walton	15f06264f9	Remove unneeded #include	2018-09-11 17:03:39 -07:00
Simon Walton	80b7e04bc6	Revert change to chrono<system_clock> for usecTimestampNow()	2018-09-11 10:51:36 -07:00
luiscuenca	9c6ee18db5	Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip	2018-09-10 15:18:15 -07:00
sabrina-shanman	3b7dac9058	Account for collisionGroup in CollisionRegion implementation	2018-09-10 15:14:48 -07:00
luiscuenca	6f4e9ded09	Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip	2018-09-10 14:42:02 -07:00
sabrina-shanman	9a86b7451b	Add collision group parameter to collision pick and set my avatar as the default	2018-09-10 14:35:04 -07:00
Simon Walton	d12376187c	Merge branch 'master' into avatar-mixer-scaling	2018-09-10 10:15:49 -07:00
SamGondelman	b3bdddb3f4	set vec with one number	2018-09-07 15:15:02 -07:00
John Conklin II	405e2da91e	Merge pull request #13949 from sabrina-shanman/stt_parenting_scale ... Scale Collision Pick to match parent	2018-09-07 11:54:02 -07:00
Simon Walton	741d4ba998	Merge branch 'master' into avatar-mixer-scaling	2018-09-07 09:30:39 -07:00
sabrina-shanman	8d4c47cf8e	Make template specialization of BaseNestableTransformNode explicit	2018-09-07 08:49:44 -07:00