Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 17:09:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79198 commits 76 branches 59 tags 1.2 GiB
Commit graph

32725 commits

Author SHA1 Message Date
Roxanne Skelly
aaee796aef Merge branch 'master' of https://github.com/highfidelity/hifi into domaincheckin 2019-05-24 09:38:37 -07:00
SamGondelman
dc3b2d97e3 fix the actual problem 2019-05-24 09:36:37 -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
Roxanne Skelly
cc3ce96227 fix ubuntu build issue 2019-05-23 15:24:41 -07:00
Shannon Romano
cc2e5af34d
Merge pull request #15619 from kencooke/audio-mac-callback-crashfix 
BUGZ-158: Crash when switching audio devices on Mac
 2019-05-23 15:20:08 -07:00
Roxanne Skelly
7fdbbe5b77 CR: Use functional type conversion instead of c-style casting 2019-05-23 14:45:49 -07:00
Roxanne Skelly
1c6cf3df0d Move DomainList timestamps to the extended header 
And. Lag notifications now use signed values
 2019-05-23 14:19:36 -07:00
Roxanne Skelly
9c39d06416 Don't set permissions / is authenticated when DomainServerList checkin 
should be ignored.
 2019-05-23 11:42:51 -07:00
Roxanne Skelly
4f1eeecc2f Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin" 
This reverts commit 4735b9f19a, reversing
changes made to bc4a88beb7.
 2019-05-23 11:00:43 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging" 2019-05-23 10:27:05 -07:00
Ken Cooke
135dc7f2b1 assert() on over-filling the audio callback buffer 2019-05-23 08:54:47 -07:00
Ken Cooke
ba3282e12b Fix rounding error in allOrNothing mode 2019-05-23 08:03:59 -07:00
Ken Cooke
0d0a9fbd09 Never return more than maxSamples from the audio ringbuffer 2019-05-23 07:54:08 -07:00
luiscuenca
6d824ff22d
Fix logout 2019-05-22 20:27:42 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login 2019-05-22 16:18:30 -07:00
Clement
55f1929de2 Fix nodelist reset on logout/username change 2019-05-22 16:09:20 -07:00
Shannon Romano
5944af5cca
Merge pull request #15612 from roxanneskelly/domaincheckin 
BUGZ-322 - add domain checkin lag logging
 2019-05-22 15:49:24 -07:00
raveenajain
9693f586a2 bounding boxes, avatar walking, temp collision 2019-05-22 14:24:09 -07:00
Roxanne Skelly
4ca77ba3ac BUGZ-322 - add domain checkin lag logging 2019-05-22 13:51:43 -07:00
sabrina-shanman
3849450c66 Fix crash calculating tangents without texcoords 2019-05-22 11:57:20 -07:00
Zach Fox
39d32025a3
Merge pull request #15601 from zfox23/SUI/integratedStatusEtc 
Simplified UI: Updates! (See Description)
 2019-05-21 16:15:09 -07:00
Gayathri
009068222f
Merge pull request #15595 from amerhifi/feature/platform 
BUGZ-296: Linux platform implementation
 2019-05-21 16:01:33 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
SamGondelman
4eeff52746 add version to texmeta.json files, fallback to original file if version has changed for skyboxes 2019-05-21 15:30:28 -07:00
Brad Hefta-Gaub
f8797e0d34
Merge pull request #15591 from ctrlaltdavid/M22493 
Case 22493: Script JSDoc
 2019-05-21 15:13:05 -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
Zach Fox
5749392e83 New bg color; Final status indicator design; Fixed HMD icon 2019-05-21 14:10:27 -07:00
Shannon Romano
b1edfdcaef
Merge pull request #15596 from AndrewMeadows/fix-crash-bugz178 
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model (redux)
 2019-05-21 12:50:26 -07:00
Shannon Romano
11f4252a30
Merge pull request #15599 from sabrina-shanman/bug_hfm_normal-map 
(BUGZ-167) Always calculate tangents
 2019-05-21 12:06:06 -07:00
