Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 09:23:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80254 commits 75 branches 59 tags 1.2 GiB
Commit graph

24308 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Brad Davis
9bcc23f0c4 PR comments 2019-05-16 09:40:22 -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
Brad Hefta-Gaub
4e8d3470d6
Merge pull request #15512 from amerhifi/feature/platform 
case lily-29:  Feature/platform. Creating a single point api to get system info
 2019-05-15 14:04:43 -07:00
Brad Davis
8c375db90f Add display plugin introspection to the window scripting interface 2019-05-15 12:55:47 -07:00
Brad Davis
5db78ef2e1 Add scripting to set the refresh rate 2019-05-15 12:55:25 -07:00
jennaingersoll
559a39be56
Merge pull request #15513 from ctrlaltdavid/M22147 
Case 22147: Desktop, Paths, PlatformInfo, Window, and location JSDoc
 2019-05-15 12:17:12 -07:00
Simon Walton
9f245b07c9 Make avatar-theft banner emissive 2019-05-15 10:03:31 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI 
Simplified UI v1
 2019-05-14 17:45:30 -07:00
Howard Stearns
a9635a2c9a
Merge pull request #15551 from roxanneskelly/queueDepthDebug 
Queue depth debugging code
 2019-05-14 17:32:53 -07:00
Howard Stearns
ee97e2faa1
Merge pull request #15559 from SimonWalton-HiFi/avatar-theft-challenge 
Allow for delayed challenges if salt is empty
 2019-05-14 16:53:12 -07:00
Simon Walton
e768beb9b1 Allow for delayed challenges if salt is empty 2019-05-14 15:53:35 -07:00
David Rowe
997dc963d3 Merge branch 'master' into M22147 2019-05-15 07:59:10 +12:00
David Rowe
d5bb7f25e1 Doc review 2019-05-15 07:56:55 +12:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
amerhifi
fe6b2fceed addressing comment in pr. removing extra space added in previous checkin 2019-05-14 09:39:44 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
amerhifi
a5f4664001 Merge branch 'master' into feature/platform 2019-05-14 09:27:15 -07:00
Shannon Romano
8597a51657
Merge pull request #15556 from jherico/fix/watchdog_spam 
BUGZ-131: Additional silencing of watchdog spam
 2019-05-14 08:10:02 -07:00
amerhifi
2a6dc53395 Merge branch 'master' into feature/platform 2019-05-14 06:18:37 -07:00
Howard Stearns
33f1bd965e
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList 
Call correct NodeList::reset() from Application
 2019-05-13 19:49:41 -07:00
Brad Davis
7d8e14f510 Additional silencing of watchdog spam 2019-05-13 18:19:29 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -07:00
Zach Fox
89006cd9c5 Hide controls in top left; don't remove certain menus; fixup slider UIT 2019-05-13 17:26:19 -07:00
Roxanne Skelly
aa16430cf4 add a comment and kick build servers 2019-05-13 17:25:06 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246 
Case 22246: Picks, PickType, RayPick JSDoc update
 2019-05-13 16:16:17 -07:00
Roxanne Skelly
0319e8cc4d Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-13 16:01:39 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
Simon Walton
305a215d21 Pass a QObject context for the functor 2019-05-13 15:50:04 -07:00
amerhifi
9652d412ac Merge branch 'master' into feature/platform 2019-05-13 15:39:55 -07:00
David Rowe
70ec84177a Doc review 2019-05-14 10:32:28 +12:00
jennaingersoll
712167c623
Merge pull request #15476 from ctrlaltdavid/M22407 
Case 22407: Quat JSDoc update
 2019-05-13 15:17:58 -07:00
Simon Walton
ede8859cc7 Call correct NodeList::reset() from Application 2019-05-13 14:38:34 -07:00
Brad Hefta-Gaub
51f2d1748e
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state 
(BUGZ-40) Check for possible avatar fade race condition
 2019-05-13 13:41:09 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
8aee64c102
Merge pull request #15540 from jherico/fix/gl_crash 
BUGZ-125: Error message instead of crash if the GL version is too low
 2019-05-13 13:12:30 -07:00
Shannon Romano
46d75a61b3
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change 
Clear any reliable connection state upon Node ID change
 2019-05-13 13:11:05 -07:00
