28868 commits

Author	SHA1	Message	Date
SamGondelman	a8e6d01279	fix context overlay	2019-02-28 11:33:09 -08:00
amer cerkic	faedc61c37	removing quest-demo specific changes	2019-02-28 10:54:30 -08:00
amer cerkic	a425becc8a	clean up of debugging	2019-02-27 15:35:33 -08:00
Shannon Romano	1a83ab2dab	Merge pull request #15038 from danteruiz/fix-login-screen ... Case 21451: HMD Login Encouragement Screen is not Usable	2019-02-27 14:41:41 -08:00
David Rowe	d73ff2e855	Revise current MyAvatar API JSDoc	2019-02-28 10:40:10 +13:00
amer cerkic	92cfa49bfb	adding and testing command line parameter passing to application	2019-02-27 11:42:22 -08:00
SamGondelman	bf9e5b9550	comment out another log	2019-02-27 10:25:34 -08:00
danteruiz	2fd94c6bbc	fixing login dialog	2019-02-27 10:08:38 -08:00
Wayne Chen	028cce5394	change short username to 14 characters, displaying as normal text	2019-02-26 12:26:50 -08:00
Shannon Romano	2aa622b855	Merge pull request #15014 from sethalves/fix-grab-earthquake ... case 21411: don't allow others' grabs to move locked or ungrabbable things	2019-02-26 09:03:44 -08:00
nimisha20	ba3895efdd	Update AccountServicesScriptingInterface.h ... Minor copy-edit	2019-02-25 22:56:36 -08:00
nimisha20	736a050e68	Update AccountServicesScriptingInterface.h	2019-02-25 22:55:56 -08:00
nimisha20	4825ecdbf3	Update AccountServicesScriptingInterface.h	2019-02-25 22:44:16 -08:00
Wayne Chen	650b34c463	adding clock	2019-02-25 18:00:56 -08:00
Shannon Romano	7fe3bb387e	Merge pull request #15012 from SamGondelman/nametag ... Case 21397: Trying to fix overlay rotation	2019-02-25 16:52:01 -08:00
Andrew Meadows	6e13203fec	avoid nullptr deref	2019-02-25 13:52:46 -08:00
SamGondelman	e102ad073e	allow flying in HMD if you would otherwise fall forever	2019-02-25 11:49:38 -08:00
Roxanne Skelly	292ac88c96	Update with new standalone-optimized icon	2019-02-25 11:36:45 -08:00
Seth Alves	db821487d9	don't allow others' grabs to move locked or ungrabbable things	2019-02-25 11:27:10 -08:00
Thijs Wenker	79d0a0a0a8	avatar doctor project status	2019-02-25 19:28:38 +01:00
Roxanne Skelly	2dffd14fa7	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-25 10:20:52 -08:00
SamGondelman	8058ad884e	trying to fix overlay rotation	2019-02-25 09:53:33 -08:00
nimisha20	e20f13f0ae	Update AccountServicesScriptingInterface.h ... Adding ctrlaltdavid's changes	2019-02-25 09:28:56 -08:00
nimisha20	2bcee4e454	Update AccountServicesScriptingInterface.cpp ... Changes according to ctrlaltdavid's comments.	2019-02-25 08:54:47 -08:00
David Rowe	4e9d162172	AccountServices, HifiAbout, and WalletScriptingInterface JSDoc review	2019-02-24 13:23:20 +13:00
Sam Gateau	4f0911bd29	Merge pull request #15003 from SamGondelman/nametag ... Case 21397: Fix nametag rotation	2019-02-23 09:00:12 -08:00
SamGondelman	37720e9daa	fix nametag rotation	2019-02-22 16:53:03 -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 Gateau	860b3a35e4	Merge pull request #14992 from hyperlogic/quest-demo-with-avatar-ik-optimizations ... Quest demo with avatar ik optimizations	2019-02-22 16:32:24 -08:00
Anthony Thibault	1213084fc6	Merge pull request #14984 from kencooke/master ... Case 21384: Avatar mouth blendshapes are not working correctly (master)	2019-02-22 16:29:07 -08:00
Roxanne Skelly	0636579822	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-22 15:43:42 -08:00
Dante Ruiz	eedd54d0b1	Merge branch 'quest-demo' of github.com:highfidelity/hifi into quest-demo	2019-02-22 15:02:01 -08:00
Dante Ruiz	a87e49bb23	start in quest dev	2019-02-22 15:01:30 -08:00
Shannon Romano	a63f3e76c8	Merge pull request #14972 from SamGondelman/billboard ... Case 21341: Fix billboard mode in secondary camera	2019-02-22 13:01:09 -08:00
amantley	87d98e5b85	These are the squashed commits for the ik optimization for the Quest ... Implmented using a new AnimSplineIK node in the anim graph (cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)	2019-02-22 11:21:36 -08:00
Sam Gateau	1d5a4116b9	Merge pull request #14986 from amerhifi/quest-demo ... case 21374 : Away mode on Quest when device is paused	2019-02-22 09:54:57 -08:00
amer cerkic	9c833f7e64	clean up	2019-02-22 09:21:51 -08:00
amer cerkic	f04fdb2187	added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user	2019-02-22 09:11:24 -08:00
luiscuenca	3072ca43de	Detailed picking if avatar is not null	2019-02-22 09:24:38 -07:00
Ken Cooke	c1786edc24	Emulate the old behavior of _lastInputLoudness	2019-02-21 18:45:17 -08:00
Anthony Thibault	8785f733db	Merge pull request #14817 from amantley/animSplineIK ... AnimSplineIK node added to inverse kinematics	2019-02-21 17:13:41 -08:00
Anthony Thibault	e54754c4ce	Merge pull request #14926 from luiscuenca/flowCpp ... Cpp implementation of the Flow script	2019-02-21 17:10:05 -08:00
Sam Gateau	ddc42585d8	Cleanup syntax	2019-02-21 16:41:50 -08:00
Sam Gateau	94fc60f285	Bad idea to include global here	2019-02-21 16:34:50 -08:00
amer cerkic	9097d9c57c	working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.	2019-02-21 16:33:25 -08:00
amantley	3bf5c44f98	fixed build warnings	2019-02-21 16:24:46 -08:00
amantley	5cf8a963cd	make spine2 rotation damping only happen in optimized code. the regular code is already damped	2019-02-21 15:41:16 -08:00
Sam Gateau	fe33aadd69	Assigning the default world detail and max render rate target in vr quest	2019-02-21 14:58:06 -08:00
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
amantley	6323f49f26	changed the define variable to HIFI_USE_OPTIMIZED_IK	2019-02-21 14:36:05 -08:00
SamGondelman	544f54e69a	fix model scale	2019-02-21 14:10:36 -08:00
Roxanne Skelly	258e80237e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-21 11:54:47 -08:00
amantley	afed0b5442	review changes	2019-02-21 11:08:29 -08:00
Shannon Romano	f9e5ee0185	Merge pull request #14970 from danteruiz/quest-no-keyboard ... Case 21335: Use old tablet keyboard for quest	2019-02-21 10:34:53 -08:00
SamGondelman	4fdf556d5d	fix billboard mode in secondary camera	2019-02-21 10:29:21 -08:00
Angus Antley	b6bc467f4b	added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel	2019-02-21 06:42:55 -08:00
amantley	f8a74efdc2	fixed build errors from jenkins	2019-02-20 17:59:45 -08:00
amantley	27bfe2f0fe	changed name of pre processor variable	2019-02-20 15:14:12 -08:00
Roxanne Skelly	8c058f147e	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-20 14:24:47 -08:00
Roxanne Skelly	dca166f821	Stand-alone Optimized Tagging - Add tagging for GOTO User Stories	2019-02-20 14:23:54 -08:00
Dante Ruiz	bf8c671cd6	keyboard setting	2019-02-20 13:38:20 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
Brad Davis	79369a0c83	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-20 10:40:49 -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
John Conklin II	97c7b01005	Merge pull request #14965 from danteruiz/stylus-pick-perf ... Case 21255: PickManager performance is slow when keyboard mallets are enabled	2019-02-20 10:11:33 -08:00
Brad Davis	817c24dd0b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-20 09:51:03 -08:00
Brad Davis	122a246d2d	Fix typo	2019-02-19 17:30: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
Brad Davis	518e480a8b	Fix plugin activation	2019-02-19 17:00:50 -08:00
SamGondelman	6765268998	Merge remote-tracking branch 'upstream/master' into wearables	2019-02-19 16:52:00 -08:00
luiscuenca	04e57d0dd1	No Rig pointer on Flow class, solve network animations and fixed bug	2019-02-19 17:45:46 -07:00
danteruiz	6bdf51a460	limit number of include items for mallets	2019-02-19 16:25:38 -08:00
danteruiz	d1c46e1cdc	fixing tablet pointer issues	2019-02-19 14:48:17 -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
Brad Davis	d60dcb99d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-19 12:37:30 -08:00
Roxanne Skelly	d957b38f10	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-19 12:34:10 -08:00
SamGondelman	2986ca20c5	Merge remote-tracking branch 'upstream/master' into pal	2019-02-19 11:31:40 -08:00
John Conklin II	d7a5c0bb4f	Merge pull request #14947 from SamGondelman/overlayClick ... Case 21291, Case 21292, Case 21293: Working on overlay bugs	2019-02-19 11:01:19 -08:00
John Conklin II	1348baecc7	Merge pull request #14935 from SamGondelman/matEntity ... Case 20920: Move Material Entity logic to render thread	2019-02-19 10:59:51 -08:00
John Conklin II	0f8c36156b	Merge pull request #14952 from SamGondelman/textColor ... Case 21305: Fix text overlay color property	2019-02-19 10:58:32 -08:00
Howard Stearns	d7d6ff53ca	Merge pull request #14765 from howard-stearns/artist-stocking-inventory ... Case 20657: artist stocking inventory	2019-02-19 10:46:01 -08:00
danteruiz	4bbae1230d	making requested chantges	2019-02-19 10:07:36 -08:00
SamGondelman	927e824610	fix missing color for text overlays	2019-02-18 16:14:07 -08:00
David Rowe	f58a5db0b0	Reorganize JSDoc inheritance for MyAvatar and Avatar	2019-02-19 09:47:51 +13:00
Angus Antley	748368bfda	mid tweak on the wrist and position coeffs	2019-02-17 23:32:52 -08:00
David Rowe	50a1e07ed2	Stub missing MyAvatar, Avatar, and Agent functions and properties JSDoc	2019-02-18 18:32:49 +13:00
SamGondelman	06ac2b291b	attachments and wearables cull with avatar parent	2019-02-17 17:52:10 -08:00
SamGondelman	1163cbea70	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
SamGondelman	85421cd6ee	speed up stylus picks	2019-02-16 21:16:46 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
Angus Antley	70764bc3c4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-15 19:24:30 -08:00
amantley	d78f253d24	code to generate pole vector from theta	2019-02-15 17:43:53 -08:00
Howard Stearns	e9b323a807	fix HFC symbol location at checkout, and the display of unavailable items	2019-02-15 16:56:31 -08:00
danteruiz	b00746c096	Trim picks in use during quest:	2019-02-15 16:24:17 -08:00
SamGondelman	0f33d696d2	trying to fix pal colors	2019-02-15 16:12:36 -08:00
John Conklin II	4520236873	Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor ... Case 21012: Avatar Doctor	2019-02-15 15:43:18 -08:00
Howard Stearns	f16eb1c029	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 15:15:13 -08:00
amantley	36093926d0	added fake android defines for running the new ik on pc	2019-02-15 15:00:39 -08:00
Thijs Wenker	e900d3784b	fixes	2019-02-15 23:58:42 +01:00
SamGondelman	3df231f1e0	it's working!	2019-02-15 14:43:22 -08:00
John Conklin II	09d8221582	Merge pull request #14834 from gcalero/connection_failure_dialog ... Case 20936: Set message dialog text width so wrap mode takes effect	2019-02-15 14:16:02 -08:00
Brad Davis	578bc4fc89	Suppress logspam with missing Controller in QML	2019-02-15 14:15:24 -08:00
ingerjm0	c8791841de	Merge pull request #14918 from ctrlaltdavid/M21128 ... Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc	2019-02-15 14:15:13 -08:00
Brad Davis	78be935e1a	Consolidating differences from master	2019-02-15 14:12:37 -08:00
Brad Davis	4409e59682	Add per-android-app preprocessor macros	2019-02-15 14:11:26 -08:00
Roxanne Skelly	a82385200e	Merge pull request #14906 from roxanneskelly/QmlMarketplace ... Qml marketplace - multiple improvements/bugfixes	2019-02-15 14:04:47 -08:00
John Conklin II	b9356e22d8	Merge pull request #14927 from huffman/fix/hide-asset-browser ... Case 16349: Fix asset browser being hidden in incorrect way on server switch	2019-02-15 13:32:27 -08:00
SamGondelman	c92b82e744	merge with master	2019-02-15 12:43:30 -08:00
Roxanne Skelly	2c4f485079	QmlMarketplace invert arrow direction on sort.	2019-02-15 12:31:01 -08:00
Thijs Wenker	74ce98a075	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor	2019-02-15 20:57:20 +01:00
Thijs Wenker	556a55ff16	Better scale and texture checks	2019-02-15 20:55:27 +01:00
SamGondelman	87ab255115	finish moving materials to rendering	2019-02-15 11:49:20 -08:00
Brad Davis	a5f84ab51a	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 11:37:13 -08:00
Roxanne Skelly	fb524f8900	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-15 11:35:06 -08:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Roxanne Skelly	be98fb1ac7	Standalone Tags - checkpoint	2019-02-15 11:21:40 -08:00
SamGondelman	25b31cfc72	merge with master	2019-02-15 11:08:24 -08:00
Howard Stearns	490ef3542e	update for marketplace-in-qml, and make specific to username	2019-02-15 10:58:09 -08:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
amantley	d6dfaacf6f	adding ifdef for android os	2019-02-15 10:35:25 -08:00
Brad Davis	0b171ffe13	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 10:31:04 -08:00
Howard Stearns	8a6f2b221b	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 09:47:18 -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
Howard Stearns	30c0dda9ed	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 09:27:48 -08:00
Simon Walton	748747da2d	Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist ... Case 19724: If sorting PAL by loudness re-sort upon loudness updates	2019-02-15 09:24:34 -08:00
luiscuenca	c966f71cb1	More fixes	2019-02-15 10:17:37 -07:00
luiscuenca	98c321c718	Fix warnings	2019-02-15 09:40:49 -07:00
amantley	425413419a	fixed merge conflict in avatar.h	2019-02-15 08:26:54 -08:00
Angus Antley	382a03929e	changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint	2019-02-15 07:06:43 -08:00
Ryan Huffman	ab5c4a927b	Fix asset browser being hidden in incorrect way on server switch	2019-02-14 22:18:42 -08:00
luiscuenca	624a53449f	Merge branch 'master' into flowCpp ... # Solved Conflicts: # interface/src/avatar/MyAvatar.cpp	2019-02-14 18:55:43 -07:00
luiscuenca	88eae0f2ec	Remove test functions	2019-02-14 18:49:49 -07: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
luiscuenca	3e66bce112	set useFlow function	2019-02-14 18:30:37 -07: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
Sam Gateau	969c62d0df	Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac ... Case 21157: Fix Desktop.qml crash on local mac build	2019-02-14 12:15:50 -08:00
Sam Gateau	384d4fb959	Merge pull request #14809 from highfidelity/commandLineAndroid ... case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…	2019-02-14 12:10:08 -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
Roxanne Skelly	ab1a691dc9	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-02-14 10:22:07 -08:00
Thijs Wenker	3026fd625a	Avatar Doctor	2019-02-14 18:52:50 +01:00
Roxanne Skelly	20d7e00ea8	Standalone Tags - Checkpoint	2019-02-14 08:48:37 -08: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
danteruiz	562e159ab4	the proper fix for browser qml issues	2019-02-13 10:45:07 -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
Shannon Romano	07a92aea95	Merge pull request #14894 from AndrewMeadows/update-collision-group-after-grab ... Case 21093: recompute collision group/mask when Grab ends	2019-02-12 17:31:43 -08:00
danteruiz	a111aa1724	fix blocks app	2019-02-12 16:45:45 -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
Shannon Romano	10e5e9e0c3	Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix ... Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 15:02:28 -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	7e643fcc19	Merge pull request #14893 from SimonWalton-HiFi/inventory-confirmation-message ... Adjust Inventory's send-to-trash confirm message	2019-02-12 14:04:10 -08:00
luiscuenca	954cac907d	Other avatars after update and mod timer when active	2019-02-12 15:02:56 -07:00
Dante Ruiz	5e9b63b352	fix-qml-crash-on-mac	2019-02-12 13:56: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
Andrew Meadows	3ea6241cc9	send update for AvatarEntity on deleteGrab	2019-02-12 12:50: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
Mark	9d81ace243	Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 09:45:51 -08:00
luiscuenca	942e9ccdfd	Hand collisions working	2019-02-11 18:21:00 -07:00
danteruiz	a7e28f7a66	fix spatially nestable parent overwrite	2019-02-11 17:04:07 -08:00
Simon Walton	73296aa986	Change update rate to 1 Hz	2019-02-11 16:59:18 -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
Cristian Luis Duarte	009f24dda1	Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines	2019-02-11 21:28:31 -03:00
Andrew Meadows	fab3e5e3fd	remember hash of AvatarEntityItemData	2019-02-11 16:13:56 -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
Cristian Luis Duarte	37b5f11489	Merge remote-tracking branch 'origin/master' into connection_failure_dialog	2019-02-11 19:53:11 -03:00
David Rowe	5428bb19dc	Add "Avatar Script" JSDoc API classification	2019-02-12 11:49:49 +13:00
Simon Walton	4f2223ced3	Change max update to 10 Hz	2019-02-11 14:17:55 -08:00
Roxanne Skelly	4f8de7ed0b	Case 21123, Case - marketplace license display has weird crud in it (new qml version)	2019-02-11 12:48:04 -08:00
Roxanne Skelly	a0199c5884	Case 21119, 21120 ... Case 21119 - text filter doesn't change as you type in new (qml) marketplace Case 21120 - text filter doesn't clear in new (qml) marketplace	2019-02-11 12:27:02 -08:00
Simon Walton	44c163b7cc	Tweak inventory-delete message to be more accurate	2019-02-11 10:30:51 -08: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
amantley	822ec1c529	working on the wrist tweak, dampened the spine twist	2019-02-08 17:53:23 -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
Dante Ruiz	3a263dfff5	Merge pull request #14877 from danteruiz/remove-missed-webengine-references ... Case 21079: move missed QtWebEngine references to +webengine directory	2019-02-08 14:17:34 -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
danteruiz	76a56c679a	making requested changes	2019-02-08 10:03:05 -08:00
Cristian Duarte	d034b080f7	Increase min width so texts like protocol mismatch fit and let the OK appear	2019-02-08 14:19:44 -03: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	5681a996a1	Fix meter color gradient, to encourage proper mic levels. ... High levels are now yellow, actual digital clipping sets red indicator light.	2019-02-07 16:33:41 -08:00
Ken Cooke	b04a59af1b	Calibrate meter to encourage hotter mic levels	2019-02-07 16:31:25 -08:00
Ken Cooke	d2abf1a56d	Add "clipping" indicator to audio level meter	2019-02-07 15:52:29 -08:00
Ken Cooke	52aa20b4d5	Add "gated" indicator to audio level meter	2019-02-07 15:47:56 -08:00
Roxanne Skelly	4bbb030ad7	Show only free items when running from the oculus store	2019-02-07 15:34:44 -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
danteruiz	d71fb2a100	moved missed QtWebEngine references to +webengines	2019-02-07 14:57:25 -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
Roxanne Skelly	c775a9b23f	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-07 13:23:59 -08:00
Roxanne Skelly	d04445c244	Qml Marketplace - remove some quest incompatibilities and disable ... links for quest	2019-02-07 13:22:49 -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
Cristian Duarte	babb972d89	Merge remote-tracking branch 'hifi/master' into android_handshake	2019-02-07 14:44:22 -03: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
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
Simon Walton	58d8945aa5	Limit re-sort rate to 2 Hz.	2019-02-06 14:41:27 -08:00
Brad Davis	8b70f1771e	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-06 13:16:22 -08:00
Sam Gateau	9ff9117a34	Merge pull request #14811 from jherico/feature/quest_frame_player ... Case 20884: Quest frame player and Oculus libraries	2019-02-06 13:15:39 -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
Simon Walton	a2da59271d	If sorting PAL by loudness re-sort upon loudness updates	2019-02-06 11:38:48 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -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
amantley	07a4f49c58	adding the armik nodes into the json	2019-02-05 17:21:39 -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
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
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
Roxanne Skelly	364a1698fe	QmlMarketplace - Height of Marketplace Item was improperly calcualted with attributions	2019-02-04 17:24:30 -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	db9b44a71a	QmlMarketplace - The QML Text object has sufficient markup to handle ... all of our needs, so use that instead of webengineview	2019-02-04 15:30:53 -08:00
Roxanne Skelly	78aa1783a0	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-04 15:04:55 -08:00
Roxanne Skelly	e23c589de7	QmlMarketplace - fix issue with footer not appearing in marketplaces list	2019-02-04 15:04:18 -08:00
SamGondelman	934abb3d52	fix keyboard focus and image overlays	2019-02-04 13:33:03 -08:00
Roxanne Skelly	1840f874ab	Add Attributions to Qml Marketplace	2019-02-04 13:29:06 -08:00
SamGondelman	31cf623252	fix keyboard focus	2019-02-04 12:44:04 -08:00
luiscuenca	cf8f9fa1b6	Threads created correctly	2019-02-04 11:28:42 -07:00
amantley	34d32eeda8	removed the extra ikoverlay in the avatar-animation.json	2019-02-04 10:17:22 -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
Roxanne Skelly	39ad36a4d0	QmlMarketplace - bugfixes and Markup rendering of descriptions ... * Render markup in descriptions (bold, italic, quote, etc.) * Back button from marketplaces list now works properly * Layout fixes	2019-02-01 15:27:17 -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
Dante Ruiz	ab6048e922	give tablet root color	2019-02-01 10:20:40 -08:00
Dante Ruiz	f4118213b1	give tablet root color	2019-02-01 10:12:04 -08:00
SamGondelman	0955512a80	add billboard mode to web entities and fix picking/culling	2019-01-31 15:45:10 -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
Gabriel Calero	a1d18feb0a	Set message dialog text width so wrap mode takes effect	2019-01-31 16:30:02 -03:00
Dante Ruiz	9082a3f4e5	to the spot on first launch	2019-01-31 10:58:20 -08:00
Dante Ruiz	778ddad9ac	to the spot on first launch	2019-01-31 10:52:48 -08:00
amantley	ffd374e7d4	whitespace	2019-01-31 10:05:08 -08:00
amantley	f68ee4e7ce	merged with master	2019-01-31 09:56:46 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
amantley	d547d5b854	changed the json reader to take an array not a string for the flex targets	2019-01-30 18:16:02 -08:00
Brad Davis	8a1a55189a	CMake cleanup and modernization	2019-01-30 16:23:14 -08:00
amantley	7a1c1252ff	cleanup	2019-01-30 16:09:10 -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
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
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
Gabriel Calero	6a665835e7	Merge remote-tracking branch 'upstream/master' into android_handshake	2019-01-30 17:06:41 -03:00
amer cerkic	708da45ccc	recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args.	2019-01-30 11:47:06 -08:00
SamGondelman	834e44dd3a	make polyline's with faceCamera not depend on normal	2019-01-30 11:02:24 -08:00
Brad Davis	10a7403d44	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-01-30 10:19:46 -08:00
Jeff Clinton	0def57f2c8	Merge pull request #14805 from danteruiz/fix-qml-rendering ... Case 20902: Give SendAsset.qml a background color	2019-01-30 08:54:03 -08:00
amantley	fb0ad7768c	removed clear map	2019-01-29 17:31:20 -08:00
amantley	e2a729b68b	got the spline working in myskeleton model, need to clean up	2019-01-29 17:25:25 -08:00
Dante Ruiz	ccf02d8b65	fix SendAssets.qml	2019-01-29 17:16:27 -08:00
Roxanne Skelly	0fdbca8ade	QmlMarketplace Bugfixes ... * Fix upgrades * Certificate 'View in Marketplace' wasn't working * command-line hifiapp:MARKET wasn't launching * Home link wasn't disappearing where it should * Log In button on marketplace wasn't working * Other minor UI bugfixes	2019-01-29 16:07:27 -08:00
Shannon Romano	4c4a2036c7	Merge pull request #14791 from SimonWalton-HiFi/pal_username_update ... Don't update PAL namecard with empty strings	2019-01-29 15:41:31 -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
Simon Walton	e45634d4ea	Merge remote-tracking branch 'upstream/master' into pal_username_update	2019-01-29 11:55:39 -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