amerhifi
cb43a0efea trying to bypass android error with output constraint 2019-05-21 10:59:33 -07:00
sabrina-shanman
4b15ee9c3a Always calculate tangents 2019-05-21 10:47:10 -07:00
SamGondelman
264051ed6d fix myavatar setSkeletonModelURL 2019-05-21 10:40:58 -07:00
amerhifi
4f547040c0 removing include 2019-05-21 09:01:40 -07:00
amerhifi
5f81224976 did not work on linux, backing out change 2019-05-21 08:59:04 -07:00
Andrew Meadows
045b0f7cf8 check for unloaded model 2019-05-21 07:49:21 -07:00
amerhifi
47a612b195 testing gpu ident changes 2019-05-21 07:46:02 -07:00
amerhifi
19a7d91aef testing linux cpu info 2019-05-20 22:37:25 -07:00
SamGondelman
43874fbfb3 fix AA toggle 2019-05-20 17:21:10 -07:00
David Rowe
5227b35c6b Revise changes 2019-05-21 10:32:12 +12:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0a0a25139c Deprecate items that shouldn't be in the Script API 2019-05-21 10:32:12 +12:00
David Rowe
d196e35701 Polish existing Script JSDoc 2019-05-21 10:32:12 +12:00
David Rowe
0e478de1a2 Stub out missing Script JSDoc 2019-05-21 10:32:12 +12:00
Brad Hefta-Gaub
c1de3ecfd8
Merge pull request #15587 from howard-stearns/reduce-time-in-which-you-see-yourself-going-away 
reduce time in which you see yourself going away
 2019-05-20 15:17:03 -07:00
Andrew Meadows
172b7b8d17
Merge pull request #15589 from jherico/fix/bugz-250 
BUGZ-250: Don't crash on trying to add items to non-existent menus
 2019-05-20 14:35:52 -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
Brad Davis
5d37a076d5 Don't crash on trying to add items to non-existent menus 2019-05-20 13:05:57 -07:00
Howard Stearns
07e9c3d648 reduce time in which you see yourself going away 2019-05-20 12:48:06 -07:00
sabrina-shanman
03a8e77ade Move RenderItemStatusIcon to Item.h 2019-05-20 12:07:41 -07:00
sabrina-shanman
5aff4d9f69 Update comment on render item status 2019-05-20 11:58:55 -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
Anthony Thibault
dc150b5499
Merge pull request #15583 from SamGondelman/crash 
BUGZ-243: Attempt to fix material crash
 2019-05-17 16:34:14 -07:00
Simon Walton
6befbdafe9 Logging for DomainList reception & timebox overruns 2019-05-17 15:31:21 -07:00
Howard Stearns
72a9017fdf put back modified version of earlier comment 2019-05-17 15:30:54 -07:00
SamGondelman
3273f46179 fix avatar loading spheres 2019-05-17 15:29:27 -07:00
SamGondelman
0039fb2f54 attempt to fix material crash 2019-05-17 14:51:42 -07:00
Howard Stearns
f1e8343b30 put DomainServerCheckIn on NodeList thread 2019-05-17 14:30:30 -07:00
David Rowe
82fb99053d Fix JSDoc typo noticed in passing 2019-05-17 21:35:50 +12:00
Shannon Romano
b09247d191
Merge pull request #15572 from hyperlogic/bug-fix/blender-run-crash-fix 
Fix blender::run crash
 2019-05-16 22:09:18 -04:00
Shannon Romano
4e9852f9f9
Merge pull request #15575 from amerhifi/feature/platform 
case BUGZ-57: Populate macos gpu _name
 2019-05-16 22:07:16 -04:00
