David Rowe
e2dccc1420
Merge branch 'master' into vr-edit-a
2017-08-04 07:33:18 +12: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 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
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
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
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
Melissa Brown
c83caaacf5
Merge pull request #11062 from rabelaiis/21479
...
Make Xylophone mallets equipable, make the mallets provide haptic fee…
2017-08-01 17:05:23 -07:00
David Rowe
6d90b6d0fd
Simplify trigger click usage
2017-08-02 11:49:10 +12: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
Dante Ruiz
cca29e849b
fix issue of tablet begin blank when switching between HMD and Desktop mode
2017-08-01 23:18:42 +01:00
Seth Alves
b9456ab7b6
Merge pull request #11081 from Menithal/21464
...
Fixed Particle Editor Update event
2017-08-01 15:11:33 -07:00
Seth Alves
184c3d855d
Merge pull request #11061 from TurnMeUp-OG/21470
...
Fix tablet focus issue when property menu is open and field is selected
2017-08-01 15:10:26 -07:00
anshuman64
9bf4977e09
Merge pull request #11096 from humbletim/21487
...
WL 21487: Fix Camera behavior in Mirror mode
2017-08-01 14:59:06 -07:00
David Rowe
a94b2b367b
Simplify grip click handling
2017-08-02 09:16:24 +12:00
David Rowe
12d911f290
Add "group" bool button and icon
2017-08-02 08:41:53 +12:00
Brad Hefta-Gaub
0f374b5aa0
Merge pull request #11094 from marko8904/installer/nsis-compression
...
switching from LZMA (default) to BZIP2 for NSIS compression
2017-08-01 12:34:18 -07:00
Dante Ruiz
c22e08f3e8
loacked script engine in EntityEditPacketSender
2017-08-01 19:58:23 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6
* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
...
* restore access to "View > Mirror" from HMD mode
2017-08-01 13:41:28 -04:00
rabelaiis
f1d7ef76e7
Add the mallet js file
2017-08-01 23:41:16 +07:00
Scromie@turnmeupgames.com
9b28d546e0
Test plan
2017-08-01 12:32:27 +03:00
David Rowe
f2cf2cab6e
Generalize tool selected
2017-08-01 16:02:04 +12:00
Marko Kudjerski
6855dcbacf
use bzip2 compression only for PR builds (so that we internally benefit from faster builds)
2017-07-31 17:17:11 -07:00
David Rowe
ca7c747c96
Create entities at hand position rather than in front of avatar
2017-08-01 11:46:22 +12:00
Marko Kudjerski
46966b1132
switching from LZMA (default) to BZIP2 for NSIS compression
2017-07-31 16:19:34 -07:00