amerhifi
270d7feb7f removed the duplicate function declaration 2019-05-13 12:20:22 -07:00
amerhifi
8623c3d74f removing testing function declared in app.h 2019-05-13 12:14:48 -07:00
amerhifi
71d534c97d merged master and resolved application conflict 2019-05-13 12:09:50 -07:00
Sam Gondelman
4c4589271c
Merge pull request #15469 from SamGondelman/switch 
Case 22379: Run-time switch for deferred/forward rendering
 2019-05-13 11:14:26 -07:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
amerhifi
9899b8c858 Merge branch 'master' into feature/platform 2019-05-13 06:52:13 -07:00
amerhifi
13c9bb078c cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues. 2019-05-13 06:50:08 -07:00
sabrina-shanman
736c7a9736 Change logging from 'fade-out animation' to 'fade-out transition' 2019-05-10 15:18:52 -07:00
sabrina-shanman
6f5bf01f2b Add sanity check and logging for possible avatar fade lambda race condition 2019-05-10 14:33:25 -07:00
Shannon Romano
5c9570cffb
Merge pull request #15539 from jherico/fix/watchdog_spam 
BUGZ-131: Reduce spam from watchdog thread
 2019-05-10 14:24:15 -07:00
Simon Walton
4b51d81b42 Clear any reliable connection state upon Node ID change 2019-05-10 12:06:38 -07:00
Zach Fox
112e13383b Dock it! 2019-05-10 12:03:29 -07:00
Brad Davis
0f8ddae9df Reduce spam from watchdog thread 2019-05-10 12:01:07 -07:00
Shannon Romano
0d28932181
Merge pull request #15529 from Atlante45/feat/more-ice-logging 
Add instrumentation to help track down connection issues
 2019-05-10 11:57:24 -07:00
Brad Davis
db88f14e13 Error message instead of crash if the GL version is too low 2019-05-10 11:51:50 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
amerhifi
edb3206a24 adding macos platform. Misisng display and cpu info 2019-05-10 09:55:26 -07:00
Clement
0a7352074c Fix android build 2019-05-09 17:17:43 -07:00
Shannon Romano
930032bcc6
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop 
case 22166: Build complex shapes in ThreadPool instead of MainLoop
 2019-05-09 17:14:50 -07:00
Shannon Romano
6aa8dc7c42
Merge pull request #15534 from kencooke/audio-PTT-output-ducking 
Reduce echo when push-to-talk is used
 2019-05-09 15:54:15 -07:00
Andrew Meadows
a0b34e4f15 more correct clearing of dirty flags for AvatarMotionState 2019-05-09 14:45:36 -07:00
Andrew Meadows
c7432ffe5f also update easy flags when rebuilding avatar shape 2019-05-09 13:48:07 -07:00
Ken Cooke
1b733d3fb3 While PTT is active, duck the audio output by 20dB to reduce echo 2019-05-09 12:56:07 -07:00
amerhifi
0d97543ece code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform 2019-05-09 12:04:41 -07:00
SamGondelman
59e7db2d6b Merge remote-tracking branch 'upstream/master' into switch 2019-05-09 11:42:05 -07:00
danteruiz
0fae615cb4 fix dock widget context 2019-05-09 09:20:50 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Anthony Thibault
4ee39355f1
Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident 
Add gpu_name, gpu_driver & gpu_memory to crash annotations
 2019-05-08 16:09:13 -07:00
David Rowe
302e876857 Update InteractiveWindow JSDoc per changes in master 2019-05-09 10:26:16 +12:00
David Rowe
414f27208d Merge branch 'master' into M22147 
# Conflicts:
#	interface/src/scripting/DesktopScriptingInterface.h
#	interface/src/ui/InteractiveWindow.h
 2019-05-09 08:43:05 +12:00
Anthony Thibault
78403e4436 Add gpu_name, gpu_driver & gpu_memory to crash annotations 
This may help us identify the hardware causing early gl initialization errors.
 2019-05-08 13:33:45 -07:00
David Rowe
c3730e41f7 Typos 2019-05-09 08:33:37 +12:00
Shannon Romano
15484436ca
Merge pull request #15507 from danteruiz/dockable-windows 
case LILY-30: Dockable Interactive Windows
 2019-05-08 12:16:04 -07:00