amerhifi
027583cddc removing stuff from destructor since its not a vector of computers 2019-05-16 16:40:16 -07:00
amerhifi
3b448ce1fe moving to only one computer. also a bit of cleanup: 2019-05-16 16:38:59 -07:00
Anthony J. Thibault
3ae33353d9 Fixed unused variables warnings 2019-05-16 16:38:47 -07:00
amerhifi
a62f91c7b3 removed xcode goofines 2019-05-16 16:30:30 -07:00
amerhifi
93cf6c882c spacing 2019-05-16 16:26:23 -07:00
amerhifi
5cbb39a48e adding computer changes to the platofrm 2019-05-16 16:25:02 -07:00
SamGondelman
fee20d9e46 render scripting interface + renderMethod control 2019-05-16 16:01:21 -07:00
amerhifi
c1c2efc71d getting gpu name via profiler parsing 2019-05-16 15:47:03 -07:00
amerhifi
d924560af0 undoing test code for gcc warnings 2019-05-16 14:36:31 -07:00
amerhifi
9e00920884 adding computer model to platform for macos 2019-05-16 14:30:11 -07:00
Anthony J. Thibault
98fe059d97 Fix blender::run crash 
Pass a shared_ptr of the HFMModel to the Blender.  This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.

Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.

The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
 2019-05-16 13:12:16 -07:00
amer cerkic
6595f86985 Merge branch 'master' into feature/platform 2019-05-16 10:03:51 -07:00
amerhifi
52afa64215 undoing testing stuff also removing circular reference 2019-05-15 16:33:05 -07:00
Shannon Romano
f360789b33
Merge pull request #15566 from samcake/coco 
BUGZ-141: Fix the LOD target value not in sync with the RefreshRate setting
 2019-05-15 15:58:57 -07:00
amerhifi
9c786f3c5a testing change 2019-05-15 15:48:08 -07:00
Shannon Romano
9b1e92145b
Merge pull request #14366 from SaracenOne/gltf_improvements 
Case 22169: GLTF Importer Improvements
 2019-05-15 15:47:21 -07:00
Sam Gateau
04c139c172 Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-15 15:01:46 -07:00
amerhifi
633c0dfbac testing gcc warnings 2019-05-15 14:57:33 -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
amerhifi
1da5298086 bypassing the static keys for now so that the pr can get build and go in 2019-05-15 13:13:43 -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
amerhifi
ff742ecd97 removed qtglobal from keys. cleanup 2019-05-15 12:13:30 -07:00
amerhifi
803631a821 adding pragma once to see if it will help with gcc warnings. Its complaining that every file that includes the platformkeys is not using the variables 2019-05-15 11:58:41 -07:00
amerhifi
a779fb54ff testing a change to hopefully fix gcc warnings 2019-05-15 11:53:40 -07:00
Shannon Romano
b3b3c2f721
Merge pull request #14945 from kencooke/audio-stats-loss-underflow 
Case 19748: Audio loss statistic occasionally displays a huge number
 2019-05-15 11:06:53 -07:00
amerhifi
c43d3de213 added linux and android stubs to help with the linux and android warnings 2019-05-15 10:18:59 -07:00
amerhifi
19a848d481 adding android until the stub is checked in 2019-05-15 08:53:05 -07:00
amerhifi
5e62e6b719 Sam for the win. Qtglobal missing 2019-05-14 19:29:17 -07:00
Sam Gateau
c163c92a6f Merge branch 'master' of github.com:highfidelity/hifi into coco 2019-05-14 18:22:20 -07:00
Sam Gateau
2f380b3669 Detailing the info from the refresh rate 2019-05-14 17:58:32 -07:00
Roxanne Skelly
112b92d905
Merge pull request #15560 from roxanneskelly/bugz87 
BUGZ-87 - loading/physics stuck when entering domain
 2019-05-14 17:40:04 -07:00
Roxanne Skelly
fad7fa4c07 Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 16:25:10 -07:00
Roxanne Skelly
0ac597d76e BUGZ-87 - loading/physics stuck when entering domain 
A race condition was occurring when multiple entities using
the same models were handed over to physics around the same time.
The first model is passed to a worker thread to turn it into a shape
and subsequent models note they are the same and don't create a shape
or worker thread.

The physics system was ignoring these, never marking them as ready
for physics.
 2019-05-14 16:14:44 -07:00
