David Rowe
401a00441a
Merge branch 'master' into vr-edit-a
2017-08-11 15:26:20 +12:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Ken Cooke
d0e7584f0f
Merge pull request #11158 from kencooke/audio-input-dummy
...
Support for running Interface without a microphone
2017-08-10 06:47:04 -07:00
Ken Cooke
ee752df653
fix typo
2017-08-09 20:11:52 -07:00
Ken Cooke
bcdf13c59c
Add explicit shutdown request, since null device means something else
2017-08-09 19:40:07 -07:00
Ken Cooke
ee6d4dfc14
If real input device fails to start, use dummy input
2017-08-09 17:50:20 -07:00
Ken Cooke
fc5b4be459
bugfix
2017-08-09 16:59:02 -07:00
Ken Cooke
9c6b7306c4
Re-implement callback to Use common handleAudioInput()
2017-08-09 16:58:12 -07:00
Ken Cooke
7daa3ecff3
Handle dummy input callbacks
2017-08-09 15:54:14 -07:00
Zach Fox
b8c45b0c30
Don't always do precision picking inside mouseMoveEvent
2017-08-09 14:23:43 -07:00
Ken Cooke
6f2cc9cfeb
When no input device, create dummy input to generate callbacks
2017-08-09 14:01:17 -07:00
David Rowe
f88191b7b3
Merge branch 'master' into vr-edit-a
2017-08-08 16:43:20 +12:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
Seth Alves
c570d483d8
Merge pull request #11113 from elisa-lj11/zip_drag
...
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
83a30e2f35
missed some statics
2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d
avoid calling a pure virtual function from GLBackend dtor
2017-08-06 12:47:45 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
David Rowe
5d1732c5aa
Merge branch 'master' into vr-edit-a
2017-08-05 20:45:12 +12:00
Elisa Lupin-Jimenez
af432087e3
small revisions to bracketing/variable name
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
Brad Davis
0e508432c4
PR comments
2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Chris Collins
ddb7d0f1ba
Merge pull request #11112 from kencooke/audio-gate-bugfix
...
Possible fix for "screeching noise" after audio input device changes
2017-08-03 13:55:47 -07:00
David Rowe
e2dccc1420
Merge branch 'master' into vr-edit-a
2017-08-04 07:33:18 +12:00
vladest
a439cc1837
Make connection to tablet shown signal more consistent, eliminates missed signals
2017-08-03 20:58:44 +02:00
vladest
b049b0f415
Merge conflicts
2017-08-03 19:43:42 +02:00
Ken Cooke
6ea4ed80cd
Suppress initial PacketType::SilentAudioFrame on audio gate startup
2017-08-03 09:19:08 -07:00
Andrew Meadows
e465186511
Merge pull request #11048 from 1P-Cusack/21389
...
WL21389 PR1: Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07:00
vladest
638eeede43
Merge conflict
2017-08-02 20:07:06 +02:00
Seth Alves
728e7fb253
Merge pull request #11099 from druiz17/bug-blank-tablet-switch
...
fix blank tablet when switching between HMD and Desktop mode quickly
2017-08-02 10:09:56 -07:00
Seth Alves
2319006868
Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash
...
Fix for crash when attempting to teleport while avatar was loading
2017-08-02 10:00:13 -07:00
Dante Ruiz
8d69cd8999
Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch
2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01
better solution to help and blank tablet issues
2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e
Merge branch 'master' into fix_toolbar_apps_switch
2017-08-02 16:34:49 +02:00
vladest
4330e31212
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4
Merge pull request #11097 from druiz17/bug-entity-crash2
...
Lock the script engine in EntityEditPacketSender
2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8
Fix for crash when attempting to teleport while avatar was loading
...
The fix had two parts.
* Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
* Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
2017-08-01 18:40:43 -07:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
Dante Ruiz
cca29e849b
fix issue of tablet begin blank when switching between HMD and Desktop mode
2017-08-01 23:18:42 +01:00
Anthony J. Thibault
25b5cb4762
Switch order of precondition and setSecondaryTargets
2017-08-01 13:17:33 -07:00
Dante Ruiz
c22e08f3e8
loacked script engine in EntityEditPacketSender
2017-08-01 19:58:23 +01:00
