Sam Gondelman
|
a7842fe3ea
|
Merge branch 'master' into proceduralMesh
|
2019-05-21 09:51:33 -07:00 |
|
Howard Stearns
|
f1e8343b30
|
put DomainServerCheckIn on NodeList thread
|
2019-05-17 14:30:30 -07:00 |
|
SamGondelman
|
6d3e23a7fe
|
merge with master
|
2019-05-16 20:03:10 -07: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 |
|
SamGondelman
|
283cc18269
|
Merge remote-tracking branch 'upstream/master' into proceduralMesh
|
2019-05-16 16:33:16 -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 |
|
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 |
|
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 |
|
Brad Davis
|
9bcc23f0c4
|
PR comments
|
2019-05-16 09:40:22 -07:00 |
|
SamGondelman
|
da254c2ccc
|
(¬‿¬)
|
2019-05-15 23:48:04 -07:00 |
|
Brad Davis
|
5db78ef2e1
|
Add scripting to set the refresh rate
|
2019-05-15 12:55:25 -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
|
68fb43ec7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug
|
2019-05-14 10:11:02 -07:00 |
|
Zach Fox
|
c57ddf969a
|
Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI
|
2019-05-14 09:32:07 -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 |
|
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 |
|
Roxanne Skelly
|
aa16430cf4
|
add a comment and kick build servers
|
2019-05-13 17:25:06 -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 |
|
Simon Walton
|
305a215d21
|
Pass a QObject context for the functor
|
2019-05-13 15:50:04 -07:00 |
|
Simon Walton
|
ede8859cc7
|
Call correct NodeList::reset() from Application
|
2019-05-13 14:38:34 -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 |
|
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 |
|
SamGondelman
|
eb8c722080
|
fix runtime switch
|
2019-05-13 09:58:55 -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 |
|
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 |
|
Zach Fox
|
314c04ab96
|
Simplified UI v1
|
2019-05-10 10:49:25 -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 |
|
SamGondelman
|
59e7db2d6b
|
Merge remote-tracking branch 'upstream/master' into switch
|
2019-05-09 11:42:05 -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 |
|
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 |
|
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 |
|
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
|
e770bd6142
|
build CollisionShapes and load RigidBodies even when not yet stepping
|
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 |
|
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 |
|
Ken Cooke
|
ea9690d72b
|
Disable MIDI rescan after devicechange, to avoid deadlock
|
2019-05-06 10:46:54 -07:00 |
|
Shannon Romano
|
4c31c6f6e5
|
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification
Avatar verification
|
2019-05-06 08:04:06 -07:00 |
|
John Conklin II
|
16ece6c2fc
|
Merge pull request #15493 from amantley/bugPushToTalk
When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon
|
2019-05-03 09:03:36 -07:00 |
|
Angus Antley
|
1f004f34c4
|
added check for valid dynamic casts
|
2019-05-02 21:59:11 -07:00 |
|
Angus Antley
|
f019fa3a7c
|
Merge remote-tracking branch 'upstream/master' into bugPushToTalk
|
2019-05-02 18:28:34 -07:00 |
|