amerhifi
7ab9c482c2 trying an alternative method for jumping over linux for now 2019-05-14 15:50:12 -07:00
amerhifi
3975525b36 trying a different method since ubuntu is still seeing them as unused 2019-05-14 14:50:32 -07:00
Sabrina Shanman
fbe947c8ac
Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model
 2019-05-14 13:07:40 -07:00
amerhifi
549b1ec732 VS didn't save the comment addition 2019-05-14 13:04:25 -07:00
amerhifi
a12685c74b hiding json keys from ubuntu so that we can build for now until Linux implementation is done 2019-05-14 13:01:15 -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
amerhifi
346d8d5039 Merge branch 'feature/platform' of https://github.com/amerhifi/hifi into feature/platform 2019-05-14 12:09:03 -07:00
amerhifi
18fe18ee12 elseif typo 2019-05-14 12:07:59 -07:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData 
New Entity Property: Private User Data
 2019-05-14 10:24:39 -07:00
Roxanne Skelly
68fb43ec7f Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug 2019-05-14 10:11:02 -07:00
Andrew Meadows
5a257eb137 avoid crash for RenderableModelEntityItem with invalid model 2019-05-14 09:48:06 -07:00
amerhifi
fe6b2fceed addressing comment in pr. removing extra space added in previous checkin 2019-05-14 09:39:44 -07:00
amerhifi
2a6dc53395 Merge branch 'master' into feature/platform 2019-05-14 06:18:37 -07:00
Andrew Meadows
0eea6d1988
Merge pull request #15554 from sethalves/cleanup-deleted-av-ents 
case 123: delete children of deleted avatar-entity
 2019-05-13 18:18:36 -07:00
amerhifi
dc139dc04d added missing eof 2019-05-13 17:47:12 -07:00
amerhifi
830f3dc976 moved all hard coded json keys to platform::jsonkeys namespace and file 2019-05-13 17:45:57 -07:00
Brad Hefta-Gaub
e32979748b
Merge pull request #15552 from howard-stearns/longer-timeout-to-removeSilentNodes 
Longer timeout to remove silent nodes
 2019-05-13 17:40:48 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -07:00
Seth Alves
d630f90f4d
Merge pull request #15548 from SamGondelman/tests 
BUGZ-173: Fix deadlock on startup
 2019-05-13 17:32:32 -07:00
amerhifi
95e3eede5f moved instance to own file. moved functions based on comments in pr 2019-05-13 17:07:25 -07:00
Howard Stearns
aeff5d93d8 try a longer timeout before we removeSilentNodes 2019-05-13 16:57:38 -07:00
amerhifi
804d171102 fixed a bunch of pr comments 2019-05-13 16:38:11 -07:00
Roxanne Skelly
4ad3163ca5 Disable event queue debugging for non-windows platforms. 2019-05-13 16:37:45 -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
Shannon Romano
53b80ba404
Merge pull request #15550 from huffman/fix/gettransform-spam 
BUGZ-89: Suppress getTransform spam
 2019-05-13 16:13:46 -07:00
Zach Fox
2ce9e9ee10 The right way to restrict private user data: 2019-05-13 16:07:29 -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
Shannon Romano
72d000a76d
Merge pull request #15521 from ctrlaltdavid/M22489 
Case 22489: Scene JSDoc
 2019-05-13 15:49:44 -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
Ryan Huffman
2e2d0add93 BUGZ-89: Suppress getTransform spam 2019-05-13 14:50:46 -07:00
Howard Stearns
ee1231362c Merge branch 'tests' of git://github.com/SamGondelman/hifi into SamGondelman-tests 2019-05-13 14:26:15 -07:00
SamGondelman
652ac17dac fix deadlock on startup 2019-05-13 14:17:55 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -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
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
Shannon Romano
d37beec6d2
Merge pull request #15535 from Atlante45/fix/warnings 
Fix mac build warnings
 2019-05-13 13:09:59 -07:00
