Zach Fox
|
e40e34856b
|
Remove some extra menus from top bar; Only show VR button if headset connected
|
2019-05-17 13:28:59 -07:00 |
|
Zach Fox
|
c0037c3445
|
Merge pull request #15576 from zfox23/finishSettings
Simplified UI v1: Implement Performance settings and VR mode top bar switch
|
2019-05-16 17:01:04 -07:00 |
|
Brad Hefta-Gaub
|
1ac1735d55
|
Merge pull request #14533 from SamGondelman/oculusHome
Case 22439: Fix HMD auto switch detection
|
2019-05-16 16:26:04 -07:00 |
|
Zach Fox
|
70a4d6e8d5
|
Implement Performance settings and VR mode top bar switch
|
2019-05-16 16:15:05 -07:00 |
|
Zach Fox
|
fd5128f40f
|
Merge pull request #15573 from zfox23/SUI/imagesNoGlyphs
Simplified UI v1 Improvements
|
2019-05-16 15:14:03 -07:00 |
|
Zach Fox
|
90a5b25600
|
A bunch of changes here
|
2019-05-16 14:18:04 -07:00 |
|
Clément Brisset
|
d8ac589c36
|
Merge pull request #15570 from SimonWalton-HiFi/avatar-challenge-guard
Add guard for Client-challenging Node not connected
|
2019-05-16 13:57:40 -07:00 |
|
Simon Walton
|
e3e2bbc056
|
Add guard for challenging Node disappearing
|
2019-05-16 12:36:54 -07:00 |
|
Sam Gateau
|
6b3707873b
|
Merge pull request #15562 from jherico/bugz-133
BUGZ-133: Expose additional functionality to QML/Scripts
|
2019-05-16 12:03:22 -07:00 |
|
Zach Fox
|
ccaabbd9ae
|
Merge branch 'master' of github.com:highfidelity/hifi into SUI/imagesNoGlyphs
|
2019-05-16 10:57:44 -07:00 |
|
Brad Davis
|
6a0b479041
|
Fix warning and build failures
|
2019-05-16 10:53:29 -07:00 |
|
Sam Gateau
|
cf5869f199
|
Merge pull request #15568 from samcake/coco
BUGZ-145: Fix Window innerWidth and innerHeight after support for Docked window
|
2019-05-16 10:02:20 -07:00 |
|
Brad Davis
|
9bcc23f0c4
|
PR comments
|
2019-05-16 09:40:22 -07:00 |
|
Sam Gateau
|
edbd354760
|
Instead of returning the main window dimension (modulo the height of the menu bar) let s return the size of the actual 3d viewport widget
|
2019-05-15 17:57:53 -07:00 |
|
Zach Fox
|
a9bc7c8806
|
Images, not glyphs
|
2019-05-15 17:14:02 -07:00 |
|
Zach Fox
|
ee9d3d3ae1
|
Merge pull request #15567 from zfox23/dockedWindowEventBridge
Fix JS to QML event bridge messages with Docked Windows
|
2019-05-15 16:28:43 -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 |
|
Zach Fox
|
0400bc6da0
|
Fix JS to QML event bridge messages with Docked Windows
|
2019-05-15 15:36:28 -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 |
|
Brad Davis
|
8c375db90f
|
Add display plugin introspection to the window scripting interface
|
2019-05-15 12:55:47 -07:00 |
|
Brad Davis
|
5db78ef2e1
|
Add scripting to set the refresh rate
|
2019-05-15 12:55:25 -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 |
|