Chris Collins
6d57b4df38
Merge pull request #11108 from jherico/installer_remove_pdb
...
Fix installer issues
2017-08-03 12:51:58 -07:00
Armads
dff4e6e32c
WL21423 Changing order of camera setup steps
2017-08-03 15:40:38 -04: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
Brad Davis
4756d4af66
Merge pull request #6 from marko8904/pr11108
...
Switching to completely silent VC++ redistributable installation
2017-08-03 09:50:29 -07:00
Marko Kudjerski
2279e174e6
Switching to completely silent VC++ redistributable installation
2017-08-03 09:41:41 -07: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
Armads
24718e2424
WL21423 Camera mode on startup is determined by user settings and HMD status
2017-08-03 09:03:23 -04:00
David Rowe
e29bed7f07
Don't auto-grab if trigger fully pressed when laser starts intersecting
2017-08-03 20:26:21 +12:00
David Rowe
1ba658ee45
Implement grouping and ungrouping
2017-08-03 19:52:39 +12:00
Brad Hefta-Gaub
0f73496a44
Merge pull request #11055 from misslivirose/fix-chat-bubble-length
...
Fix chat bubble length
2017-08-02 23:29:09 -07:00
Brad Hefta-Gaub
8f34250a69
Merge pull request #11109 from kencooke/audio-wasapi-qt591
...
Update WASAPI plugin
2017-08-02 23:27:29 -07:00
David Rowe
1e1cb3a02e
Fix scale tool highlight color
2017-08-03 13:24:38 +12:00
David Rowe
1b866fdf9e
Enable/disable grouping buttons depending on current group selection
2017-08-03 13:20:14 +12:00
Ken Cooke
3c1607715e
Updated WASAPI plugin
2017-08-02 17:42:56 -07:00
David Rowe
c4eac1660c
Fix app toggling and hand swapping issues
2017-08-03 11:46:05 +12:00
David Rowe
37c1060080
Fix button highlighting and clicking
2017-08-03 11:06:51 +12:00
VRCat\VRKitten
e4e4ead4af
'Untabified' files
2017-08-02 16:56:02 -06:00
VRCat\VRKitten
dfb6027347
Last Fixes
...
- Made parent-ator be off unless it is equipped (this does have the ramification that it does not turn on when it first rezzes. When you equip it it turns on)
- Added the localOnly: true setting to the audio
2017-08-02 16:50:23 -06:00
seefo
82654c7cda
Made requested changed to puck-attach.js
2017-08-02 15:28:26 -07:00
Dante Ruiz
1e1ddf2941
making requested changes
2017-08-02 22:22:55 +01:00
Brad Davis
5a7a6bab70
Remove PDB files, eliminate sixense
2017-08-02 14:08:46 -07:00
seefo
961f748d87
Fixed a potential bug with puck-attach parenting
2017-08-02 13:08:44 -07:00
seefo
620f1a65c0
New puck-attach script
2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07:00
druiz17
6680be2a03
Merge pull request #11103 from vladest/fix_toolbar_apps_switch
...
Fix toolbar apps switch
2017-08-02 12:59:31 -07:00
anshuman64
f3a9481123
Merge pull request #11104 from vladest/audio_mute_mouseover
...
Audio mic bar show only rectangle on mouse over
2017-08-02 12:32:15 -07:00
vladest
638eeede43
Merge conflict
2017-08-02 20:07:06 +02:00
vladest
7d361c69c2
Audio mic bar show only rectangle on mouse over
2017-08-02 19:52:47 +02:00
Dante Ruiz
90db4aa9c0
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-02 18:18:17 +01: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
David Kelly
96500d897c
Merge pull request #11057 from zfox23/contextOverlays_renderMOde
...
Context Overlays - new render stuff. PREPARE FOR EDGE HIGHLIGHTING
2017-08-02 09:28:53 -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
David Rowe
25bbdba987
Add Tool menu options panels, in particular grouping buttons
2017-08-02 22:17:02 +12:00
David Rowe
83f580c514
Generalize Tool menu UI
2017-08-02 19:07:11 +12:00
David Rowe
fb1284ad61
Clear grouping selection when choose another tool
2017-08-02 16:12:49 +12:00
David Rowe
53d755d8da
Clear grouping selection when drop tool
2017-08-02 14:45:19 +12:00
David Rowe
26a14d0934
Swap button and tool icon colours to match grouping highlights
2017-08-02 14:41:42 +12:00
David Rowe
65e57a9262
Highlight grouping entities
2017-08-02 14:38:26 +12: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
David Rowe
c686cef4a0
Collect grouping data
2017-08-02 13:15:53 +12:00
David Rowe
7e1584a43e
Add grouping state
2017-08-02 12:27:02 +12:00
