Ken Cooke
3c1607715e
Updated WASAPI plugin
2017-08-02 17:42:56 -07: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
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
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 Kelly
588afaaa85
unused variable...
2017-08-01 16:59:42 -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
762b409814
unused variable
2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 16:18:20 -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
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
Anthony J. Thibault
25b5cb4762
Switch order of precondition and setSecondaryTargets
2017-08-01 13:17:33 -07:00
Dante Ruiz
51652482a4
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
2017-08-01 20:51:56 +01: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
Chris Collins
2331822394
Merge pull request #11082 from highfidelity/RC-49-591-HOTFIX
...
Build 49.3 Hotfix: Fix crash on double tap of stylus
2017-08-01 10:18:32 -07: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
Brad Davis
bea91be521
Fix for potential crash in JS console
2017-07-31 17:50:30 -07: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
Marko Kudjerski
ae31df426c
remove vcredist_x64 after installation
2017-07-31 16:52:38 -07:00
Marko Kudjerski
46966b1132
switching from LZMA (default) to BZIP2 for NSIS compression
2017-07-31 16:19:34 -07:00
David Kelly
e630e2f7e3
Merge pull request #11090 from davidkelly/dk/contextOverlaySetting
...
turn ContextOverlays completely off/on
2017-07-31 15:26:22 -07:00
Marko Kudjerski
de97dfc9d7
install the bundled vcredist_x64 instead of relying on DLLs being setup by cmake directly in the install folder
2017-07-31 15:25:02 -07:00
David Kelly
b371c875c4
undo tab mapping to bring up tablet, for now
2017-07-31 14:46:26 -07:00
LaShonda Hopper
0b79809f54
[WL21389] PR1 Feedback: Small change missed last commit (details below).
...
Until they're properly implemented, default the hedrons and polygons to
SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo.
Changes committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
2017-07-31 17:08:30 -04:00
