luiscuenca
8db3d03772
add display name as param
2019-05-23 10:21:47 -07:00
Zach Fox
4bbbaa8c19
Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes
2019-05-23 09:39:38 -07:00
luiscuenca
6d824ff22d
Fix logout
2019-05-22 20:27:42 -07:00
Zach Fox
934ea76966
Merge pull request #15613 from zfox23/SUI/newAudioProperties
...
Fix the janky audio output settings UI
2019-05-22 16:45:02 -07:00
Zach Fox
8a2132ca9b
Merge pull request #15616 from zfox23/SUI/errorStatesAvatar
...
Define/show some error states in the Avatar app
2019-05-22 16:44:38 -07:00
Brad Hefta-Gaub
74770eb54a
Merge pull request #15614 from ctrlaltdavid/M22513
...
Case 22513: Selection JSDoc
2019-05-22 16:38:21 -07:00
Zach Fox
d75fe04038
Fix BUGZ-311
2019-05-22 16:24:40 -07:00
luiscuenca
206e353264
Pass tokens as params for automatic login
2019-05-22 16:18:30 -07:00
Zach Fox
8df706abcb
Handle the case when the user doesn't have any avatars yet
2019-05-22 15:51:46 -07:00
Zach Fox
3ed47b4f23
Show error states in Avatar app (BUGZ-310)
2019-05-22 15:45:18 -07:00
Zach Fox
46ee148a69
Fix a bug and remove magic numbers
2019-05-22 15:24:33 -07:00
David Rowe
2c591ba196
Doc review
2019-05-23 10:18:03 +12:00
David Rowe
04573da96b
Selection JSDoc revision
2019-05-23 09:51:30 +12:00
Zach Fox
0c90b7c4c2
JSdocs
2019-05-22 14:51:11 -07:00
Zach Fox
3a4bf2e8f7
Fix the janky audio output settings UI
2019-05-22 14:27:06 -07:00
Zach Fox
ddb299a387
Merge pull request #15608 from zfox23/SUI/envVol
...
Fix environment volume slider (BUGZ-213); optimize sliders
2019-05-22 14:11:57 -07:00
Zach Fox
257ac12bf9
Merge pull request #15606 from zfox23/SUI/bugFixes1
...
Simplified UI - two quick fixes.
2019-05-22 12:53:26 -07:00
jennaingersoll
38a379cb38
Merge pull request #15605 from ctrlaltdavid/M22528
...
Case 22528: Snapshot JSDoc
2019-05-22 12:27:33 -07:00
jennaingersoll
416e2799ad
Merge pull request #15604 from ctrlaltdavid/M22527
...
Case 22527: Settings JSDoc
2019-05-22 12:08:27 -07:00
Zach Fox
30c13fd988
Fix environment volume slider (BUGZ-213); optimize sliders
2019-05-22 12:01:38 -07:00
Zach Fox
6f7557b00d
Implement BUGZ-305 and BUGZ-306
2019-05-22 09:56:28 -07:00
David Rowe
a246e40815
Fix taking snapshot example
2019-05-22 14:14:06 +12:00
David Rowe
30da972a14
Snapshot JSDoc
2019-05-22 14:13:42 +12:00
David Rowe
1f3bffca4a
Settings JSDoc polish
2019-05-22 12:08:14 +12:00
Roxanne Skelly
bad421cb59
Fix crash when adding a tracked entity to the safe landing code
...
when it's not been fully set up yet.
2019-05-21 16:58:49 -07:00
Zach Fox
39d32025a3
Merge pull request #15601 from zfox23/SUI/integratedStatusEtc
...
Simplified UI: Updates! (See Description)
2019-05-21 16:15:09 -07:00
SamGondelman
b92e26722c
rebake default skybox
2019-05-21 15:58:46 -07:00
SamGondelman
a672b79cd8
add version to default skybox
2019-05-21 15:35:43 -07:00
Shannon Romano
fa7a998cca
Merge pull request #15600 from roxanneskelly/bugz223
...
BUGZ-223 - Physics was not starting in TheSpot-dev
2019-05-21 15:15:16 -07:00
Sam Gateau
98e426ac9f
Merge pull request #15590 from SamGondelman/settings
...
BUGZ-284: Add shadows, AA, and AO to RenderScriptingInterface
2019-05-21 15:08:02 -07:00
Zach Fox
5749392e83
New bg color; Final status indicator design; Fixed HMD icon
2019-05-21 14:10:27 -07:00
Roxanne Skelly
10db88c07b
Fix ubuntu warning
2019-05-21 12:32:01 -07:00
Anthony Thibault
0e87ab6e55
Merge pull request #15598 from SamGondelman/skeletonModelURL
...
BUGZ-283: Fix MyAvatar.skeletonModelURL
2019-05-21 12:05:30 -07:00
Roxanne Skelly
dddb171b52
BUGZ-223 - Physics was not starting in TheSpot-dev
...
This was caused by two issues involving the SafeLanding system:
* Race condition on domain load
The domain is hard-reset twice during typical start, first after
login completes, and second, when ice/domain renegotiation occurs
Entities added during the first reset caused an add to the safe landing
system which, because those adds were queued, possibly happened after
the second hard reset.
Second, Safe landing checks whether physics is ready on entities before
letting physics start. Physics is ready when the entities have a
physics shape associated with them if they're static meshes. The
physics shape is only generated if the entity is in Region 1 or 2.
Safe landing, however, was not checking the region of the entity
and was therefore waiting on entities that were not in region 1 or 2
2019-05-21 11:23:04 -07:00
Sam Gateau
54c14340ef
Merge pull request #15597 from amerhifi/master
...
Case BUGZ-277 : Android build error (on windows host) stat properties missing (please review suggestion)
2019-05-21 11:11:29 -07:00
SamGondelman
264051ed6d
fix myavatar setSkeletonModelURL
2019-05-21 10:40:58 -07:00
Shannon Romano
8d36b90b8b
Merge pull request #15594 from huffman/feat/appconfig
...
DEV-54: Add support for application config
2019-05-21 10:01:19 -07:00
amerhifi
b3285050ed
moving the properties out of the define since the values are going to be the same either way
2019-05-21 09:43:09 -07:00
Zach Fox
e79518e092
Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc
2019-05-21 09:28:02 -07:00
amerhifi
56d8e0123f
resolving qt moc error with propertie missing for android
2019-05-21 09:19:56 -07:00
Ryan Huffman
d9f164ba3b
Add support for application config
2019-05-20 22:00:26 -07:00
Anthony Thibault
952df9f77d
Merge pull request #15510 from AndrewMeadows/22007-hifiQtBuildv2
...
Case 22007: vcpkg update for Qt
2019-05-20 15:08:14 -07:00
Andrew Meadows
e8b0084fdb
Merge pull request #15588 from sabrina-shanman/bug_myavatar_res-state
...
(BUGZ-262) Add debug tool for transitions
2019-05-20 14:31:05 -07:00
SamGondelman
2e666836c7
add more options to render scripting interface
2019-05-20 13:42:53 -07:00
Andrew Meadows
f2f11b9509
only build qt.conf for DEV macos and unix builds
2019-05-20 15:00:07 -04:00
sabrina-shanman
fa7621896a
Add debug icon which shows on render items with transitions
2019-05-20 11:58:01 -07:00
Zach Fox
9deccd3ba7
Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc
2019-05-20 09:36:13 -07:00
Andrew Meadows
9b78edd062
more correct qt.conf for Linux and MacOS dev environment
2019-05-20 11:50:09 -04:00
Zach Fox
15bdb66943
Integrate Status into top bar; improve Audio settings; improve spacing between settings
2019-05-17 17:25:48 -07:00
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
Sam Gondelman
ca537ef16a
Merge pull request #15584 from SamGondelman/loadingSphere
...
BUGZ-132: Fix avatar loading spheres
2019-05-17 16:24:12 -07:00
SamGondelman
3273f46179
fix avatar loading spheres
2019-05-17 15:29:27 -07:00
Brad Hefta-Gaub
b5da7f00de
Merge pull request #15581 from zfox23/SUI/menuAndVRButton
...
Simplified UI V1: Remove some extra menus from top bar; Only show VR button if headset connected at startup
2019-05-17 14:41:04 -07:00
Howard Stearns
f1e8343b30
put DomainServerCheckIn on NodeList thread
2019-05-17 14:30:30 -07:00
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
Simon Walton
024dfbf8b7
Merge pull request #15563 from SimonWalton-HiFi/avatar-banner-emissive
...
Make avatar-theft banner emissive
2019-05-17 10:03:37 -07:00
David Rowe
4ce2c39d0a
Revise display plugin JSDoc in the Window API
2019-05-17 21:34:36 +12:00
Sam Gateau
ffbe055fa8
Merge pull request #15569 from SamGondelman/switch
...
BUGZ-187: Proper Render Scripting Interface with renderMethod property
2019-05-16 18:29:18 -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
SamGondelman
db813fab6a
threadsafe setRenderMethod
2019-05-16 16:48:23 -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
SamGondelman
451c52fa47
merge with master
2019-05-16 16:02:52 -07:00
SamGondelman
fee20d9e46
render scripting interface + renderMethod control
2019-05-16 16:01:21 -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
Andrew Meadows
c660ddd1af
Merge master into 22007-hifiQtBuildv2
2019-05-16 12:31:39 -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
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
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
Andrew Meadows
4cf9673dbb
Merge master into 22007-hifiQtBuildv2
2019-05-15 14:10:30 -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
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
Simon Walton
9f245b07c9
Make avatar-theft banner emissive
2019-05-15 10:03:31 -07:00
Andrew Meadows
9884d390b8
fix qt.conf location for MacOS
2019-05-15 09:34:08 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI
...
Simplified UI v1
2019-05-14 17:45:30 -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
Simon Walton
e768beb9b1
Allow for delayed challenges if salt is empty
2019-05-14 15:53:35 -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
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
