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