Shannon Romano
12bb073d14
Merge pull request #15485 from sabrina-shanman/crash_hfm_normals 
(case 22026) Fix crash due to invalid indices in baker::calculateNormals
 2019-05-13 13:06:01 -07:00
amerhifi
71d534c97d merged master and resolved application conflict 2019-05-13 12:09:50 -07:00
amerhifi
8759f028f8 fixing Linux warnings 2019-05-13 11:41:30 -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
Saracen
9aadea81b3 Fix to use correct texcoord2 array. 2019-05-13 19:13:24 +01:00
SamGondelman
eb8c722080 fix runtime switch 2019-05-13 09:58:55 -07:00
amerhifi
541aef5e90 fixing warnings 2019-05-13 09:56:10 -07:00
Shannon Romano
5c58cec5af
Merge pull request #15522 from SaracenOne/forward_lightmapping 
Case 22494, BUGZ-127: Render lightmaps in the forward renderer
 2019-05-13 09:13:34 -07:00
amerhifi
cbd751df89 fixing mac typo 2019-05-13 08:37:05 -07:00
Brad Hefta-Gaub
52eec19d50
Merge pull request #15543 from SamGondelman/zone 
BUGZ-139, Case 22502: Fix zone inheritance
 2019-05-13 08:12:41 -07:00
Shannon Romano
99239f6415
Merge pull request #15542 from hyperlogic/bug-fix/dependency-manager-thread-safety 
Make DependencyManager thread-safe
 2019-05-13 07:43: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
Saracen
7987ed14b0 Fix mismatched meshpart attributes (generates dummy buffers), re-added normals generation routine, buffer size checks, detect out-of-range indices, 2019-05-11 04:30:14 +01:00
Anthony Thibault
b46378e0b6 Compile error fix 2019-05-10 15:51:42 -07:00
Anthony Thibault
fe17550a80 Code review feedback 
In DependencyManager::set<>() destroy the clear the previous before allocating the new instance.
 2019-05-10 15:41:52 -07:00
amerhifi
d019dc7d54 typo 2019-05-10 15:31:11 -07:00
SamGondelman
dfdace8cdc fix zones for real this time 2019-05-10 15:24:02 -07:00
amerhifi
81c0d195e3 added ability to extract cpu info on osx 2019-05-10 15:17:33 -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
Anthony Thibault
442a679108 Make DepenencyManager thread-safe again 
Before this PR, there were no locks around the two internal QHash data structures.
Races are rare, due to the fact that the DependencyManager is initialized on the main thread on startup and the fact that a static QWeakPointer was used as an internal cache.
However, there have been reported crashes where the render thread uses DependencyManager::isSet() perhaps while the main thread is adding a late dependency.
DependencyManager::isSet() did not use the static QWeakPointer cache and was more prone to race conditions.

To avoid this and perhaps other data races, mutexes now guard both of the internal QHash data structures.
Also, as an optimization, the most frequent call to DependencyManager::isSet was removed (Profile.cpp).
 2019-05-10 14:12:10 -07:00
Roxanne Skelly
7dfbbf55e9
Merge pull request #15530 from roxanneskelly/bugz85b 
BUGZ-85 - extrapolate audio on network lag spike to reduce pop
 2019-05-10 13:51:30 -07:00
