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
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
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
Shannon Romano
b5f23f550f
Merge pull request #14519 from MattHardcastle/use-qsavefile
...
Use QSaveFile when persisting domain settings to disk
2019-05-15 13:41:34 -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
fa16b66d69
Merge branch 'feature/platform' of https://github.com/amerhifi/hifi into feature/platform
2019-05-15 12:01:59 -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
Sam Gateau
c19fd71969
Merge branch 'master' of github.com:highfidelity/hifi into coco
2019-05-15 11:00:40 -07:00
Amer
f1a90597cc
undo of gradle change
2019-05-15 10:27:50 -07:00
Amer
89279e0d46
undoing grade changes from Android build test
2019-05-15 10:27:14 -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
Shannon Romano
70c9c07229
Merge pull request #15561 from hyperlogic/bug-fix/build-linux-needs-node
...
Added node requirement to BUILD_LINUX.md
2019-05-15 06:15:39 -07:00
amerhifi
5e62e6b719
Sam for the win. Qtglobal missing
2019-05-14 19:29:17 -07:00
Anthony J. Thibault
709a35cddb
Added node requirement to BUILD_LINUX.md
2019-05-14 19:27:40 -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
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI
...
Simplified UI v1
2019-05-14 17:45:30 -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
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
Zach Fox
971e07c646
update spacing between settings
2019-05-14 16:44:25 -07:00
Zach Fox
bbd3d0fab5
Remove settings subtitles
2019-05-14 16:39:48 -07:00
Roxanne Skelly
a7595496f6
CR fixes
2019-05-14 16:39:39 -07:00
Zach Fox
e3bec7ef2a
CR Round 1 - thanks Milad
2019-05-14 16:29:03 -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
Simon Walton
e768beb9b1
Allow for delayed challenges if salt is empty
2019-05-14 15:53:35 -07:00
amerhifi
7ab9c482c2
trying an alternative method for jumping over linux for now
2019-05-14 15:50:12 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives
...
Case 19510: Unify cube and sphere edit menu entries into one.
2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296
Reduce size of output muted overlay; restore scroll to 0 on settings tab switch
2019-05-14 15:05:26 -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
Zach Fox
f43c376a6a
Tweak top bar
2019-05-14 12:41:56 -07:00
Zach Fox
8724cf4edf
UIT TextField
2019-05-14 12:27:33 -07: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
Zach Fox
2080aa6676
Some fun motion for experimentation
2019-05-14 11:56:07 -07:00
