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 |
|
Zach Fox
|
8724cf4edf
|
UIT TextField
|
2019-05-14 12:27:33 -07:00 |
|
Zach Fox
|
2080aa6676
|
Some fun motion for experimentation
|
2019-05-14 11:56:07 -07:00 |
|
Zach Fox
|
cf46f3c9d4
|
CheckBox UIT and CheckBox added to Avatar app
|
2019-05-14 11:50:07 -07:00 |
|
Roxanne Skelly
|
68fb43ec7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
|
2019-05-14 10:11:02 -07:00 |
|
amerhifi
|
fe6b2fceed
|
addressing comment in pr. removing extra space added in previous checkin
|
2019-05-14 09:39:44 -07:00 |
|
Zach Fox
|
c57ddf969a
|
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
|
2019-05-14 09:32:07 -07:00 |
|
amerhifi
|
a5f4664001
|
Merge branch 'master' into feature/platform
|
2019-05-14 09:27:15 -07:00 |
|
Shannon Romano
|
8597a51657
|
Merge pull request #15556 from jherico/fix/watchdog_spam
BUGZ-131: Additional silencing of watchdog spam
|
2019-05-14 08:10:02 -07:00 |
|
amerhifi
|
2a6dc53395
|
Merge branch 'master' into feature/platform
|
2019-05-14 06:18:37 -07:00 |
|
Howard Stearns
|
33f1bd965e
|
Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList
Call correct NodeList::reset() from Application
|
2019-05-13 19:49:41 -07:00 |
|
Brad Davis
|
7d8e14f510
|
Additional silencing of watchdog spam
|
2019-05-13 18:19:29 -07:00 |
|
Seth Alves
|
8b2d12e2f7
|
when an avatar entity is deleted, also delete its descendants
|
2019-05-13 17:33:10 -07:00 |
|
Zach Fox
|
89006cd9c5
|
Hide controls in top left; don't remove certain menus; fixup slider UIT
|
2019-05-13 17:26:19 -07:00 |
|
Roxanne Skelly
|
aa16430cf4
|
add a comment and kick build servers
|
2019-05-13 17:25:06 -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 |
|
Roxanne Skelly
|
0319e8cc4d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
|
2019-05-13 16:01:39 -07:00 |
|
Zach Fox
|
7bb2d6871b
|
Simlpified Slider (not totally working; position is off)
|
2019-05-13 15:58:04 -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 |
|
Simon Walton
|
305a215d21
|
Pass a QObject context for the functor
|
2019-05-13 15:50:04 -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 |
|
jennaingersoll
|
712167c623
|
Merge pull request #15476 from ctrlaltdavid/M22407
Case 22407: Quat JSDoc update
|
2019-05-13 15:17:58 -07:00 |
|
Simon Walton
|
ede8859cc7
|
Call correct NodeList::reset() from Application
|
2019-05-13 14:38:34 -07:00 |
|
Andrew Meadows
|
2d21b5c269
|
use qt.conf file to find Qt resources
|
2019-05-13 14:26:16 -07:00 |
|
Brad Hefta-Gaub
|
51f2d1748e
|
Merge pull request #15544 from sabrina-shanman/bug_avatar_res-state
(BUGZ-40) Check for possible avatar fade race condition
|
2019-05-13 13:41:09 -07:00 |
|
Shannon Romano
|
32d3014d0d
|
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2
case 22190: Disable triggering away state when interface focus lost
|
2019-05-13 13:22:28 -07:00 |
|
Shannon Romano
|
8aee64c102
|
Merge pull request #15540 from jherico/fix/gl_crash
BUGZ-125: Error message instead of crash if the GL version is too low
|
2019-05-13 13:12:30 -07:00 |
|
Shannon Romano
|
46d75a61b3
|
Merge pull request #15541 from SimonWalton-HiFi/clear-connections-on-NodeID-change
Clear any reliable connection state upon Node ID change
|
2019-05-13 13:11:05 -07:00 |
|
Zach Fox
|
f799f96fba
|
simplifiedUI UIT switch
|
2019-05-13 13:04:12 -07:00 |
|
amerhifi
|
270d7feb7f
|
removed the duplicate function declaration
|
2019-05-13 12:20:22 -07:00 |
|
amerhifi
|
8623c3d74f
|
removing testing function declared in app.h
|
2019-05-13 12:14:48 -07:00 |
|
amerhifi
|
71d534c97d
|
merged master and resolved application conflict
|
2019-05-13 12:09:50 -07:00 |
|
Sam Gondelman
|
4c4589271c
|
Merge pull request #15469 from SamGondelman/switch
Case 22379: Run-time switch for deferred/forward rendering
|
2019-05-13 11:14:26 -07:00 |
|
Zach Fox
|
feb5021372
|
UIT RadioButton
|
2019-05-13 11:07:39 -07:00 |
|
SamGondelman
|
eb8c722080
|
fix runtime switch
|
2019-05-13 09:58:55 -07:00 |
|
amerhifi
|
9899b8c858
|
Merge branch 'master' into feature/platform
|
2019-05-13 06:52:13 -07:00 |
|
amerhifi
|
13c9bb078c
|
cleaned up pointers from the platform. Relized that having to manage them outisde of the platform will cause other issues.
|
2019-05-13 06:50:08 -07:00 |
|
sabrina-shanman
|
736c7a9736
|
Change logging from 'fade-out animation' to 'fade-out transition'
|
2019-05-10 15:18:52 -07:00 |
|
sabrina-shanman
|
6f5bf01f2b
|
Add sanity check and logging for possible avatar fade lambda race condition
|
2019-05-10 14:33:25 -07:00 |
|
Shannon Romano
|
5c9570cffb
|
Merge pull request #15539 from jherico/fix/watchdog_spam
BUGZ-131: Reduce spam from watchdog thread
|
2019-05-10 14:24:15 -07:00 |
|
Simon Walton
|
4b51d81b42
|
Clear any reliable connection state upon Node ID change
|
2019-05-10 12:06:38 -07:00 |
|
Zach Fox
|
112e13383b
|
Dock it!
|
2019-05-10 12:03:29 -07:00 |
|
Brad Davis
|
0f8ddae9df
|
Reduce spam from watchdog thread
|
2019-05-10 12:01:07 -07:00 |
|
Shannon Romano
|
0d28932181
|
Merge pull request #15529 from Atlante45/feat/more-ice-logging
Add instrumentation to help track down connection issues
|
2019-05-10 11:57:24 -07:00 |
|
Brad Davis
|
db88f14e13
|
Error message instead of crash if the GL version is too low
|
2019-05-10 11:51:50 -07:00 |
|
Zach Fox
|
314c04ab96
|
Simplified UI v1
|
2019-05-10 10:49:25 -07:00 |
|
amerhifi
|
edb3206a24
|
adding macos platform. Misisng display and cpu info
|
2019-05-10 09:55:26 -07:00 |
|
Clement
|
0a7352074c
|
Fix android build
|
2019-05-09 17:17:43 -07:00 |
|
Shannon Romano
|
930032bcc6
|
Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop
case 22166: Build complex shapes in ThreadPool instead of MainLoop
|
2019-05-09 17:14:50 -07:00 |
|
Shannon Romano
|
6aa8dc7c42
|
Merge pull request #15534 from kencooke/audio-PTT-output-ducking
Reduce echo when push-to-talk is used
|
2019-05-09 15:54:15 -07:00 |
|
Andrew Meadows
|
a0b34e4f15
|
more correct clearing of dirty flags for AvatarMotionState
|
2019-05-09 14:45:36 -07:00 |
|
Andrew Meadows
|
c7432ffe5f
|
also update easy flags when rebuilding avatar shape
|
2019-05-09 13:48:07 -07:00 |
|
Ken Cooke
|
1b733d3fb3
|
While PTT is active, duck the audio output by 20dB to reduce echo
|
2019-05-09 12:56:07 -07:00 |
|
amerhifi
|
0d97543ece
|
code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform
|
2019-05-09 12:04:41 -07:00 |
|
SamGondelman
|
59e7db2d6b
|
Merge remote-tracking branch 'upstream/master' into switch
|
2019-05-09 11:42:05 -07:00 |
|
danteruiz
|
0fae615cb4
|
fix dock widget context
|
2019-05-09 09:20:50 -07:00 |
|
Clement
|
b3d0705e39
|
Extend ICE logging + make it more searchable
|
2019-05-08 18:38:00 -07:00 |
|
Anthony Thibault
|
4ee39355f1
|
Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident
Add gpu_name, gpu_driver & gpu_memory to crash annotations
|
2019-05-08 16:09:13 -07:00 |
|
David Rowe
|
302e876857
|
Update InteractiveWindow JSDoc per changes in master
|
2019-05-09 10:26:16 +12:00 |
|
David Rowe
|
414f27208d
|
Merge branch 'master' into M22147
# Conflicts:
# interface/src/scripting/DesktopScriptingInterface.h
# interface/src/ui/InteractiveWindow.h
|
2019-05-09 08:43:05 +12:00 |
|
Anthony Thibault
|
78403e4436
|
Add gpu_name, gpu_driver & gpu_memory to crash annotations
This may help us identify the hardware causing early gl initialization errors.
|
2019-05-08 13:33:45 -07:00 |
|
David Rowe
|
c3730e41f7
|
Typos
|
2019-05-09 08:33:37 +12:00 |
|
Shannon Romano
|
15484436ca
|
Merge pull request #15507 from danteruiz/dockable-windows
case LILY-30: Dockable Interactive Windows
|
2019-05-08 12:16:04 -07:00 |
|
danteruiz
|
3806631bf1
|
dockable window
|
2019-05-08 10:04:31 -07:00 |
|
amerhifi
|
58cff374d7
|
merged master
|
2019-05-08 08:53:19 -07:00 |
|
Shannon Romano
|
e90f91f109
|
Merge pull request #15488 from sethalves/fix-indep-camera
case 22412: allow independent camera to be set by scripts
👍 by QL for pre-merge testing in the manu ticket
|
2019-05-07 09:38:54 -07:00 |
|
Andrew Meadows
|
f6916edac4
|
cleanup and removing some accidental C++-20-isms
|
2019-05-06 17:37:35 -07:00 |
|
Andrew Meadows
|
e770bd6142
|
build CollisionShapes and load RigidBodies even when not yet stepping
|
2019-05-06 17:37:35 -07:00 |
|
Andrew Meadows
|
af1f4364ef
|
don't forget to add detailedMotionStates to simulation
|
2019-05-06 17:37:35 -07:00 |
|
Andrew Meadows
|
a0841c937c
|
fix logic around updating off-thread shapes
|
2019-05-06 17:37:35 -07:00 |
|
Andrew Meadows
|
915cbb69df
|
split work out of EntityTree::update(), call it preUpdate()
|
2019-05-06 17:37:35 -07:00 |
|
Andrew Meadows
|
3eed8218ca
|
overhaul of MotionState and shape creations
|
2019-05-06 17:37:35 -07:00 |
|
Shannon Romano
|
86f562de1b
|
Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock
Case 20521: Unplugging headphones with hifi open causes freeze
|
2019-05-06 15:03:56 -07:00 |
|
Wayne Chen
|
845ad38106
|
Merge pull request #15503 from wayne-chen/useThresholdMutedWarning
Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers
|
2019-05-06 13:55:59 -07:00 |
|
amer cerkic
|
26b38f5950
|
ifndef protection for headers
|
2019-05-06 13:51:52 -07:00 |
|
Shannon Romano
|
1636256068
|
Merge pull request #15496 from davidkelly/dk/bugz-6
Increase max heartbeat time to 10 sec on mac
|
2019-05-06 13:03:25 -07:00 |
|
amer cerkic
|
8273e5b666
|
fixing stuff based on comments and feedback from Sam. willc reate template for some of the getters since its the same old
|
2019-05-06 12:27:46 -07:00 |
|
Ken Cooke
|
ea9690d72b
|
Disable MIDI rescan after devicechange, to avoid deadlock
|
2019-05-06 10:46:54 -07:00 |
|
amer cerkic
|
cadcb8b7c3
|
Merge branch 'master' into feature/platform
|
2019-05-06 10:37:14 -07:00 |
|
Shannon Romano
|
4c31c6f6e5
|
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
Avatar verification
|
2019-05-06 08:04:06 -07:00 |
|