amerhifi
684d71fc5b more clean up 2019-05-10 12:27:10 -07:00
amerhifi
0e6fcf0fe6 removed unecessary using 2019-05-10 12:24:41 -07:00
amerhifi
ba69f0c962 cleaned up references and added json alias. Unfortuantely this library isn't easy to forward declare so leaving the header include 2019-05-10 12:21:40 -07:00
Simon Walton
4b51d81b42 Clear any reliable connection state upon Node ID change 2019-05-10 12:06:38 -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
amerhifi
edb3206a24 adding macos platform. Misisng display and cpu info 2019-05-10 09:55:26 -07:00
Roxanne Skelly
53a1425ab1 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz85b 2019-05-09 17:56:21 -07:00
Clement
07372f102c Add logging on silent node removal 2019-05-09 17:19:10 -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
Roxanne Skelly
7a4e3557b0 Use TryLocker instead of explicitly using tryLock on mutexes 2019-05-09 15:21:43 -07:00
amerhifi
b998008f01 fixed typo 2019-05-09 14:43:27 -07:00
amerhifi
8b1cdb03cc new mac os stubs 2019-05-09 14:35:05 -07:00
Clement
ad36df0455 Fix build warnings 2019-05-09 13:59:49 -07:00
Clement
c691ee496e CR 2019-05-09 13:58:50 -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
Ken Cooke
85f425a93b Apply variable output gain using cubic smoothing 2019-05-09 10:05:02 -07:00
Roxanne Skelly
3a4241b290 Unnecessary spacing changes. 2019-05-08 22:16:18 -07:00
Roxanne Skelly
dc7ec35544 BUGZ-85 - handle thread safety issues with calling the decoder from the 
real-time thread.
 2019-05-08 22:16:10 -07:00
Roxanne Skelly
4a4a92c009 BUGZ-85 - audio pipeline interpolation on ring buffer starve 
Kick the PLC so that it generates a more pleasing 'fade' frame
when ring buffer starves.
 2019-05-08 22:16:05 -07:00
Clement
5c42838261 Change timeouts to try to prevent ICE disconnects 2019-05-08 18:38:35 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Shannon Romano
4bd41a1aa3
Merge pull request #15523 from SamGondelman/zone 
Case 22466, BUGZ-102: Fix zone rendering issues
 2019-05-08 14:52:33 -07:00
Andrew Meadows
f60dbda25e clear all HARD flags when reinserting object in PhysicsEngine 2019-05-08 14:48:49 -07: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
David Rowe
c3730e41f7 Typos 2019-05-09 08:33:37 +12:00
SamGondelman
04198c6bfc use weak ptrs, add comment about SelectSortItems performance 2019-05-08 13:13:05 -07: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
SamGondelman
da092cc5f0 fix zone issues 2019-05-08 11:04:54 -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
Saracen
410679b9b7 Render lightmaps in the forward renderer 2019-05-08 00:56:34 +01:00
Andrew Meadows
72c6cad581 cleanup _deadWorker in dtor, more correct _nextOrphanExpiry 2019-05-07 15:15:53 -07:00
Andrew Meadows
883b83ec59 minor name change for more clarity 2019-05-07 15:15:12 -07:00
David Rowe
71f7132a6b Scene JSDoc 2019-05-08 09:17:11 +12:00
Shannon Romano
3877a359fd
Merge pull request #15519 from hyperlogic/bug-fix/master-shared-object-deadlock 
SharedObject::onRender deadlock fix
 2019-05-07 11:54:17 -07:00
Shannon Romano
a89a65b810
Merge pull request #15517 from jherico/fix/tbb_overhead 
Case 22483: Disable the use of tbb::parallel_for in Blender
 2019-05-07 11:49:15 -07:00
Andrew Meadows
a28d185afc make explicit: zones shouldn't be in physics simulation 2019-05-07 10:39:44 -07:00
Brad Davis
17632e3c50 PR feedback 2019-05-07 10:36:14 -07:00
Andrew Meadows
8e6394c95f ParticleEffectEntityItem should not be in physics simulation 2019-05-06 17:37:35 -07:00
Andrew Meadows
81f960a4bd remove from _physicalObjects list after transaction 2019-05-06 17:37:35 -07:00
Andrew Meadows
bef053584b don't forget to clear _activeStaticBodies 2019-05-06 17:37:35 -07:00
Andrew Meadows
d6a20a4abd fix inverted logic typo 2019-05-06 17:37:35 -07:00
Andrew Meadows
53ad41e5ee include <chrono> in ShapeManager.h 2019-05-06 17:37:35 -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
6e27b4d1c5 remove bodies of deleted entities 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
Andrew Meadows
3c8c68d187 track EntityItem adds to physcis with pending shape 2019-05-06 17:35:57 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
Andrew Meadows
8445eaf310 protect against orphaned off-thread-assembled shapes 2019-05-06 17:35:57 -07:00
Andrew Meadows
514d598797 remove unhelpful profiling with wrong category 2019-05-06 17:35:57 -07:00
Andrew Meadows
fbd4db5505 build StaticMeshShapes outside of mainloop 2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9 reduce footprint of ShapeManager::_shapeMap 2019-05-06 17:35:57 -07:00
Brad Davis
2b1267ffeb Disable the use of tbb::parallel_for in Blender 2019-05-06 16:53:37 -07:00
Anthony J. Thibault
c33ad93a55 SharedObject::onRender deadlock fix 
Call gl::globalRelease() for paused surfaces, this fixes a very common deadlock on mac.

