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
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
