Brad Hefta-Gaub
5638f6228b
Merge pull request #8792 from howard-stearns/allow-hmd-hand-controllers-without-interface-focus
...
allow hand controller operations when Interface doesn't have focus, but ONLY when in hmd
2016-10-13 13:48:44 -07:00
Ryan Huffman
55d4695489
Fix edit.js not allowing imports when you only have temp rez permissions
2016-10-13 11:51:54 -07:00
howard-stearns
0099a4e549
allow hand controller operations when Interface doesn't have focus, but
...
ONLY when in hmd.
2016-10-12 11:23:06 -07:00
Seth Alves
16af14d1f6
Merge pull request #8758 from hyperlogic/bug-fix/allow-ignoreik-false
...
allow equipped object to follow hand and not controller
2016-10-12 09:52:57 -07:00
Brad Hefta-Gaub
0f1e61e240
Merge pull request #8781 from ZappoMan/tweakGrabPoint
...
adjust grab indicators
2016-10-12 07:08:16 -07:00
Brad Hefta-Gaub
6630ec3208
Merge pull request #8746 from ctrlaltdavid/21033
...
Send High Fidelity user's visibility when users.js starts up
2016-10-11 21:36:22 -07:00
Brad Hefta-Gaub
8ac31a041d
Merge pull request #8654 from ZappoMan/betterAway
...
fix away HMD unmouted logic
2016-10-11 20:35:08 -07:00
Anthony J. Thibault
f76dbeeffd
Edit.js now works with new ignoreIK default
2016-10-11 17:12:02 -07:00
Brad Hefta-Gaub
e1a3bc7d55
hide/show grab point sphere only when in a grabbable entity
2016-10-11 16:22:42 -07:00
Brad Hefta-Gaub
93d9cf7917
adjust grab indicators
2016-10-11 12:42:26 -07:00
Andrew Meadows
abb05bc686
Merge pull request #8753 from ctrlaltdavid/21068
...
Improve indication of user not being logged in
2016-10-11 10:40:37 -07:00
Brad Hefta-Gaub
774d87a7a7
Merge pull request #8773 from howard-stearns/marketplace-button-state
...
make marketplace button state match whether tablet is being shown
2016-10-10 15:50:07 -07:00
Brad Hefta-Gaub
a877f182f7
Merge pull request #8771 from howard-stearns/kick-by-laser
...
fix kick by laser
2016-10-10 15:36:16 -07:00
howard-stearns
333ec388a8
make marketplace button state match whether tablet being shown
2016-10-10 14:30:47 -07:00
howard-stearns
1051c068e1
kick by hand controller
2016-10-10 13:47:08 -07:00
Brad Hefta-Gaub
4ec9299930
fix reticle depth when not moving mouse, but moving head relative to HUD
2016-10-08 14:31:30 -07:00
Brad Hefta-Gaub
20c522a9bc
fix more bugs in away
2016-10-08 13:45:18 -07:00
Brad Hefta-Gaub
3aa1c36f53
Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway
2016-10-08 11:50:10 -07:00
Anthony J. Thibault
7c7a9055d1
Allow grabbed objects to override the ignoreIK = true default.
...
They can do this by adding the following to their userData.
grabbableKey: {
ignoreIK: false
}
When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb
Fix for exception in handControllerGrab.js
...
Specifically this:
[UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
2016-10-07 14:48:55 -07:00
Ryan Huffman
a5e3fa45c3
Fix advanced movement being disabled
2016-10-07 10:30:18 -07:00
Ryan Huffman
c74df965ba
Fix misnamed function and duplicate onFinish in tutorial
2016-10-07 10:30:18 -07:00
Ryan Huffman
fec8049226
Add proper disabling to advanced movement script
2016-10-07 10:30:18 -07:00
Ryan Huffman
827506e929
Disable 180 spin in tutorial
2016-10-07 10:30:18 -07:00
Ryan Huffman
a4ffa7b23f
Add disabling of right click menu with vive
2016-10-07 10:30:18 -07:00
Ryan Huffman
14323a06b3
Add interface to disable hand controller grab functionality
2016-10-07 10:30:18 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
David Rowe
52fbb654fa
Tweak location of users online minimize/maximize button
2016-10-07 15:43:54 +13:00
David Rowe
c637649805
Make users online title say to login to view
2016-10-07 15:25:47 +13:00
David Rowe
4ca0048ec9
Display minimized users list when not logged in
2016-10-07 15:21:24 +13:00
David Rowe
e2e762f9e7
Merge branch 'master' into 21055
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2016-10-07 11:27:35 +13:00
David Rowe
b2f3b47db9
Send High Fidelity user's visibility when users.js starts up
2016-10-06 12:16:57 +13:00
Ryan Huffman
d50689b795
Remove disabling of teleport in hand grab
2016-10-04 20:25:46 -07:00
Ryan Huffman
d0ba53a069
Change name of isTooCloseToTeleport to be more descriptive
2016-10-04 20:22:22 -07:00
Ryan Huffman
1e6aba1928
Fix teleport not removing overlay on teleport
2016-10-04 20:21:32 -07:00
Ryan Huffman
2ef7c9a57a
Disable smooth movement in teleport.js
2016-10-04 20:21:32 -07:00
Ryan Huffman
53623f7583
Make teleport.js normal rejection more lenient
2016-10-04 20:21:30 -07:00
Ryan Huffman
813ed59f00
Update teleport to not collide with non collidable entities
2016-10-04 20:19:54 -07:00
Ryan Huffman
75265cff6e
Update teleport to not let you teleport into walls
2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737
Disable ray picking against invisible objects in far grab and teleport
2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
Ryan Huffman
8343cfd687
Add grip to unequip
2016-10-04 16:34:18 -07:00
Ryan Huffman
289cd6ba2b
Adjust hand controller unequip rotation threshold
2016-10-04 16:34:18 -07:00
David Rowe
caf1a93354
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-10-04 10:51:14 +13:00
Brad Hefta-Gaub
546d4ff986
remove mic and window resize notifications
2016-10-02 09:10:12 -07:00
David Rowe
ad5d525340
Fix keyboard status when switching between entities editor tabs
2016-09-30 14:13:35 +13:00
David Rowe
5e842843c6
Set alphabetic/numeric keyboard per field entered
2016-09-30 11:54:32 +13:00
David Rowe
e3be34528f
Fix keyboard flickering when select entities
...
Fix entities list footer count of selected entities in the process.
2016-09-29 16:53:20 +13:00
David Rowe
8e44096981
Fix last entities properties not scrolling when keyboard raised
2016-09-29 15:59:24 +13:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