But for PC, by inspection, a race condition could occur over the _syncRequested boolean, between the main and qml rendering thread.
To fix this, we split render and renderSync into separate messages.
 2019-05-06 16:19:30 -07:00
amer cerkic
f557e58224 working on dxgi gpu info stuff 2019-05-06 16:16:20 -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
Shannon Romano
5a603c20aa
Merge pull request #15495 from Atlante45/fix/deadlock 
Case 22433: master: Query shape type outside lock
 2019-05-06 14:12:56 -07:00
amer cerkic
26b38f5950 ifndef protection for headers 2019-05-06 13:51:52 -07:00
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -07:00
Brad Davis
2886e94cdc Fix VS2019 build failure 2019-05-06 12:44:53 -07:00
Shannon Romano
d206c9c87f
Merge pull request #15490 from raveenajain/stuckAvatars 
Case 22424: gltf avatars break all other available avatars when used
 2019-05-06 12:39:43 -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
Zach Fox
6033058d54 Comment 2019-05-06 11:51:59 -07:00
Zach Fox
1c9a4fd322 Fix build error 2019-05-06 11:37:15 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
a68da2bca7 Finish out the feature, i think 2019-05-06 11:08:23 -07:00
Ken Cooke
408fb56d57 MIDI error checking 2019-05-06 10:53:58 -07:00
Ken Cooke
f133ab65e4 MIDI bugfix 2019-05-06 10:48:53 -07:00
amer cerkic
cadcb8b7c3 Merge branch 'master' into feature/platform 2019-05-06 10:37:14 -07:00
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -07:00
Shannon Romano
3515c13e32
Merge pull request #15497 from sabrina-shanman/crash_fbx_read-binary-array 
(case 22429) Do sanity checks on FBX data array lengths
 2019-05-06 08:07:35 -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
dfa5d2ddf1 InteractiveWindow QML messaging example 2019-05-06 11:23:30 +12:00
David Rowe
2d5bf4f940 InteractiveWindow JSDoc 2019-05-06 10:27:24 +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
Shannon Romano
2618ad09c3
Merge pull request #15501 from thoys/fix/asyncDailogsExitCrash 
BUGZ-73: Fix crash for active async messageBoxes on exit of client
 2019-05-03 15:40:48 -07:00
Shannon Romano
0cdde4b5dc
Merge pull request #15422 from ctrlaltdavid/M22224 
Case 22224: Midi JSDoc
 2019-05-03 15:10:40 -07:00
Sabrina Shanman
3c5bf63c55
Merge pull request #15505 from SamGondelman/stageCrash 
Case 22419: Try to fix transition crash
 2019-05-03 14:38:42 -07:00
Shannon Romano
74a79d04e7
Merge pull request #15504 from amantley/bugMaxBandwidth 
Fixed possible divide by zero error in setPacketSendPeriod()
 2019-05-03 09:17:32 -07:00
amerhifi
2762597e6a merged master 2019-05-03 09:12:21 -07:00
David Rowe
95e45a5aff Merge branch 'master' into M22224 2019-05-03 17:07:35 +12:00
David Rowe
8458d746cd Doc review 2019-05-03 17:07:14 +12:00