23270 commits

Author	SHA1	Message	Date
SamGondelman	25b31cfc72	merge with master	2019-02-15 11:08:24 -08:00
Brad Davis	0b171ffe13	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 10:31:04 -08:00
Anthony Thibault	702f1c8e74	Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization ... Revert anim pose optimization	2019-02-15 09:42:27 -08:00
Ryan Huffman	ab5c4a927b	Fix asset browser being hidden in incorrect way on server switch	2019-02-14 22:18:42 -08:00
Shannon Romano	f267043953	Merge pull request #14838 from SamGondelman/billboardMode ... Case 20962: Billboard mode improvements	2019-02-14 17:44:48 -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
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Sam Gateau	6168001ad4	Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 ... Case 21159: fixes for more grab bugs	2019-02-14 16:52:03 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -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
SamGondelman	bed2732d34	start moving materials to rendering only	2019-02-14 12:59:16 -08:00
Brad Davis	292602afd7	Resolving more master differences	2019-02-14 12:55:28 -08:00
Brad Davis	0f4d1f073b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-14 12:49:56 -08:00
David Rowe	6a00834147	Merge branch 'master' into M21128 ... # Conflicts: # interface/src/AboutUtil.h	2019-02-15 08:06:41 +13:00
David Rowe	d717e803dd	WalletScriptingInterface API JSDoc	2019-02-15 08:00:53 +13:00
David Rowe	cc083afec6	HifiAbout API JSDoc	2019-02-15 08:00:36 +13:00
David Rowe	2a338124ae	AccountServices API JSDoc	2019-02-15 08:00:19 +13:00
Thijs Wenker	3026fd625a	Avatar Doctor	2019-02-14 18:52:50 +01:00
SamGondelman	13ece79476	merge with master	2019-02-13 16:30:22 -08:00
SamGondelman	3f8bfc5475	CR and fix deadlock	2019-02-13 16:19:39 -08:00
Shannon Romano	8a07e2b31a	Merge pull request #14895 from ctrlaltdavid/M21132 ... Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs	2019-02-13 10:35:00 -08:00
Andrew Meadows	c79e3e5a6d	add some trace contexts for easier debugging	2019-02-13 10:02:58 -08:00
Andrew Meadows	152edd477c	change trace context to rendering	2019-02-13 10:00:51 -08:00
Andrew Meadows	8bdac589b8	use RingBuffer for gradual garbage collection	2019-02-12 15:37:09 -08:00
Brad Davis	4dd853ddbc	Cleanup from master	2019-02-12 15:14:50 -08:00
Brad Davis	db121957d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-12 15:00:03 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
Shannon Romano	e8c70cc782	Merge pull request #14897 from danteruiz/fix-soft-entity ... Case 21142: Wearer and observer disagree on whether a worn item is correctly placed	2019-02-12 13:56:47 -08:00
Roxanne Skelly	a82221d2a5	Case 21118 - descending sorts don't work in new (qml) marketplace	2019-02-12 13:20:47 -08:00
Sam Gateau	a10cf9b620	Merge pull request #14883 from amerhifi/feature/quest ... case:21032 Fixing Lifecycle of the android app	2019-02-12 12:32:38 -08:00
danteruiz	fdfb9196d3	comments explaining horrible code	2019-02-12 11:45:08 -08:00
Brad Davis	a6f23f48d6	Merge branch 'feature/quest_custom_plugins' into feature/quest	2019-02-12 09:53:12 -08:00
danteruiz	50dd865bdc	fix spatially nestable parent overwrite	2019-02-11 16:48:34 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
Brad Davis	e534270f9a	Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins	2019-02-11 15:41:32 -08:00
SamGondelman	96f32a9f72	fix keyboard focus thing	2019-02-11 15:17:32 -08:00
SamGondelman	f53ccf7363	fix create, working on mini tablet	2019-02-11 14:54:53 -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
Brad Hefta-Gaub	a23f436a9f	Merge pull request #14880 from kencooke/audio-meter-improvements ... Case 21091: Improved audio metering	2019-02-08 19:08:31 -08:00
Roxanne Skelly	74f8615fb7	Merge pull request #14876 from roxanneskelly/QmlMarketplace ... Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available	2019-02-08 15:04:35 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
John Conklin II	f9b86725fd	Merge pull request #14816 from SamGondelman/avatar ... Case 20924: Cleaning up Avatar findRayIntersection	2019-02-08 14:40:45 -08:00
Roxanne Skelly	93665fa501	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-08 14:21:29 -08:00
amerhifi	e8a35c63c7	moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.	2019-02-08 13:45:53 -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
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
Roxanne Skelly	e6b2c890d0	Case21085 - Changing domains with scripting APIs not working ... AccountManager was earlier changed to support QUrlQuery for query strings in it's 'send.' Unfortunately, QUrlQuery isn't a scriptable property type so using AM was failing from scripts	2019-02-07 22:21:05 -08:00
Ken Cooke	b04a59af1b	Calibrate meter to encourage hotter mic levels	2019-02-07 16:31:25 -08:00
Ken Cooke	2617febbcd	Replace ad-hoc audio meter with meter calibrated in dBFS	2019-02-07 15:31:13 -08:00
Brad Davis	d3301803d3	Support custom display / input plugin lists and small tweaks	2019-02-07 15:15:26 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
SamGondelman	c217f8d80f	remove overlay picks from stats qml	2019-02-07 14:25:07 -08:00
Brad Davis	070fb25b80	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
danteruiz	95d30e5cbf	Merge branch 'master' of github.com:highfidelity/hifi into feature/quest	2019-02-07 10:41:44 -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
Ken Cooke	ba00f95f72	Expose clipping status to audio scripting interface	2019-02-06 18:23:50 -08:00
SamGondelman	a665664fd5	fix double lasers	2019-02-06 16:13:40 -08:00
SamGondelman	b1e7c3d4fd	allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel	2019-02-06 16:04:40 -08:00
Shannon Romano	6fd480e51d	Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2 ... case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around	2019-02-06 15:52:31 -08:00
Brad Davis	8b70f1771e	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 13:16:22 -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
Shannon Romano	61459d5756	Merge pull request #14775 from roxanneskelly/QmlMarketplace ... Qml marketplace	2019-02-06 11:20:49 -08:00
Brad Davis	91e18f569b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 10:15:36 -08:00
Sam Gondelman	bc11d80a52	fix create selectionBox wireframe	2019-02-05 23:07:57 -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
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
Roxanne Skelly	d3bc536b58	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-05 11:35:28 -08:00
Andrew Meadows	cbd83f972c	remove unsued variable	2019-02-05 10:17:10 -08:00
Roxanne Skelly	2b40260953	QmlMarketplace - disable HTML for quest	2019-02-05 09:27:12 -08:00
Andrew Meadows	e50892b3d2	MyAvatar is unmovable until physics is enabled	2019-02-05 09:00:48 -08:00
Jamil Akram	35c0af0bf3	Merge pull request #14818 from wayne-chen/oculusLoginFeature ... MS20925: Oculus login button not appearing	2019-02-04 17:20:07 -08:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
SamGondelman	934abb3d52	fix keyboard focus and image overlays	2019-02-04 13:33:03 -08:00
SamGondelman	31cf623252	fix keyboard focus	2019-02-04 12:44:04 -08:00
SamGondelman	4b406bf41c	fix getEntityObject and tablet highlighting (Overlays.findOverlays)	2019-02-01 16:23:06 -08:00
SamGondelman	391cca787f	fix keyboard textures and text display	2019-02-01 15:33:53 -08:00
SamGondelman	ba8320f561	fix 2d overlay deletion	2019-02-01 14:31:26 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
SamGondelman	50bfe84aa7	fix keyboard intersection, laser alpha	2019-02-01 12:11:00 -08:00
SamGondelman	0955512a80	add billboard mode to web entities and fix picking/culling	2019-01-31 15:45:10 -08:00
Dante Ruiz	778ddad9ac	to the spot on first launch	2019-01-31 10:52:48 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
SamGondelman	6cbc0fad7f	fixes	2019-01-30 15:58:15 -08:00
Wayne Chen	03789e01da	adding fix for oculus store argument check	2019-01-30 15:53:21 -08:00
Seth Alves	30d9fe705e	avoid possible crash	2019-01-30 14:56:50 -08:00
Seth Alves	c6f44234f8	avoid possible crash	2019-01-30 14:56:02 -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
SamGondelman	0e35458f9e	use precisionPicking in RayPick::getAvatarIntersection	2019-01-30 13:27:47 -08:00
SamGondelman	e32a3ba20d	organize new avatar intersection	2019-01-30 13:19:45 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Brad Davis	efff296398	Master merge cleanup	2019-01-29 14:45:05 -08:00
Brad Davis	0d34030135	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-01-29 14:13:11 -08:00
Shannon Romano	72d3eb9d33	Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2 ... case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors	2019-01-29 13:12:51 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
Ken Cooke	fa08e42da6	Restore legacy attenuation behavior for system sounds and scripts that do not set position. ... JS detects when "position" was not set by the script. C++ explicitly sets .positionSet=false when not set (for system sounds). Local rendering uses a direct mix (no attenuation/HRTF) when not set.	2019-01-29 11:21:02 -08:00
Andrew Meadows	fb5ef95a5b	disable bf triangle collisions for flying MyAvatar	2019-01-29 11:00:18 -08:00