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
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
David Rowe
997dc963d3
Merge branch 'master' into M22147
2019-05-15 07:59:10 +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
amerhifi
2a6dc53395
Merge branch 'master' into feature/platform
2019-05-14 06:18:37 -07:00
amerhifi
dc139dc04d
added missing eof
2019-05-13 17:47:12 -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
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
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
David Rowe
70ec84177a
Doc review
2019-05-14 10:32:28 +12:00
Ryan Huffman
2e2d0add93
BUGZ-89: Suppress getTransform spam
2019-05-13 14:50:46 -07:00
SamGondelman
652ac17dac
fix deadlock on startup
2019-05-13 14:17:55 -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
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
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
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
amerhifi
edb3206a24
adding macos platform. Misisng display and cpu info
2019-05-10 09:55:26 -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
David Rowe
c3730e41f7
Typos
2019-05-09 08:33:37 +12:00
Andrew Meadows
e770bd6142
build CollisionShapes and load RigidBodies even when not yet stepping
2019-05-06 17:37:35 -07:00
Andrew Meadows
deee159892
unravel physics-vs-entities lib dependencies part 1
2019-05-06 17:35:57 -07:00
Andrew Meadows
7fb7e503f9
reduce footprint of ShapeManager::_shapeMap
2019-05-06 17:35:57 -07:00
David Rowe
9c12a39368
Merge branch 'master' into M22147
2019-05-06 11:28:22 +12:00
jennaingersoll
57b9b18012
Merge pull request #15363 from ctrlaltdavid/M22068
...
Case 22068: Clipboard JSDoc
2019-05-02 11:15:25 -07:00
David Rowe
d8f6e923c7
Paths JSDoc update
2019-05-01 08:18:17 +12:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
...
Avatar network bandwidth optimization
2019-04-26 10:16:30 -07:00
David Rowe
8e69e0b049
Regularize deprecation notices
2019-04-25 20:55:30 +12:00
David Rowe
73fd61dcf0
Picks, PickType, RayPick JSDoc update
2019-04-25 13:19:07 +12:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master
...
Case 22333: Master: Fix asset server auto-baking
2019-04-24 16:30:14 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
...
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Clement
86b6341098
Add error reporting + Make temp dir erase safer
2019-04-23 14:54:12 -07:00
SamGondelman
9deb4e47ad
comment out warning
2019-04-23 08:46:54 -07:00
SamGondelman
06fbc8440e
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 13:28:30 -07:00
Anthony Thibault
0c0b847666
First version of faux joint optimizations
...
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.
Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
2019-04-22 11:02:13 -07:00
sabrina-shanman
05a2b11c54
Fix mat4FromVariant
2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27
Fix baked models not preserving scale in some cases
2019-04-19 11:29:27 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
...
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check
...
Better head vs camera checks for avatar head cauterization
2019-04-16 15:07:46 -07:00
r3tk0n
d0abb86366
Reversed costants because no sleep. >_<
2019-04-15 17:26:22 -07:00
r3tk0n
12d7e35722
Add separate constant for desktop run. HMD run affected negatively by 3x multiplier. This will need to be cleaned up in a future release.
2019-04-15 10:56:07 -07:00
r3tk0n
a40fdf3f77
Merge branch 'master' of https://github.com/highfidelity/hifi into running-fix
2019-04-15 09:47:26 -07:00
