Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Brad Hefta-Gaub
da74114b32
Merge pull request #8070 from AndrewMeadows/triangle-soup-4
...
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Ryan Huffman
847685d224
Add tracking of away.js
2016-06-22 09:06:59 -07:00
Ryan Huffman
1be30ccce9
Fix enabled_edit firing on disable
2016-06-22 08:24:50 -07:00
howard-stearns
223f9bda2e
gratuitous change to force things.
2016-06-21 17:03:49 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Howard Stearns
7e88772e85
Merge pull request #8106 from howard-stearns/triggering-change
...
triggering change
2016-06-21 13:51:12 -07:00
Anthony J. Thibault
972c292857
Fix for equip-hotspot being visible for whiteboard markers
2016-06-21 11:59:11 -07:00
Andrew Meadows
f41fb30ace
add "Static Mesh" option to edit.js
2016-06-20 17:29:20 -07:00
Anthony J. Thibault
2ed88bca6d
Bug fix for bow and arrow.
...
* before this change the releaseEquip message was not getting sent to the bow,
which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
2016-06-20 17:24:36 -07:00
howard-stearns
bfb697bc77
No hysteresis.
2016-06-20 17:04:23 -07:00
Anthony J. Thibault
8817bbea09
reduce log spam
2016-06-20 15:53:33 -07:00
Anthony J. Thibault
e5159ad213
Added "Developer > Hands > Drop Without Shake" menu option
2016-06-20 14:50:15 -07:00
Anthony J. Thibault
408f65100b
Bug fix for dropping near-grabbed entities via thump press.
2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884
Change raw for loop to Array.prototype.forEach instead
2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef
brush clearing
2016-06-20 13:21:06 -07:00
Anthony J. Thibault
359483d9ba
coding standard fix
2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68
Remove /* style multi-line comments
2016-06-20 11:40:59 -07:00
Anthony J. Thibault
35276c3893
Use Array.prototype.filter instead of my hand rolled filter function
2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb
Primary thumb press can be used to drop an equipped object
2016-06-20 11:22:56 -07:00
Anthony J. Thibault
14efd5dc12
Disable WANT_DEBUG_STATE
2016-06-20 10:44:09 -07:00
Anthony J. Thibault
1759132377
Use trigger to both grab and equip objects
...
* Removed entry into HOLD state via secondary aka grip buttons.
* Changed equip logic to prioritize equip over near over far grabs.
* Added drop gesture, upside down controller + slight shake + trigger press
* Bug fix for near grab snapping to an incorrect offset after a far grab (this bug is present in master)
2016-06-20 10:39:07 -07:00
Brad Hefta-Gaub
c297fa7c0e
Merge pull request #8060 from imgntn/usersUpdates
...
Hide users.js options when logged out
2016-06-17 14:17:42 -07:00
Brad Hefta-Gaub
852eda3101
Merge pull request #8066 from imgntn/faceCameraText
...
Add face camera option to edit.js text entity properties
2016-06-17 14:14:06 -07:00
Howard Stearns
4aa5e87a26
Merge pull request #8093 from jherico/vive-toolbars
...
Support toolbar API
2016-06-17 13:43:16 -07:00
Howard Stearns
aeebe8b3fb
Merge pull request #8094 from howard-stearns/fix-depth-request
...
fix depth request
2016-06-17 13:26:07 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
howard-stearns
74a3db4e1c
When setting Reticle.depth, don't assume that we're in the center of the
...
HUD.
2016-06-17 11:14:56 -07:00
Bradley Austin Davis
5bc8b53d1b
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
99a0804429
Merge pull request #8086 from imgntn/activeElement
...
Fix some edit.js errors and log messages
2016-06-16 18:25:20 -07:00
David Rowe
77976281ab
Make audio device selection available without advanced menus enabled
2016-06-17 09:58:44 +12:00
Ryan Huffman
c2ebcd1f77
Make activity logging from scripts only available for certain events
2016-06-16 13:49:25 -07:00
Ryan Huffman
bce05df56b
Update enabled_edit to only get sent when you have permission
2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27
Add opened_marketplace and enabled_edit to edit.js
2016-06-16 13:18:08 -07:00
James B. Pollack
96d6cb12ac
supress some messages and errors
2016-06-16 12:27:03 -07:00
Howard Stearns
faa2624ca7
Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays
...
Continue grabbing through overlays
2016-06-15 16:07:01 -07:00
Howard Stearns
0915d1287f
Merge pull request #8079 from howard-stearns/no-laser-without-trigger
...
No laser without trigger
2016-06-15 16:06:56 -07:00
Howard Stearns
980eafb972
Merge pull request #8065 from hyperlogic/feature/grab-script-preliminaries
...
grab script preliminaries
2016-06-15 16:06:06 -07:00
howard-stearns
6f671b7cde
see comment.
2016-06-15 15:17:34 -07:00
howard-stearns
1e3b20b66d
Explicit check enumerated states instead of relying on order, per
...
feedback.
2016-06-15 15:06:36 -07:00
howard-stearns
2c7642a367
Do not make ReticleClick when we enter an overlay with the trigger
...
pressed.
2016-06-15 12:28:42 -07:00
howard-stearns
6366ca7508
Go red for full trigger.
2016-06-15 11:08:59 -07:00
Bradley Austin Davis
71bf9384ce
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-15 10:45:51 -07:00
Howard Stearns
b9754c8564
continue grabbing through overlays
2016-06-14 20:17:52 -07:00
Howard Stearns
ae65790bf3
no laser (or mouse cursor) from hand controllers unless trigger squeezed
2016-06-14 18:07:08 -07:00
Anthony J. Thibault
071584597d
Merge branch 'vive-ui' into feature/grab-script-preliminaries
2016-06-14 15:33:38 -07:00
Anthony J. Thibault
67aac09033
Set state debug flag to false
2016-06-14 14:59:29 -07:00