danteruiz
3806631bf1 dockable window 2019-05-08 10:04:31 -07:00
amerhifi
58cff374d7 merged master 2019-05-08 08:53:19 -07:00
Shannon Romano
e90f91f109
Merge pull request #15488 from sethalves/fix-indep-camera 
case 22412: allow independent camera to be set by scripts

👍 by QL for pre-merge testing in the manu ticket
 2019-05-07 09:38:54 -07:00
Andrew Meadows
f6916edac4 cleanup and removing some accidental C++-20-isms 2019-05-06 17:37:35 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
af1f4364ef don't forget to add detailedMotionStates to simulation 2019-05-06 17:37:35 -07:00
Andrew Meadows
a0841c937c fix logic around updating off-thread shapes 2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca overhaul of MotionState and shape creations 2019-05-06 17:37:35 -07:00
Shannon Romano
86f562de1b
Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock 
Case 20521: Unplugging headphones with hifi open causes freeze
 2019-05-06 15:03:56 -07:00
amer cerkic
26b38f5950 ifndef protection for headers 2019-05-06 13:51:52 -07:00
Shannon Romano
1636256068
Merge pull request #15496 from davidkelly/dk/bugz-6 
Increase max heartbeat time to 10 sec on mac
 2019-05-06 13:03:25 -07:00
amer cerkic
8273e5b666 fixing stuff based on comments and feedback from Sam. willc reate template for some of the getters since its the same old 2019-05-06 12:27:46 -07:00
Ken Cooke
ea9690d72b Disable MIDI rescan after devicechange, to avoid deadlock 2019-05-06 10:46:54 -07:00
amer cerkic
cadcb8b7c3 Merge branch 'master' into feature/platform 2019-05-06 10:37:14 -07:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification 
Avatar verification
 2019-05-06 08:04:06 -07:00
David Rowe
9c12a39368 Merge branch 'master' into M22147 2019-05-06 11:28:22 +12:00
David Rowe
7183d10879 Desktop JSDoc 2019-05-06 10:26:16 +12:00
amerhifi
527cf8b3d3 adding cpu and memory as well as json serialization with the 3rd party library 2019-05-03 15:57:45 -07:00
amerhifi
2762597e6a merged master 2019-05-03 09:12:21 -07:00
John Conklin II
16ece6c2fc
Merge pull request #15493 from amantley/bugPushToTalk 
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
 2019-05-03 09:03:36 -07:00
Angus Antley
1f004f34c4 added check for valid dynamic casts 2019-05-02 21:59:11 -07:00
Angus Antley
f019fa3a7c Merge remote-tracking branch 'upstream/master' into bugPushToTalk 2019-05-02 18:28:34 -07:00
Sam Gateau
46f4b13f2f
Merge pull request #15499 from samcake/coco 
BUGZ-92: Refresh rate Throttling refinements
 2019-05-02 17:24:34 -07:00
Shannon Romano
5d3c88b964
Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory 
(case 22368) Fix snapshots freezing Interface when no snap directory defined
 2019-05-02 15:59:25 -07:00
amer cerkic
f09f6ebd08 initial interface setup for platform 2019-05-02 15:50:35 -07:00
Sam Gateau
02530bdd02 Refining the test to resetInactiveTimer 2019-05-02 14:51:45 -07:00
David Kelly
0b2d11aeef Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6 2019-05-02 12:37:16 -07:00
Shannon Romano
caefa3e06a
Merge pull request #15362 from ctrlaltdavid/M22075 
Case 22075: Controller JSDoc update
 2019-05-02 11:34:58 -07:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068 
Case 22068: Clipboard JSDoc
 2019-05-02 11:15:25 -07:00
Sam Gateau
7f22ac1be4 FIxing a warning on unix 2019-05-02 08:57:19 -07:00
Sam Gateau
c7702048ad Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-02 08:50:30 -07:00
David Rowe
e217909f17 Merge branch 'master' into M22075 2019-05-02 20:19:17 +12:00
Sam Gateau
531ec14253 Applying my own comments, and refining the profile values 2019-05-02 00:54:00 -07:00
amantley
a8b54cbe10 changed reinterpret to dynamic cast 2019-05-01 17:32:39 -07:00
Sam Gateau
7f71ec8d3d Apply my own comments 2019-05-01 16:57:03 -07:00