24711 commits

Author	SHA1	Message	Date
Sam Gateau	9a1e1a001a	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-13 10:00:59 -07:00
Zach Fox	a225a009cd	BUGZ-1233: Remove keyboard shortcut to LoD tools	2019-08-12 11:27:34 -07:00
Sam Gateau	53642763c9	Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse	2019-08-11 21:57:36 -07:00
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
sabrina-shanman	16593ec3c9	Remove invalid deprecated comment	2019-08-09 16:32:31 -07:00
sabrina-shanman	07ea79689e	Fix build warnings	2019-08-09 13:34:55 -07:00
Sam Gateau	fe08609b0c	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-09 11:25:03 -07:00
Brad Hefta-Gaub	555a875405	Merge pull request #16047 from jherico/fix/bugz-1097 ... BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 09:51:38 -07:00
Shannon Romano	1993ff6277	Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2 ... BUGZ-993: Bump minimum threadpool size to 2	2019-08-09 09:20:55 -07:00
Brad Davis	c28d850514	BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 08:13:20 -07:00
sabrina-shanman	99a774c89c	Do not display high viewing distance as 20:0 vision	2019-08-08 13:03:40 -07:00
sabrina-shanman	1571c2be27	Fix LOD math	2019-08-08 13:03:20 -07:00
sabrina-shanman	9c16fcfdef	Make the LOD half angle the definitive LOD variable	2019-08-07 17:23:04 -07:00
Sam Gateau	c01ab954e3	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-07 16:39:11 -07:00
Sabrina Shanman	0728df8a8f	Merge pull request #16025 from sabrina-shanman/picks_debug ... (BUGZ-1059) Improve debug API for picks/pointers	2019-08-07 12:01:26 -07:00
sabrina-shanman	66dbb08b01	Be explicit about pickType/pointerType being returned when getting script parameters	2019-08-07 10:44:43 -07:00
sabrina-shanman	4cb925e973	Fix jsdoc for getPointerScriptParameters	2019-08-07 10:04:44 -07:00
sabrina-shanman	8cde93973d	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
sabrina-shanman	0d5260bccc	More LOD renaming with focus on angles	2019-08-06 16:35:41 -07:00
sabrina-shanman	6db6890bac	Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale	2019-08-06 15:54:28 -07:00
sabrina-shanman	bc3acfa3c0	Clean up and re-name to reflect what uses octreeSizeScale and what uses ... visibilityDistance	2019-08-06 15:46:10 -07:00
Simon Walton	baa586939c	Merge branch 'master' into min_threadpool_2	2019-08-06 14:25:37 -07:00
Shannon Romano	93d5d9bd3f	Merge pull request #15988 from ctrlaltdavid/DOC-98 ... DOC-98, DOC-114: PlatformInfo API changes JSDoc	2019-08-06 13:22:36 -07:00
Shannon Romano	9e0e6f9d5e	Merge pull request #16003 from ctrlaltdavid/DOC-84 ... DOC-84: Update JSDoc with glTF	2019-08-06 13:22:04 -07:00
Shannon Romano	8c981140b0	Merge pull request #16005 from ctrlaltdavid/DOC-61 ... DOC-61: Render API JSDoc	2019-08-06 13:18:17 -07:00
jennaingersoll	f487d094fe	Merge pull request #15959 from ctrlaltdavid/DOC-124 ... DOC-124: Tidy JSDoc from some recent API changes	2019-08-06 11:57:28 -07:00
Shannon Romano	9d3d5b7701	Merge pull request #15992 from hyperlogic/feature/reaction-fixes ... Refined reaction and sitting animations	2019-08-06 09:15:44 -07:00
Sam Gateau	eb616452ec	An afternounwatchign code	2019-08-05 17:54:46 -07:00
David Rowe	1abf0eb207	Merge branch 'master' into DOC-124 ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp	2019-08-06 10:59:50 +12:00
Sam Gateau	3a053c32f4	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 14:26:18 -07:00
sabrina-shanman	30482c2db4	Give the pointer its own copy of the script parameters in case its pick is deleted	2019-08-05 13:36:15 -07:00
David Rowe	f97417932c	Fix typo	2019-08-06 08:08:08 +12:00
David Rowe	419044021b	Merge branch 'master' into DOC-61	2019-08-06 08:03:12 +12:00
Zach Fox	34bc71fba9	Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users	2019-08-05 15:12:29 -04:00
Sam Gateau	d55f143300	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-05 09:49:14 -07:00
Anthony J. Thibault	704a2d2ac9	Merge branch 'master' into feature/reaction-fixes	2019-08-05 09:43:32 -07:00
HifiExperiments	1b84244210	merge with master	2019-08-05 09:35:56 -07:00
sabrina-shanman	64fb046a33	Simplify naming for script functions to get list of picks/pointers	2019-08-05 09:25:32 -07:00
David Rowe	e2748a861a	Merge branch 'master' into DOC-98 ... # Conflicts: # libraries/platform/src/platform/backend/Platform.cpp	2019-08-03 11:22:23 +12:00
sabrina-shanman	20fa78e51d	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
sabrina-shanman	f7c324c017	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
MiladNazeri	ae7b415152	Merge pull request #16008 from HifiExperiments/text ... Supporting text effects + fonts on Text Entities	2019-08-02 14:25:28 -07:00
MiladNazeri	76e9f8896c	Merge pull request #16021 from kencooke/audio-volume-control-persist ... BUGZ-352: Persist the audio volume settings across sessions	2019-08-02 10:34:44 -07:00
Bradley Austin Davis	543f07b6ae	Merge pull request #16018 from jherico/fix/dev-279 ... DEV-279: Add rendering API information to the platform JSON object	2019-08-02 10:16:06 -07:00
Sam	d84bebcc28	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-02 09:36:58 -07:00
Ken Cooke	437d0ea928	Save and restore the audio gain settings	2019-08-02 06:46:34 -07:00
David Rowe	789f9c7d67	Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h	2019-08-02 20:34:09 +12:00
Shannon Romano	2f6d79fb45	Merge pull request #15920 from annabrewer/combine-tone-map-resample ... BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines	2019-08-01 17:39:38 -07:00
Brad Davis	06ad461c32	PR feedback	2019-08-01 16:57:54 -07:00
Brad Davis	bfe42215aa	DEV-279: Add rendering API information to the platform JSON object	2019-08-01 14:29:03 -07:00
Sam	7948fb266e	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-07-31 11:46:09 -07:00
HifiExperiments	7b29f0f718	reduce locking necessary for render updates	2019-07-31 11:21:29 -07:00
humbletim	bad32e9916	remove unnecessary include	2019-07-30 17:33:48 -04:00
Seth Alves	8ec4505b95	add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.	2019-07-30 14:09:32 -07:00
Anna	f58400950a	made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility	2019-07-30 11:57:01 -07:00
Shannon Romano	fe900cf55f	Merge pull request #15991 from jherico/fix/bugz-964 ... BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-30 11:52:58 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
David Rowe	833bbf1cce	Render API JSDoc	2019-07-30 11:36:56 +12:00
David Rowe	ade85ad8c0	Update API JSDoc with glTF	2019-07-30 10:41:07 +12:00
Shannon Romano	f29284198c	Merge pull request #15978 from roxanneskelly/bugz829 ... BUGZ-829 DEV-168 - domain backup/content management improvements	2019-07-29 15:28:49 -07:00
Amer	7bc0ea27d0	Merge pull request #15995 from amerhifi/master ... BUGZ 1029: changing raw pointer to unique pointer with custom deleter	2019-07-29 13:04:58 -07:00
Howard Stearns	b17e796f0f	Merge pull request #15994 from howard-stearns/steam-store-commerce ... steam gets the oculus store commerce treatment	2019-07-29 12:06:29 -07:00
amer cerkic	85fa510d38	addressing comment	2019-07-29 10:28:31 -07:00
Shannon Romano	75146a104d	Merge pull request #15982 from sabrina-shanman/bug_lod_too-low ... (BUGZ-1040) Fix LOD randomly being too low in simplified UI	2019-07-29 09:45:19 -07:00
amer cerkic	b3ea9d0de7	addressing commetn	2019-07-29 09:40:58 -07:00
amer cerkic	854f89cace	addressing comment	2019-07-29 09:39:31 -07:00
amer cerkic	1f4b149f75	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-07-29 09:36:03 -07:00
Sam	767f413a2c	merging the various job/task/switch congif into one	2019-07-29 00:07:16 -07:00
Anna	6a6b2f6d27	added tone mapping back	2019-07-26 18:55:08 -07:00
Anthony J. Thibault	2f949a4d4d	Disable head ik while reacting ... Also, split getReactions() API into two calls * getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction(). * getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().	2019-07-26 15:26:43 -07:00
amer cerkic	de0b038ee1	trunked to a lambda for simplicity	2019-07-26 13:52:38 -07:00
Anthony Thibault	5375e53ecb	Merge pull request #15974 from luiscuenca/avatarSitAPI ... DEV-269: First Class Sitting API	2019-07-26 13:36:00 -07:00
amer cerkic	087b19d64d	removed extra space	2019-07-26 13:15:01 -07:00
amer cerkic	b2e07fd990	changing raw pointer to unique pointer with custom deleter	2019-07-26 13:02:59 -07:00
Howard Stearns	6ef0821801	steam gets the oculus store commerce treatment	2019-07-26 12:44:48 -07:00
Oren Hurvitz	d7ef7a052d	The "Clear Disk Caches" command also deletes the HTTP cache used by QtWebEngine ... Note that this only clears the HTTP cache (used for files), but not the directory used for persistent data such as Cookies, Local Databases, etc. There's no Qt API to do that. Fortunately, this directory should be small.	2019-07-26 15:28:44 +03:00
Oren Hurvitz	dbd9299e85	The "Clear Disk Caches" command also clears the KTX cache (on the next restart)	2019-07-26 10:30:43 +03:00
humbletim	058c81aa1a	Merge branch 'hifi-master' into kpi-v1-modkit-rc	2019-07-26 01:36:52 -04:00
humbletim	d334a2e5e2	QML-only write access for 'private/' Settings keys	2019-07-26 01:32:01 -04:00
Brad Davis	11d7890f48	BUGZ-964: fix for incorrect color curve when rendering 3D into QML	2019-07-25 18:24:53 -07:00
luiscuenca	c1b818cd9b	Set timeout before enabling drive keys	2019-07-25 17:40:09 -07:00
sabrina-shanman	3da5896e22	Bring back lodQualityLevel	2019-07-25 17:16:14 -07:00
sabrina-shanman	94e725dc2a	Fix rare case where script would fail to set LOD after disabling auto LOD	2019-07-25 17:15:28 -07:00
sabrina-shanman	4b5a45209e	Prefer using LODManager.lodAngleDeg for setting manual LOD	2019-07-25 17:15:22 -07:00
Ryan Huffman	ef0977248d	Merge pull request #15986 from huffman/fix/create-not-working-patch ... Fix non-functional Create	2019-07-25 16:17:43 -07:00
David Rowe	0555cf1804	Revisions and typos	2019-07-26 10:50:53 +12:00
David Rowe	bce3e9bd6b	PlatformInfo API JSDoc update	2019-07-26 10:32:19 +12:00
Roxanne Skelly	130e68c9b5	DEV-168 - make interface-installed content sets display info on web ... installed content section	2019-07-25 14:37:41 -07:00
Ryan Huffman	9872c1c2f7	Add missing emit inside of	2019-07-25 13:55:44 -07:00
Howard Stearns	520ba59899	Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown ... BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor	2019-07-25 12:50:07 -07:00
sabrina-shanman	3a4ce44633	On second thought, do not expose default octree size scale	2019-07-24 17:32:25 -07:00
sabrina-shanman	772eb57898	Remove broken/undocumented LODManager script features	2019-07-24 16:43:51 -07:00
sabrina-shanman	9d93a2f502	Fix simplifiedUI stuck on wrong LOD value	2019-07-24 16:27:24 -07:00
amer cerkic	db945851ac	fixed merge conflict	2019-07-24 16:03:23 -07:00
amer cerkic	3315271493	reverting commit:	2019-07-24 15:43:31 -07:00
Anthony Thibault	abeba03a7e	Merge pull request #15975 from huffman/fix/interactive-window-qmlto-script-crash ... BUGZ-1028: Fix qmlToScript getting called on script thread and causing crash	2019-07-24 15:39:25 -07:00
Simon Walton	53cf915e8d	Guard for AudioInjectorManager existance; clear an audio interface pointer	2019-07-24 14:51:41 -07:00
amer cerkic	bea31237b7	addressing comments	2019-07-24 14:30:43 -07:00
Ryan Huffman	c4b63ed5e4	Fix qmlToScript getting called on script thread and causing crash	2019-07-24 13:44:20 -07:00
luiscuenca	8900c4f2cd	stand up to right location-orientation	2019-07-24 13:29:01 -07:00
luiscuenca	6e4d1bde8e	Fix code and warnings	2019-07-24 13:16:53 -07:00
amer cerkic	f94b082946	addressing comment	2019-07-24 11:47:10 -07:00
amer cerkic	ac17493a40	removing comments	2019-07-24 11:37:38 -07:00
amer cerkic	8c022b025d	implementing Dante's change to connect the slots	2019-07-24 11:19:32 -07:00
luiscuenca	015d1951fc	Add sitting clip node	2019-07-24 10:44:33 -07:00
amer cerkic	ddc678bbc0	added interactivewindow proxy. moved event bridge binding to the proxy instead	2019-07-23 16:57:53 -07:00
luiscuenca	e7e864121f	Merge branch 'master' into avatarSitAPI	2019-07-23 14:22:42 -07:00
luiscuenca	9cec979552	Add sit API to MyAvatar	2019-07-23 14:20:54 -07:00
Shannon Romano	266230a53c	Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api ... Initial version of Avatar Reaction API	2019-07-23 13:13:31 -07:00
jennaingersoll	1e84b3f4a2	Merge pull request #15951 from ctrlaltdavid/DOC-122 ... DOC-122: LocationBookmarks JSDoc	2019-07-23 12:00:03 -07:00
David Rowe	8c92f972e5	Merge branch 'master' into DOC-124 ... # Conflicts: # interface/src/scripting/Audio.h	2019-07-23 12:53:35 +12:00
David Rowe	3b2bb65c77	Tidy MyAvatar API's animation debug graphics methods' JSDod	2019-07-23 12:42:41 +12:00
David Rowe	6b80a27258	Tidy Audio API's gain properties etc. JSDoc	2019-07-23 11:26:48 +12:00
Shannon Romano	4f922e350e	Merge pull request #15913 from ctrlaltdavid/DOC-102 ... DOC-102: Overlays JSDoc Update	2019-07-22 16:24:53 -07:00
Shannon Romano	1594e25c4e	Merge pull request #15950 from ctrlaltdavid/DOC-121 ... DOC-121: AvatarBookmarks JSDoc	2019-07-22 15:43:57 -07:00
David Rowe	1e8a205275	Fix typo	2019-07-23 10:30:10 +12:00
Shannon Romano	6d0ba98bfc	Merge pull request #15953 from ctrlaltdavid/DOC-123 ... DOC-123: AvatarInputs JSDoc	2019-07-22 15:21:50 -07:00
Shannon Romano	d719952022	Merge pull request #15946 from AndrewMeadows/avoid-nan-scriptedMotor ... BUGZ-870: MyAvatar's scripted motor needs to filter against NaN input	2019-07-22 15:06:35 -07:00
David Rowe	a36bcbb2ed	Doc review	2019-07-23 07:36:11 +12:00
David Rowe	ddffb8ab9a	Doc review	2019-07-23 07:25:34 +12:00
jennaingersoll	abe1ce288c	Merge pull request #15926 from ctrlaltdavid/DOC-115 ... DOC-115: Comfort mode JSDoc	2019-07-22 10:46:11 -07:00
David Rowe	6d7b6f3e0a	AvatarInputs JSDoc	2019-07-20 10:19:22 +12:00
David Rowe	3a3bfd1463	Doc review	2019-07-20 09:39:34 +12:00
David Rowe	0a32386f45	Merge branch 'master' into DOC-102	2019-07-20 09:13:52 +12:00
Zach Fox	d62dde1ab8	Merge pull request #15952 from zfox23/setShowBubbleToolsCorrection ... Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:51:59 -07:00
Zach Fox	510c922912	Fix BUGZ-1062: Set the correct Settings value for bubble tools	2019-07-19 11:34:14 -07:00
David Rowe	9165a04641	Typo and improvement	2019-07-19 11:41:12 +12:00
David Rowe	c2b67f28d0	LocationBookmarks JSDoc	2019-07-19 11:35:06 +12:00
David Rowe	cf9e563458	Miscellaneous JSDoc fixes noticed in passing	2019-07-19 08:37:10 +12:00
David Rowe	a04da70f16	AvatarBookmarks JSDoc	2019-07-19 08:36:45 +12:00
Andrew Meadows	dcf3df68f2	avoid NaN input for MyAvatar's scripted motor	2019-07-18 10:58:41 -07:00
Andrew Meadows	7b7414dead	revert optimization that would skip read from packet	2019-07-17 17:04:12 -07:00
Anthony Thibault	ecae92724e	Added reaction api	2019-07-17 14:28:39 -07:00
Andrew Meadows	63b3d666f9	simplify rollover logic for SafeLanding sequence size calculation	2019-07-17 13:57:08 -07:00
Andrew Meadows	b0f297e696	wait for SafeLanding to start before starting octreeQuery	2019-07-17 11:22:01 -07:00
Andrew Meadows	05d896f3de	fix SafeLanding failure mode when first sequence number not 0	2019-07-17 11:22:01 -07:00
Shannon Romano	d49fabf370	Merge pull request #15932 from SimonWalton-HiFi/remove-orb-on-kill ... BUGZ-781: Remove loading-orb upon killing of avatar	2019-07-16 15:31:37 -07:00
dante ruiz	e896a53113	fix interactive crash	2019-07-15 17:18:38 -07:00
Shannon Romano	3f7e5a48bb	Merge pull request #15533 from sethalves/squeeze-vision-while-moving ... Case 21663: comfort mode	2019-07-15 14:54:31 -07:00
Simon Walton	e259aa55c2	Remove loading-orb upon killing avatar, in case destructor isn't called	2019-07-15 14:14:24 -07:00
Shannon Romano	a64bc7f638	Merge pull request #15761 from danteruiz/fix-interactive-window-crash ... BUGZ-400: Crash in Application::notify	2019-07-15 11:35:15 -07:00
Shannon Romano	7ea8675e83	Merge pull request #15919 from howard-stearns/mac-sleep-monitor ... Mac sleep monitor	2019-07-15 08:39:19 -07:00
Shannon Romano	09729fb430	Merge pull request #15918 from zfox23/newGraphicsSettings ... New Settings -> Graphics... dialog for Classic UI users	2019-07-15 08:38:01 -07:00
Shannon Romano	1bc72a86da	Merge pull request #15911 from amerhifi/bugz-968 ... case Bugz-968 adding a null check to the display plugin. Possible that display plug…	2019-07-15 08:35:29 -07:00
Shannon Romano	8ce64d95ab	Merge pull request #15880 from AndrewMeadows/fix-safe-landing-redux ... BUGZ-863: wait for objects to be added to physics before completing SafeLanding	2019-07-15 08:34:17 -07:00
kasenvr	e9e9607a3b	modkit core changes initial commit ... whitespace corrections + warnings updated cmake plugin rework with focus on JS API integration example cleanup edit_filter scope separate-out edit_filter wantsScope stuff -plugin metadata split scriptengines out separately cleanup __url/__filename sets additional cleanup fix typo; consolidate ScriptInitializerMixin inits add more example API protoypes cleanup pass; fix entity_server / agent init fix whitespace remove technically unnessary plugin filtering +EDIT_FILTER_SCRIPT; cleanup reorder public/slot/private use std::count_if formatting better debug output; cleanup fix msvc compiler warning cleanup eradicate QtScript references from API Example updated header comments Updated KasenAPIExample	2019-07-14 21:35:13 -04:00
David Rowe	8a82ea55c7	HMD API vision squeeze properties JSDoc	2019-07-13 10:39:40 +12:00
dante ruiz	d78661a47f	redo requested work	2019-07-12 13:34:08 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
amerhifi	ba6307e8e4	revert of extra space	2019-07-12 10:55:44 -07:00
amerhifi	f78c1cb5d0	reverting display plugin reset change	2019-07-12 10:54:08 -07:00
Howard Stearns	7ce6dd71d5	fix comment	2019-07-12 10:48:05 -07:00
Simon Walton	33494d7477	Bump minimum threadpool size to 2	2019-07-12 10:30:52 -07:00
Shannon Romano	74b830dd12	Merge pull request #15912 from SimonWalton-HiFi/early-rsa-keygen ... BUGZ-918: Generate RSA key-pair early in start-up	2019-07-12 09:42:11 -07:00
Shannon Romano	3e70f4f51c	Merge pull request #15671 from SamGondelman/uber ... DEV-203, BUGZ-978: Condense all redundant shader variants using new slp defines feature and add Haze to Forward renderer	2019-07-12 09:39:33 -07:00
Seth Alves	9baf4c7078	comfort mode -- squeeze vision to avoid sickness	2019-07-12 09:14:17 -07:00
howard-stearns	cc7214fca3	cleanup	2019-07-11 16:56:35 -07:00
Dante Ruiz	2f74f8253f	finishing requested changes	2019-07-11 15:39:59 -07:00
howard-stearns	2eb3fdb1ec	Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor	2019-07-11 14:35:00 -07:00
amer cerkic	15e7663ed5	removing the destroy call since its not necessary	2019-07-11 14:27:41 -07:00
SamGondelman	22a7a97a9a	fix forward web + parabola blending	2019-07-11 12:23:04 -07:00
amer cerkic	efccd10a65	adding a destroy call to hmd scripting interface to ensure that it does not call isHmd mode on already dead display plugin. Also moved displayplugin reset below ui destroy calls to make sure it does not get called after its been destroyed	2019-07-11 12:15:15 -07:00
PrestonB1123	07c71cbadb	disabled P shortcut and re-enabled in metaverse	2019-07-11 12:05:15 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
howard-stearns	8d3dc52ac0	mac sleep monitor checkpoint	2019-07-11 10:58:31 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
David Rowe	2cb3425740	Merge branch 'master' into DOC-102	2019-07-11 16:38:23 +12:00
David Rowe	a45d8924fa	Miscellaneous minor JSDoc fixes noticed in passing	2019-07-11 16:31:09 +12:00
David Rowe	46c81b268a	Typos and inconsistencies	2019-07-11 16:29:56 +12:00
David Rowe	e1f181e8ee	Update Overlays events and signals JSDoc	2019-07-11 16:15:24 +12:00
David Rowe	42bee63f52	Update Overlays methods JSDoc	2019-07-11 15:33:45 +12:00
dante ruiz	c4a0b39068	requested changes	2019-07-10 17:56:54 -07:00
Simon Walton	645a99c200	Generate RSA key-pair early in start-up	2019-07-10 17:36:25 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Amer	4c145386e5	Merge pull request #15899 from amerhifi/bugz-907 ... Case bugz-907: On launch default to non hmd device	2019-07-10 16:03:29 -07:00
Andrew Meadows	1a5a925a4c	fix a typo	2019-07-10 14:18:34 -07:00
amer cerkic	e463a828ef	removed extra line	2019-07-10 14:09:51 -07:00
amer cerkic	bc51b8e709	removed extra space	2019-07-10 14:08:20 -07:00
amer cerkic	fc21f6088a	undoing code structures changes to else blocks	2019-07-10 14:07:10 -07:00
dante ruiz	7c024b4e8a	fix interactive window crash	2019-07-10 11:49:36 -07:00
Shannon Romano	f235778a6e	Merge pull request #15866 from huffman/feat/override-default-scripts ... DEV-164: Add defaultScriptsOverride option	2019-07-10 10:16:55 -07:00
Andrew Meadows	2da0714e36	comments and more readable code	2019-07-09 15:51:56 -07:00
Andrew Meadows	1bfd5386a9	restore entity->requestRenderUpdate() in SafeLanding::updateTracking()	2019-07-09 15:51:56 -07:00
Andrew Meadows	520c62f6f6	wait for objects added to physics before stop SafeLanding	2019-07-09 15:51:56 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
SamGondelman	bd2003fa01	Merge remote-tracking branch 'upstream/master' into uber	2019-07-09 13:45:14 -07:00
RebeccaStankus	169b15c985	Merge branch 'master' of github.com:highfidelity/hifi into createAgain	2019-07-09 13:03:08 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
amer cerkic	09ecb49e5b	--no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd	2019-07-09 11:39:42 -07:00
amer cerkic	45b339a6c7	removing comment	2019-07-09 09:35:58 -07:00
amer cerkic	d04a06e757	changing the default fallback to non hmd device	2019-07-09 09:33:44 -07:00
Howard Stearns	7aef864d7f	Merge pull request #15898 from howard-stearns/log-windows-wakeup ... log wakeup (on client and report to DS) during connection on Windows	2019-07-09 09:29:57 -07:00
Amer	749a78680d	Merge pull request #15877 from amerhifi/bugz-690 ... case BUGZ-690 & BUGZ382 : adding a null check escape to the activeItem. On right click back to …	2019-07-09 09:17:30 -07:00
SamGondelman	41e8a08484	Merge remote-tracking branch 'upstream/master' into uber	2019-07-08 23:00:36 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Howard Stearns	335119cb58	log wakeup (on client and report to DS) during connection on Windows	2019-07-08 16:50:36 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Shannon Romano	31582cf857	Merge pull request #15887 from sethalves/set-default-gl-format ... BUGZ-926: use the correct gl format when creating the initial platform window	2019-07-08 14:03:43 -07:00
Jamil Akram	aa82c4e971	Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements ... Idles talks locomotion improvements	2019-07-08 13:30:51 -07:00
amerhifi	84055a6f0d	adding focus back on _glWidget	2019-07-08 11:12:50 -07:00
amer cerkic	386d945eeb	Merge branch 'master' into bugz-690	2019-07-08 09:28:28 -07:00
David Rowe	9f4c657bc3	Update Overlays properties JSDoc	2019-07-06 12:12:33 +12:00
Sam Gateau	b4e86741e0	Adress typo in gpuident and add extra checks on the recommended scale value	2019-07-06 01:13:38 +02:00
Seth Alves	708979a30c	use the correct gl format when creating the initial platform window	2019-07-05 10:48:57 -07:00
Sam Gateau	11f036246e	Implement the ppi scaling in sync with the platform tier	2019-07-05 17:52:44 +02:00
Samuel Gateau	6ef652038b	EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed	2019-07-05 16:15:19 +02:00
Shannon Romano	ab376d59db	Merge pull request #15865 from ctrlaltdavid/DOC-105 ... DOC-105: Pointers JSDoc revision	2019-07-04 12:02:52 -07:00
David Rowe	8fb83e98be	Doc review.	2019-07-04 20:02:42 +12:00
SamGondelman	8b9fcd43b1	merge with master	2019-07-03 17:58:23 -07:00
amer cerkic	9384c5b3a3	testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window	2019-07-03 16:02:56 -07:00
Sam Gondelman	00441f1899	Merge pull request #15875 from SamGondelman/load ... BUGZ-910: Return entity load priority operator to proper state after safe landing	2019-07-03 14:20:03 -07:00
amer cerkic	e429b7a1e2	Merge branch 'master' into bugz-690	2019-07-03 14:00:27 -07:00
amer cerkic	39fd16fc9e	adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item	2019-07-03 11:05:38 -07:00
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
Amer	f97cde46bf	Merge pull request #15868 from amerhifi/bugz-103 ... case BUGZ-103: HMD Mouse rendering	2019-07-03 09:17:23 -07:00
David Rowe	c70d2c006f	Revise organization of Overlays types and properties JSDoc per Entities	2019-07-03 14:25:11 +12:00
Anna	75c5a99ee2	removed secondary camera tone mapping compensation during 360 screenshot	2019-07-02 17:59:30 -07:00
SamGondelman	4973563c20	return entity load priority operator to proper state	2019-07-02 16:29:19 -07:00
amer cerkic	75beb95a97	Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse.	2019-07-02 10:31:31 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Ryan Huffman	d29cd796ca	Add defaultScriptsOverride option	2019-07-01 23:51:34 -07:00
David Rowe	5c29eb04b3	Typo	2019-07-02 16:19:32 +12:00
David Rowe	c6fd726111	Typos etc.	2019-07-02 16:12:47 +12:00
David Rowe	b7e92e0994	LaserPointers API JSDoc update	2019-07-02 16:12:47 +12:00
David Rowe	e109c8f6d3	Picks and RayPick API JSdoc updates per Pointers API JSDoc	2019-07-02 16:12:47 +12:00
David Rowe	f2cf3bd05c	Revise Pointers API JSDoc	2019-07-02 16:12:47 +12:00
Anthony Thibault	6c66f5a37b	Fix for DependencyManager crash on shutdown on Mac ... On Mac, it is possible to crash when shutting down, it is not clear if this is due to shutting down the app on another thread during logout or something that can happen during normal shutdown, because it is so difficult to reproduce. However, from looking at the stack traces it is possible for a [NSApplication terminate:] event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning() This causes AppKit to invoke the static destructors too early. Which in turn, causes the DependencyManager destructor to fire while there are still many dependencies running. Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown in an incorrect order. To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible, in the Application destructor. Theoretically, this will be a safe time for the static destructors to be invoked, because it is after all of the DependencyManager's dependencies have been manually destroyed. However, this is only a speculative fix, because this is so difficult to reproduce.	2019-07-01 17:37:57 -07:00
Andrew Meadows	4bbfd7cad1	more correct bounding sphere around avatar for SafeLanding query	2019-07-01 15:53:42 -07:00
Andrew Meadows	0d8fdf51c5	fix safe landing to load proper set of objects	2019-07-01 14:18:19 -07:00
Zach Fox	73db19464f	DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 11:28:48 -07:00
Shannon Romano	89f654175c	Merge pull request #15856 from PrestonB1123/defaultShortcuts ... DEV-173: Re-enable shortcuts	2019-06-28 15:29:53 -07:00
Preston Bezos	1315677aec	fixed doc and removed log spam	2019-06-28 15:02:33 -07:00
Preston Bezos	d1470d3323	readded ctrl+n and ctrl+b as shortcuts with a default script	2019-06-28 14:33:03 -07:00
Shannon Romano	7ff751567b	Merge pull request #15848 from jherico/fix/dev-175-source ... DEV-175: QML content URL validation, whitelist trusted sources	2019-06-28 14:18:56 -07:00
Sabrina Shanman	0b6dfe3f7c	Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood ... BUGZ-868: Avoid SafeLanding signal-slot connection resource leak	2019-06-28 13:29:31 -07:00
Brad Hefta-Gaub	8082ff8529	Merge pull request #15850 from zfox23/PTTAttenuationOption ... BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-28 11:08:11 -07:00
Brad Davis	e3393a8ee5	Apply URL validation to top level window QML	2019-06-28 10:43:03 -07:00
Shannon Romano	67901166ba	Merge pull request #15851 from ctrlaltdavid/DOC-79 ... DOC-79: Entities JSDoc Update - Doc Review	2019-06-28 10:12:05 -07:00
Zach Fox	5cc6efc831	CR feedback	2019-06-28 09:07:58 -07:00
David Rowe	2d6d3eb4fe	Doc review	2019-06-28 17:05:36 +12:00
Brad Davis	8bcde84d89	Disable remote QML unless whitelisted	2019-06-27 16:37:56 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Andrew Meadows	0bec2bca83	OctreePacketProcessor should process packet even when no SafeLanding	2019-06-27 14:44:23 -07:00
Zach Fox	7c189d46f2	BUGZ-363: Remove 20dB output attenuation during PTT	2019-06-27 13:28:29 -07:00
Andrew Meadows	bf068a3211	fix SafeLanding start/stop on entity-server connection flow	2019-06-27 11:33:51 -07:00
Andrew Meadows	dfb7ac7044	name changes and improved flow for SafeLanding logic	2019-06-27 08:14:34 -07:00
Andrew Meadows	00185ee82e	cleaup to help unravel one spaghetti strand	2019-06-26 17:05:44 -07:00
Andrew Meadows	496a7f3608	less cruft, more readable	2019-06-26 16:02:00 -07:00
Andrew Meadows	46b3d84be5	remove unused cruft	2019-06-26 15:41:50 -07:00
Andrew Meadows	355de0e6d5	move Application::setFailedToConnect() to cpp for easier debugging	2019-06-26 15:41:01 -07:00
Andrew Meadows	c96b704a28	avoid dupe connections and teardown old connections	2019-06-26 15:38:59 -07:00
SamGondelman	5937a219dd	wait on thread pool threads	2019-06-26 15:25:17 -07:00
dooglifeSF	9f8d1dd51d	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-26 09:31:23 -07:00
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
Sam Gateau	48f9c33bdd	Merge pull request #15822 from samcake/yellow ... BUGZ-664: Introduce scaling of rendering for forward renderer	2019-06-25 14:27:17 -07:00
Sam Gateau	768dd051aa	Add sanity check for viewport resolution scale to avoid negative value	2019-06-25 11:54:50 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
David Rowe	b2b7a6ae99	Merge branch 'master' into DOC-79	2019-06-22 12:11:22 +12:00
Sam Gateau	7bf2c5fc8e	Simplify the setting name	2019-06-21 16:22:01 -07:00
Sam Gateau	35d7211aca	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-21 11:38:33 -07:00
Sam Gateau	a856fdb3ca	getting rid of the resolution Scale on the display plugin	2019-06-21 10:36:25 -07:00
amer cerkic	67e42148ef	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-06-21 09:43:33 -07:00
Sam Gateau	69bb9ac0b6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-20 22:23:15 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
Anthony Thibault	64a77d07e0	Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix ... Disable handTouch.js to prevent finger twitching	2019-06-20 17:03:39 -07:00
Anthony J. Thibault	3a6d8dc383	Disable handTouch.js to prevent finger twitching ... This PR disables handTouch.js. handTouch.js allows the fingers to animate on the surface of an object. However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them. We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality. Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range. This can cause the fingers to bend incorrectly for a moment. Also, three new items were added to the Developer > Show Animation Stats panel. * Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls. * Flow: displays if flow is active of disabled. * Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled. https://highfidelity.atlassian.net/browse/BUGZ-154	2019-06-20 15:52:36 -07:00
amer cerkic	1218f7e014	moved audioclient stop to dtor	2019-06-20 15:10:21 -07:00
Andrew Meadows	cd9b450475	re-expose mic and camera to disable crash	2019-06-20 15:03:15 -07:00
dooglifeSF	12b7cb0262	merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-20 09:01:59 -07:00
Sam Gateau	b5e4a47375	Proper allocation of the resource in forward and starting to remove the ui as we have it	2019-06-19 17:33:26 -07:00
Sam Gateau	b2631e89e9	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-19 17:11:20 -07:00
Sam Gateau	8f04eaae1d	Merge branch 'master' of github.com:highfidelity/hifi into wall	2019-06-19 16:53:04 -07:00
Sam Gateau	53094ef70c	One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls	2019-06-19 16:52:33 -07:00
jennaingersoll	150ae31a88	Merge pull request #15748 from ctrlaltdavid/DOC-85 ... DOC-85: Revise new MyAvatar signals' JSDoc	2019-06-19 15:16:46 -07:00
dooglifeSF	4be42a4b9b	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-19 09:57:04 -07:00
David Rowe	72fdbc0aa8	Entity information and manipulation	2019-06-19 10:18:48 +12:00
Sam Gateau	f30eb919c7	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-18 11:24:04 -07:00
Anthony Thibault	10dae7e4d9	Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement ... Improvement to Developer > Avatar > Draw Animation	2019-06-18 10:50:46 -07:00
dooglifeSF	ae2c381aaa	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-18 09:42:18 -07:00
dooglifeSF	55524ec815	Set debug text lit time to 20 (again) and move 2 break statements out of comment to fix exception in debug	2019-06-18 09:39:06 -07:00
Anthony J. Thibault	4b5d5062b1	Improvement to Developer > Avatar > Draw Animation ... This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug. Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.	2019-06-17 14:50:19 -07:00
Andrew Meadows	ce96ea5bf8	more correct rebuild OtherAvatar detailed pickable shapes	2019-06-17 11:20:42 -07:00
dooglifeSF	1c1807a80c	Merge branch 'master' into idles_talks_locomotion_improvements	2019-06-17 10:44:11 -07:00
dooglifeSF	51b5f6093a	locomotion and idles bug fixes, json updated with correct values, AnimStats.cpp on screen debug text timeout pushed to 20 seconds	2019-06-17 08:58:15 -07:00
David Rowe	351bb3b934	Fix JSDoc naming of some Test API functions	2019-06-15 10:44:55 +12:00
Sam Gateau	c0d64ce4e2	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 18:43:34 -07:00
Sam Gateau	4ba34f9a85	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-13 17:42:52 -07:00
Sam Gateau	5288314d02	Drafting ways to rescale in forward	2019-06-13 17:42:32 -07:00
Seth Alves	431ff0d1de	fix drawcalls stat broken in pr-15721	2019-06-13 15:35:08 -07:00
Shannon Romano	b4f708f4ad	Merge pull request #15755 from samcake/nut ... BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now	2019-06-13 14:32:36 -07:00
Shannon Romano	a37ce9f89d	Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512 ... BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit	2019-06-13 12:13:04 -07:00
luiscuenca	20b17291b4	Reset detailed motion states when the workload zone changes	2019-06-13 09:05:55 -07:00
Sam Gateau	b2feb0f920	Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air	2019-06-12 16:48:36 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
Brad Hefta-Gaub	35cdd19456	Merge pull request #15721 from sethalves/quiet-asan-gpu-stats ... BUGZ-623: Quiet asan gpu stats	2019-06-12 09:02:13 -07:00
David Rowe	29079b9221	Miscellaneous JSDoc improvement	2019-06-12 19:15:29 +12:00
David Rowe	93d42917b0	Revise JSDoc for new MyAvatar signals	2019-06-12 19:15:14 +12:00
Shannon Romano	453085f992	Merge pull request #15741 from huffman/feat/set-and-get-bookmarks ... BUGZ-484: Add --setBookmark and getAddress API	2019-06-11 15:31:41 -07:00
jennaingersoll	1935b49538	Merge pull request #15676 from ctrlaltdavid/DOC-33 ... DOC-33: MyAvatar API JSDoc catch-up	2019-06-11 15:05:06 -07:00
Ryan Huffman	a1b7392854	Add --setBookmark and getAddress API	2019-06-11 14:10:09 -07:00
Seth Alves	cd1c782aa8	fix warning	2019-06-11 12:54:40 -07:00
dante ruiz	01fab12942	fixing interface and laucnher script argument	2019-06-11 09:18:20 -07:00
Zach Fox	b62ab2ea82	Merge pull request #15731 from zfox23/SUI/forwardKeyEvents ... Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-11 07:52:11 -07:00
Zach Fox	9a926abd76	Implement BUGZ-226: Forward keypresses made while Top Bar is in focus	2019-06-10 20:27:03 -07:00
Andrew Meadows	dbce976887	fix another crash in MyAvatar::getAvatarEntitiesVariant()	2019-06-10 15:34:18 -07:00
Sabrina Shanman	2b90d841b7	Merge pull request #15722 from sabrina-shanman/crash_no-display-plugin ... (BUGZ-563) Fix crash using null DisplayPlugin in GraphicsEngine	2019-06-10 14:54:11 -07:00
sabrina-shanman	a400cea040	Fix crash when using null DisplayPlugin in GraphicsEngine during shutdown	2019-06-10 14:00:05 -07:00
Sam Gateau	c39218c1f4	Addressing the review comment about an if else statement syntax	2019-06-10 11:59:09 -07:00
Sam Gateau	32399997b1	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-10 10:52:53 -07:00
Sam Gondelman	53e6e00773	Merge branch 'master' into uber	2019-06-10 10:36:54 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
Shannon Romano	69094aa8f3	Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix ... BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()	2019-06-10 10:12:26 -07:00
Shannon Romano	e213fd6b5e	Merge pull request #15712 from amerhifi/master ... case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef	2019-06-07 18:59:34 -07:00
Ken Cooke	9d57f5ac62	Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed	2019-06-07 18:35:39 -07:00
Sam Gateau	2d9a7f7c4f	Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware	2019-06-07 17:00:37 -07:00
PrestonB1123	059d931d17	Merge pull request #15711 from PrestonB1123/removingShortcuts ... DEV-108: Removed ctrl+b and ctrl+n as shortcuts	2019-06-07 16:26:38 -07:00
amer cerkic	b57e4869c8	removed debug info	2019-06-07 16:26:21 -07:00
amer cerkic	da071abd8b	wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist	2019-06-07 16:25:04 -07:00
Preston Bezos	a0753f6393	removed ctrl+b and ctrl+n as shortcuts	2019-06-07 15:41:44 -07:00
Shannon Romano	e4b26656d4	Merge pull request #15703 from amerhifi/master ... case : BUGZ 560: disabling dde initialization due to random crashes while closing down…	2019-06-07 15:15:46 -07:00
amer cerkic	f2c6cb79f7	if formatting	2019-06-07 14:17:49 -07:00
amer cerkic	049ff8e618	fixed last space	2019-06-07 14:11:13 -07:00
amer cerkic	c61f0bcf3e	more vs cleanup	2019-06-07 14:07:06 -07:00
amer cerkic	64534913af	more vs changes udo	2019-06-07 13:59:18 -07:00
amer cerkic	fd7dd7948f	reverted vs spacing changes	2019-06-07 13:41:14 -07:00
amer cerkic	9498e0a462	addressing comment concerning preferences	2019-06-07 12:47:04 -07:00
Preston Bezos	e89f499c1a	this should work	2019-06-07 12:02:15 -07:00
Preston Bezos	4eccb7a124	Revert "made one more change to get rid of ubuntu warning" ... This reverts commit e7255298de.	2019-06-07 12:00:36 -07:00
Preston Bezos	e7255298de	made one more change to get rid of ubuntu warning	2019-06-07 11:59:26 -07:00
Preston Bezos	27de181d0c	Merge branch 'master' of github.com:highfidelity/hifi into logspam	2019-06-07 11:54:48 -07:00
Preston Bezos	ad562b8f91	really need to stop clanging myself	2019-06-07 11:22:11 -07:00
Preston Bezos	e63d98e137	fixed a couple of doc errors and accounted for some edge cases	2019-06-07 11:09:21 -07:00
Preston Bezos	3ab4be6b8d	I got clanged	2019-06-07 10:42:31 -07:00
amerhifi	b1df463f56	disabling dde initialization due to random crashes while closing down the socket connection on mac	2019-06-07 10:16:36 -07:00
Shannon Romano	1e827a925a	Merge pull request #15699 from SamGondelman/avatarPick ... BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation	2019-06-07 09:59:42 -07:00
Sam Gateau	07ddc535a0	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-07 09:32:50 -07:00
SamGondelman	3bb645b2d7	put avatar spheres in r3 in simulation	2019-06-06 17:17:18 -07:00
Sam Gateau	d406e52d71	Messing around	2019-06-06 16:37:49 -07:00
Sam Gateau	4c18ce7ae6	Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-559) Improve transition debugging and transition clean-up	2019-06-06 16:35:04 -07:00
Preston Bezos	a7a765b025	added a couple more notifies and fixed a couple of jsdocs	2019-06-06 16:23:54 -07:00
Zach Fox	b737e31421	Merge pull request #15696 from zfox23/emitWhenDocking ... Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup	2019-06-06 15:45:32 -07:00
Preston Bezos	36e1366cc4	added Notifies to various QProperties in order to remove warnings in interface logs	2019-06-06 14:51:43 -07:00
Zach Fox	a7ad087bd0	Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup	2019-06-06 14:23:18 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
Sam Gateau	afdc323622	Merge branch 'nut' of github.com:samcake/hifi into nut	2019-06-05 17:56:34 -07:00
Sam Gateau	9bc6c3bfcd	INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings	2019-06-05 17:56:14 -07:00
David Rowe	caf29dc45a	Doc review	2019-06-06 11:24:10 +12:00
David Rowe	6299d38673	Distinguish between Uuid API and Uuid type in JSDoc	2019-06-05 14:39:05 +12:00
David Rowe	f91c6dec3a	Miscellaneous fixes noticed in passing	2019-06-05 08:38:52 +12:00
David Rowe	231d1373b6	Update MyAvatar, Avatar JSDoc per recent changes	2019-06-05 08:38:34 +12:00
Seth Alves	c5eb9c03d5	fix uninitialized read	2019-06-04 13:00:26 -07:00
Seth Alves	06436e6a7d	quiet build warning	2019-06-04 13:00:26 -07:00
Sam Gateau	f51e491d85	Removing the atomics and fixing mistakes pointed out inreview	2019-06-04 10:11:12 -07:00
Sam Gondelman	16a56dc1ec	Merge branch 'master' into proceduralMesh	2019-06-04 09:56:25 -07:00
SamGondelman	6111c8a108	initial work on combining shader variants	2019-06-03 19:36:01 -07:00
Sam Gateau	2a4d0cfaec	Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset	2019-06-03 18:06:28 -07:00
Sam Gateau	db04f61c5b	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-03 09:37:13 -07:00
Sam Gateau	54d1705f06	Testing a different approach	2019-05-31 18:42:26 -07:00
Sam Gondelman	d94b685c94	Merge pull request #15661 from SamGondelman/avatarCrash ... BUGZ-478: Fix address manager crash	2019-05-31 16:01:07 -07:00
Brad Hefta-Gaub	52d02f61a1	Merge pull request #15657 from zfox23/newPerformanceAPI ... BUGZ-447: Use new performance preset API	2019-05-31 15:31:07 -07:00
SamGondelman	e29bf376a4	fix address manager crash	2019-05-31 14:01:58 -07:00
Brad Hefta-Gaub	f7f17cfbff	Merge pull request #15659 from sabrina-shanman/bug_mac_framerate_minimized ... (BUGZ-416) Fix Application not checking window minimize state properly	2019-05-31 13:22:56 -07:00
Zach Fox	97bd0d5413	Make this work!	2019-05-31 12:50:32 -07:00
sabrina-shanman	fa79d0ec18	Fix Application not checking window minimize state properly	2019-05-31 11:36:52 -07:00
Andrew Meadows	297517c85d	minimize lock duration	2019-05-31 11:06:16 -07:00
Andrew Meadows	5f9262cf5e	change data member names to not poke other devs in the eye	2019-05-31 11:03:11 -07:00
Sam Gateau	4e2480d032	cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier	2019-05-31 00:00:44 -07:00
Sam Gateau	916ff31cf6	adjust the preset options	2019-05-30 17:51:21 -07:00
Andrew Meadows	0c916e0c03	guard MyAvatar::_scriptEngine with mutex	2019-05-30 16:08:47 -07:00
Sam Gateau	bb7a182544	Merge branch 'nut' of github.com:samcake/hifi into nut	2019-05-30 12:03:58 -07:00
Sam Gateau	b88deb52b0	Cleaning up the interface for the Performance PRESET and the associated debug ui	2019-05-30 12:03:44 -07:00
Sam Gateau	3100fe4833	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-05-29 19:11:11 -07:00
Sam Gateau	a212a8a36a	COnnect the profile tier to the performance setting and assign on first run or after reset...	2019-05-29 17:49:17 -07:00
Dante Ruiz	b0ace1c098	Merge pull request #15646 from huffman/feat/get-home-bookmark ... DEV-62: Add getHomeLocationAddress to bookmark API	2019-05-29 17:35:40 -07:00
Sam Gateau	48ecb4265c	re declare q_enum on platformProfile	2019-05-29 16:43:28 -07:00
Sam Gateau	2a42fb16da	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-05-29 15:56:30 -07:00
Sam Gateau	bf7617ea8e	INtroducing the PerformanceManager	2019-05-29 15:47:14 -07:00
Ryan Huffman	344410ea79	Add getHomeLocationAddress to bookmark API	2019-05-29 15:45:22 -07:00
Simon Walton	ecc3312114	Use unique_ptr for temp signature array	2019-05-29 12:17:07 -07:00
Sam Gateau	aedc631c45	Gathering all the needed settings in one place	2019-05-28 21:55:17 -07:00
Sam Gateau	0862e40b41	Adding ui to debug render settings	2019-05-28 18:01:39 -07:00
Shannon Romano	24049a4321	Merge pull request #15631 from SamGondelman/questKeyboard ... BUGZ-413: Re-enable Quest 3D Keyboard	2019-05-28 15:55:25 -07:00
Shannon Romano	d065847bee	Merge pull request #15638 from samcake/nut ... case BUGZ-191: Implement patform tier profile from platform description	2019-05-28 15:28:05 -07:00
Sam Gateau	546639fdfe	Adding a script and ui to check the values returned by the PlatformInfo ui	2019-05-26 12:30:50 -07:00
Sam Gateau	5001a04326	Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface	2019-05-25 15:53:54 -07:00
Andrew Meadows	5988f8cce6	avoid calling removeOwnershipData() from multiple threads	2019-05-24 16:12:21 -07:00
amerhifi	5a3585ea5b	adressing pr comments	2019-05-24 14:36:42 -07:00
amerhifi	6f04e039fe	adding whitelisting for dockedWidgets	2019-05-24 14:12:24 -07:00
SamGondelman	41e486b120	re-enable quest keyboard	2019-05-24 13:14:54 -07:00
amerhifi	ee3e2f0dd7	merge master	2019-05-24 11:00:30 -07:00
amerhifi	bd88a68a0f	testing context passing to dockWidget via whitelisting.	2019-05-24 10:58:13 -07:00
Brad Hefta-Gaub	5765957fe1	Merge pull request #15618 from luiscuenca/addCredentials ... Pass tokens as params for automatic login	2019-05-24 09:13:53 -07:00
luiscuenca	050682c84c	Keep logged in after first run	2019-05-23 19:53:37 -07:00
luiscuenca	42c1f4be33	fix typo and entry on first run when --url is set	2019-05-23 17:07:06 -07:00
Andrew Meadows	940c122f46	clear _otherAvatarsToChangeInPhysics after processing it	2019-05-23 13:38:54 -07:00
luiscuenca	8db3d03772	add display name as param	2019-05-23 10:21:47 -07:00
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
luiscuenca	6d824ff22d	Fix logout	2019-05-22 20:27:42 -07:00
Zach Fox	934ea76966	Merge pull request #15613 from zfox23/SUI/newAudioProperties ... Fix the janky audio output settings UI	2019-05-22 16:45:02 -07:00
luiscuenca	206e353264	Pass tokens as params for automatic login	2019-05-22 16:18:30 -07:00
David Rowe	2c591ba196	Doc review	2019-05-23 10:18:03 +12:00
David Rowe	04573da96b	Selection JSDoc revision	2019-05-23 09:51:30 +12:00
Zach Fox	0c90b7c4c2	JSdocs	2019-05-22 14:51:11 -07:00
Zach Fox	3a4bf2e8f7	Fix the janky audio output settings UI	2019-05-22 14:27:06 -07:00
jennaingersoll	38a379cb38	Merge pull request #15605 from ctrlaltdavid/M22528 ... Case 22528: Snapshot JSDoc	2019-05-22 12:27:33 -07:00
jennaingersoll	416e2799ad	Merge pull request #15604 from ctrlaltdavid/M22527 ... Case 22527: Settings JSDoc	2019-05-22 12:08:27 -07:00
David Rowe	a246e40815	Fix taking snapshot example	2019-05-22 14:14:06 +12:00
David Rowe	30da972a14	Snapshot JSDoc	2019-05-22 14:13:42 +12:00
David Rowe	1f3bffca4a	Settings JSDoc polish	2019-05-22 12:08:14 +12:00
Roxanne Skelly	bad421cb59	Fix crash when adding a tracked entity to the safe landing code ... when it's not been fully set up yet.	2019-05-21 16:58:49 -07:00
Shannon Romano	fa7a998cca	Merge pull request #15600 from roxanneskelly/bugz223 ... BUGZ-223 - Physics was not starting in TheSpot-dev	2019-05-21 15:15:16 -07:00
Sam Gateau	98e426ac9f	Merge pull request #15590 from SamGondelman/settings ... BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface	2019-05-21 15:08:02 -07:00
Roxanne Skelly	10db88c07b	Fix ubuntu warning	2019-05-21 12:32:01 -07:00
Anthony Thibault	0e87ab6e55	Merge pull request #15598 from SamGondelman/skeletonModelURL ... BUGZ-283: Fix MyAvatar.skeletonModelURL	2019-05-21 12:05:30 -07:00
Roxanne Skelly	dddb171b52	BUGZ-223 - Physics was not starting in TheSpot-dev ... This was caused by two issues involving the SafeLanding system: * Race condition on domain load The domain is hard-reset twice during typical start, first after login completes, and second, when ice/domain renegotiation occurs Entities added during the first reset caused an add to the safe landing system which, because those adds were queued, possibly happened after the second hard reset. Second, Safe landing checks whether physics is ready on entities before letting physics start. Physics is ready when the entities have a physics shape associated with them if they're static meshes. The physics shape is only generated if the entity is in Region 1 or 2. Safe landing, however, was not checking the region of the entity and was therefore waiting on entities that were not in region 1 or 2	2019-05-21 11:23:04 -07:00
Sam Gateau	54c14340ef	Merge pull request #15597 from amerhifi/master ... Case BUGZ-277 : Android build error (on windows host) stat properties missing (please review suggestion)	2019-05-21 11:11:29 -07:00
SamGondelman	264051ed6d	fix myavatar setSkeletonModelURL	2019-05-21 10:40:58 -07:00
Shannon Romano	8d36b90b8b	Merge pull request #15594 from huffman/feat/appconfig ... DEV-54: Add support for application config	2019-05-21 10:01:19 -07:00
Sam Gondelman	a7842fe3ea	Merge branch 'master' into proceduralMesh	2019-05-21 09:51:33 -07:00
amerhifi	b3285050ed	moving the properties out of the define since the values are going to be the same either way	2019-05-21 09:43:09 -07:00
amerhifi	56d8e0123f	resolving qt moc error with propertie missing for android	2019-05-21 09:19:56 -07:00
Ryan Huffman	d9f164ba3b	Add support for application config	2019-05-20 22:00:26 -07:00
Andrew Meadows	e8b0084fdb	Merge pull request #15588 from sabrina-shanman/bug_myavatar_res-state ... (BUGZ-262) Add debug tool for transitions	2019-05-20 14:31:05 -07:00
SamGondelman	2e666836c7	add more options to render scripting interface	2019-05-20 13:42:53 -07:00
sabrina-shanman	fa7621896a	Add debug icon which shows on render items with transitions	2019-05-20 11:58:01 -07:00
Howard Stearns	5fbb788492	Merge pull request #15582 from howard-stearns/put-DomainServerCheckIn-on-NodeList-thread ... put DomainServerCheckIn on NodeList thread	2019-05-17 16:49:12 -07:00
SamGondelman	3273f46179	fix avatar loading spheres	2019-05-17 15:29:27 -07:00
Howard Stearns	f1e8343b30	put DomainServerCheckIn on NodeList thread	2019-05-17 14:30:30 -07:00
Simon Walton	024dfbf8b7	Merge pull request #15563 from SimonWalton-HiFi/avatar-banner-emissive ... Make avatar-theft banner emissive	2019-05-17 10:03:37 -07:00
David Rowe	4ce2c39d0a	Revise display plugin JSDoc in the Window API	2019-05-17 21:34:36 +12:00
SamGondelman	6d3e23a7fe	merge with master	2019-05-16 20:03:10 -07:00
Sam Gateau	ffbe055fa8	Merge pull request #15569 from SamGondelman/switch ... BUGZ-187: Proper Render Scripting Interface with renderMethod property	2019-05-16 18:29:18 -07:00
SamGondelman	db813fab6a	threadsafe setRenderMethod	2019-05-16 16:48:23 -07:00
SamGondelman	283cc18269	Merge remote-tracking branch 'upstream/master' into proceduralMesh	2019-05-16 16:33:16 -07:00
Brad Hefta-Gaub	1ac1735d55	Merge pull request #14533 from SamGondelman/oculusHome ... Case 22439: Fix HMD auto switch detection	2019-05-16 16:26:04 -07:00
SamGondelman	451c52fa47	merge with master	2019-05-16 16:02:52 -07:00
SamGondelman	fee20d9e46	render scripting interface + renderMethod control	2019-05-16 16:01:21 -07:00
Clément Brisset	d8ac589c36	Merge pull request #15570 from SimonWalton-HiFi/avatar-challenge-guard ... Add guard for Client-challenging Node not connected	2019-05-16 13:57:40 -07:00
Simon Walton	e3e2bbc056	Add guard for challenging Node disappearing	2019-05-16 12:36:54 -07:00
Sam Gateau	6b3707873b	Merge pull request #15562 from jherico/bugz-133 ... BUGZ-133: Expose additional functionality to QML/Scripts	2019-05-16 12:03:22 -07:00
Brad Davis	6a0b479041	Fix warning and build failures	2019-05-16 10:53:29 -07:00
SamGondelman	14c38c0fb0	ಠ⌣ಠ	2019-05-16 10:27:59 -07:00
Brad Davis	9bcc23f0c4	PR comments	2019-05-16 09:40:22 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
Sam Gateau	edbd354760	Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget	2019-05-15 17:57:53 -07:00
Zach Fox	ee9d3d3ae1	Merge pull request #15567 from zfox23/dockedWindowEventBridge ... Fix JS to QML event bridge messages with Docked Windows	2019-05-15 16:28:43 -07:00
Zach Fox	0400bc6da0	Fix JS to QML event bridge messages with Docked Windows	2019-05-15 15:36:28 -07:00
Sam Gateau	04c139c172	Merge branch 'master' of github.com:highfidelity/hifi into coco	2019-05-15 15:01:46 -07:00
Sam Gateau	4e1b01177f	Capping the LOD MAnager target FPS by the refresh rate current rate	2019-05-15 15:01:13 -07:00