Triplelexx
a964edee91
change all references of Quat.getFront to Quat.getForward in scripts directory
2017-03-21 22:25:30 +00:00
Dante Ruiz
d2c139ce6e
fix error from using a misspelled function
2017-03-21 22:25:45 +01:00
Dante Ruiz
bf3c5dbf0e
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox
2017-03-21 19:47:16 +01:00
Dante Ruiz
1811a2edc7
fixed third eye laser
2017-03-21 19:45:00 +01:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Thijs Wenker
a8740614e2
CR Fixes
2017-03-18 01:22:06 +01:00
Atlante45
4c75680877
Set teleport target to Cancel if seat in use
2017-03-17 16:10:15 -07:00
Thijs Wenker
febe25511b
teleport.js - ignore entity support (for boxing gloves)
2017-03-17 21:10:06 +01:00
Stephen Birarda
d13752a7c6
use the correct property name for useAdvancedMovementControls
2017-03-15 10:34:43 -07:00
Stephen Birarda
bfc51d8222
use property not function for advanced movement controls
2017-03-15 10:25:06 -07:00
David Rowe
cb4bd58381
Load controller scripts in their own script engine
2017-03-15 14:31:13 +13:00
Stephen Birarda
7ddb5ff770
use correct boolean when changing AMC
2017-03-14 18:09:17 -07:00
Stephen Birarda
188530590a
add missing curly brace to script
2017-03-14 17:16:49 -07:00
Stephen Birarda
490cb83489
move advanced movement control changes to MyAvatar
2017-03-14 15:03:01 -07:00
Stephen Birarda
0926b2df2a
add LX snap turn to standard mapping
2017-03-13 15:14:20 -07:00
Anthony J. Thibault
3abc78e7d3
Fix for finger/sytlus on invisible/hidden tablet.
2017-03-10 17:18:13 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Seth Alves
2098cd5b5e
remove stylus and search-beams when grab script is shut down
2017-03-10 13:02:16 -08:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c
Small simplification of building stylusTarget list.
2017-03-09 14:04:13 -08:00
Anthony J. Thibault
1acc5ea760
Finger now points when near tablet + deadspot added when touching the tablet
2017-03-08 19:03:56 -08:00
Seth Alves
66d44ac6f0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-08 09:26:51 -08:00
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08:00
Anthony J. Thibault
836c701cb3
More accurate and responsive stylus and finger touching.
...
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.
* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Seth Alves
4886f1cbfc
don't run stylus-on-overlay code unless the overlay is a web3d overlay
2017-03-06 12:38:19 -08:00
Seth Alves
27066e89a6
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08:00
Seth Alves
eb47db4441
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:07:22 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Seth Alves
c677326025
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
...
Touch the tablet with your finger
2017-03-04 11:58:47 -08:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b
Merge pull request #9749 from ctrlaltdavid/21176
...
If someone else is grabbing entity you want to grab show their grab beam
2017-03-03 13:43:28 -08:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
David Rowe
388a144af1
Tidying after merge
2017-03-03 18:44:50 +13:00
David Rowe
482c23ead5
Merge branch 'master' into 21186
...
# Conflicts:
# scripts/system/controllers/handControllerGrab.js
2017-03-03 18:38:42 +13:00
Brad Hefta-Gaub
e655e442a0
Merge pull request #9799 from sethalves/steady-hand-lasers
...
Steady hand lasers
2017-03-02 18:27:39 -08:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
155a310852
Merge pull request #9761 from Menithal/21166
...
WL#21166 Cloneable Equipment
2017-03-02 16:33:13 -08:00
ZappoMan
6400bb6319
CR feedback
2017-03-02 14:34:14 -08:00
Anthony J. Thibault
644e29a43d
disable WANT_STATE_DEBUG in handControllerGrab.js
2017-03-02 14:15:05 -08:00
Seth Alves
bbfd373887
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 12:51:52 -08:00
Seth Alves
9b3c16d489
get handControllerGrab overlay lines working again
2017-03-02 12:48:37 -08:00
Seth Alves
2047e0194d
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 12:44:10 -08:00
Seth Alves
94b5e6333c
get handControllerGrab overlay lines working again
2017-03-02 11:02:06 -08:00
Seth Alves
9d4445fd61
Merge branch 'steady-hand-lasers' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-02 10:07:37 -08:00
Seth Alves
8893c4770e
Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers
2017-03-02 10:02:33 -08:00
Seth Alves
93055a67a8
use new-style hand-lasers for both hands
2017-03-02 10:01:08 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
Seth Alves
7f6b803652
3d-line-overlays can now have an endParentID and endParentJointIndex
2017-03-01 17:27:32 -08:00
Seth Alves
7c4869eb73
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
2017-03-01 16:10:07 -08:00
Menithal
fd1fded276
Fixed Clone instancing issues
2017-03-02 00:59:45 +02:00
Anthony J. Thibault
d142c3d69b
eslint fix
2017-03-01 13:29:24 -08:00
Anthony J. Thibault
f418457100
Index finger touch support for the tablet-ui.
2017-03-01 13:28:17 -08:00
Menithal
82236bdcb9
Merge remote-tracking branch 'upstream/master' into 21166
2017-03-01 22:09:29 +02:00
Ryan Huffman
1c3840dc78
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-01 10:25:16 -08:00
Seth Alves
c2085ebb6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-28 13:33:51 -08:00
Clément Brisset
7f9437dcc5
Merge pull request #9690 from Atlante45/feat/sit
...
Add hips pinning / Sit script
2017-02-28 10:41:22 -08:00
Matti Lahtinen
d0c2c26a8e
One last gotcha from the conflict resolution.
2017-02-28 16:37:08 +02:00
Matti Lahtinen
e21785d5ec
Merge branch 'master' into 21166
2017-02-28 16:34:28 +02:00
David Rowe
d8d17be0e0
Rotate about translation grab position
2017-02-28 23:22:07 +13:00
David Rowe
e3f2f3c5bc
Tidying
2017-02-28 23:04:23 +13:00
David Rowe
28768d4a78
Rotate the entity by twice the rotating controller's rotation
2017-02-28 22:22:34 +13:00
David Rowe
5b6f953ac2
Add hand controller state of distance-rotating for second grab hand
2017-02-28 17:35:13 +13:00
Ryan Huffman
f5f7cc5266
Fix teleport seat beam color to match model
2017-02-27 16:38:55 -08:00
Ryan Huffman
aa94106229
Update teleport to sit in invisible seats
2017-02-27 16:38:55 -08:00
Ryan Huffman
40b238c12e
Add new teleport seat model + beam
2017-02-27 16:38:53 -08:00
Ryan Huffman
c632884aac
Update teleport script to handle detecting seats
2017-02-27 16:38:53 -08:00
Ryan Huffman
9197819291
Cleanup teleport to make use of new TARGET
2017-02-27 16:38:53 -08:00
Ryan Huffman
b8c7905fa4
Cleanup some duplication of code in teleport.js
2017-02-27 16:38:53 -08:00
Menithal
9fbde41dc4
Styling formating and Rebuild attempt
2017-02-27 23:27:48 +02:00
David Rowe
6fcc096bcf
Fix JavaScript error
2017-02-28 10:14:38 +13:00
David Rowe
08cae1d3f2
Make other avatar's grab beam finish at entity's centroid
2017-02-28 10:02:06 +13:00
David Rowe
f4a3627b76
Make other avatar's grab beam start at more natural position
2017-02-28 09:47:36 +13:00
David Rowe
31b6d528df
Merge branch 'master' into 21176
2017-02-28 08:29:44 +13:00
Seth Alves
34c5d480c4
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-27 06:35:50 -08:00
Seth Alves
1864975c51
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-27 06:35:22 -08:00
Menithal
1d8be2aeaa
Added missing dynamic
2017-02-26 19:17:46 +02:00
Menithal
69949cd6b5
Finalized Grab-Clone action
2017-02-26 18:49:13 +02:00
David Rowe
0cc499b08b
Point index fingers and raise thumbs if not touching controls
2017-02-25 14:20:23 +13:00
David Rowe
a205d2a00c
Use animation for pointing index finger instead of setting joint angles
2017-02-25 11:36:06 +13:00
Seth Alves
fcd3c09404
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js-tablet-as-overlay
2017-02-24 14:27:30 -08:00
Seth Alves
eedc5c1647
don't allow tablet to get stuck to a hand when passing it back and forth between hands
2017-02-24 12:10:52 -08:00
Seth Alves
71ab6a1a84
fix a couple of problems related to grabbing tablet while edit.js is active
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2017-02-24 11:38:42 -08:00
Seth Alves
70060eb464
in 2d mode, clicks on tablet don't get used for other things
...
Conflicts:
scripts/system/libraries/entitySelectionTool.js
2017-02-24 11:37:04 -08:00
Seth Alves
f208f5e2d1
fix a couple of problems related to grabbing tablet while edit.js is active
2017-02-24 11:34:10 -08:00
David Rowe
a98824f483
Code review
2017-02-25 08:13:15 +13:00
David Rowe
d9a716bf3d
If someone else is grabbing entity you want to grab show their grab beam
2017-02-24 18:42:52 +13:00
Seth Alves
e43c4c17f5
in 2d mode, clicks on tablet don't get used for other things
2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9
merge in tablet-as-overlay code
2017-02-23 18:40:20 -08:00
Seth Alves
610c20e01a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-23 17:41:38 -08:00
Seth Alves
b4be942348
trying to get tablet overlay to show up in the right place
2017-02-22 19:18:03 -08:00
Seth Alves
273f0130f3
fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.
2017-02-22 17:43:09 -08:00
Seth Alves
bfc4853947
make overlays near-grabbable. make tablet be an overlay
2017-02-22 16:50:02 -08:00
Seth Alves
aed1d69377
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 14:14:10 -08:00
Seth Alves
92580a977b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-20 13:54:12 -08:00
Philip Rosedale
5c782deb4d
Merge pull request #9701 from ctrlaltdavid/21175
...
Fix laser beam jumping upon grabbing entity
2017-02-20 13:37:11 -08:00
Seth Alves
43f47c1106
merge from upstream
2017-02-20 12:45:39 -08:00
David Rowe
6827a28807
Fix grab position
2017-02-18 16:36:14 +13:00
David Rowe
692fa52aca
Disable drawing pointer lasers while painting
2017-02-18 15:21:48 +13:00
David Rowe
2c5782e4bb
Fix laser beam jumping upon grabbing entity
2017-02-18 09:11:04 +13:00
David Rowe
7b36669d80
Point index finger while painting if tablet not displayed
2017-02-17 19:30:40 +13:00
Seth Alves
3ea0f6d2d2
allow lasers to scroll tablet while in edit-mode
2017-02-15 11:34:48 -08:00
Seth Alves
219e569014
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 07:25:39 -08:00
Philip Rosedale
01bdac49d0
Merge pull request #9672 from ctrlaltdavid/21121
...
Fix far grabbing making entity jump upon grab
2017-02-14 17:02:42 -08:00
Seth Alves
3a23ec86d5
handles etc work better
2017-02-14 13:57:48 -08:00
Seth Alves
d40402faae
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 06:53:34 -08:00
David Rowe
2672b8d10a
Fix tabs
2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b
Fix far grabbing making entity jump upon grab
2017-02-14 17:30:20 +13:00
Atlante45
512bb4765f
Add entity clicks capture capabilities
2017-02-13 11:34:30 -08:00
Seth Alves
44aa3e044b
make it so near grabbing while edit is active doesn't select a new entity
2017-02-10 16:56:53 -08:00
Philip Rosedale
e94e41698e
remove debug
2017-02-08 18:04:55 -08:00
Philip Rosedale
dc957d09d8
remove comment
2017-02-08 15:45:29 -08:00
Philip Rosedale
fe92d38b60
Fixed scaling of self
2017-02-08 15:42:10 -08:00
Seth Alves
47976406fc
Merge pull request #9607 from hyperlogic/bug-fix/better-haptics
...
More consistent haptics on web overlays and entities
2017-02-08 05:47:05 -08:00
Anthony J. Thibault
244437d971
set WANT_DEBUG_STATE back to false
2017-02-07 23:50:06 -08:00
Anthony J. Thibault
6738c0eade
More consistent haptics on web overlays and entities
2017-02-03 12:05:30 -08:00
Dante Ruiz
2a3d0b6b17
enforce more button clicking logic
2017-02-03 19:13:57 +00:00
Chris Collins
bac5bd5c0e
Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
...
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00:00
Anthony J. Thibault
9df887de2a
You can no longer scale the tablet with double-grab
2017-02-02 10:16:02 -08:00
Anthony J. Thibault
e2e19884bb
Tablet should work even when not connected to any domain.
...
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.
I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.
There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
Dante Ruiz
b264d84385
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda
minimize git diff
2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88
ability to grab tablet in edit mode
2017-01-30 13:27:25 -08:00
Seth Alves
95d5c64e83
put a schmitt trigger in place to de-bounce tablet clicks
2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242
allow tablet-stabbers to more easily click buttons
2017-01-26 14:54:32 -08:00
Seth Alves
f2ff6fd9e7
allow stylus to work when edit.js is running
2017-01-23 15:52:40 -08:00
Seth Alves
9d77e9937c
only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base
2017-01-23 14:38:48 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Dante Ruiz
d5427f8722
close tablet bug fix
2017-01-23 17:33:33 +00:00
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05:00
humbletim
15394056eb
* add isInEditMode to utils.js
...
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
2017-01-20 22:29:40 -05:00
Dante Ruiz
5c55b86be6
fix bug
2017-01-21 01:56:06 +00:00
Seth Alves
87ea9161e4
avoid bad interaction between far-grab and equip
2017-01-20 14:49:49 -08:00
Seth Alves
7f25135633
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:06:35 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Seth Alves
caae804318
re-enable haptic pulse when stylus touches tablet overlay
2017-01-20 10:12:15 -08:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Anthony J. Thibault
2c3c96b600
Fix for broken entity scrolling introduced by 23ea65e2
...
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
2017-01-19 14:23:43 -08:00
Seth Alves
18e9b476c5
Merge pull request #9439 from hyperlogic/tablet-ui
...
Improved stylus and laser input deadspot
2017-01-19 12:43:02 -08:00
Seth Alves
41ddfbfd27
clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit
2017-01-19 11:34:38 -08:00
Anthony J. Thibault
2fd691d844
Improved stylus and laser input deadspot
2017-01-18 18:23:00 -08:00
Seth Alves
7c938728e5
don't do constant haptics if stylus touches tablet frame. home button triggers only once per click
2017-01-18 16:56:39 -08:00
Anthony J. Thibault
56c897cc2f
Process the tablet stylus even when reticle is over 2d HUD overlay.
2017-01-18 15:36:09 -08:00
Anthony J. Thibault
fc5c2c8def
Fix for glitchy scrolling
2017-01-18 15:32:38 -08:00
Anthony J. Thibault
28dac9d802
Lasers now interact with the tablet in edit mode.
2017-01-18 15:32:36 -08:00
Seth Alves
a8038ce64e
cleanups
2017-01-18 10:50:02 -08:00
Seth Alves
1f92b57bf2
switch to model stylus
2017-01-18 10:46:18 -08:00
Seth Alves
89d7b8bfc6
call releaseEquip when an equipped entity is dropped with a secondary press
2017-01-17 13:27:01 -08:00
Seth Alves
5c205f5800
avoid an unhook loop if two different hands have passed something back and forth more than once
2017-01-17 10:24:30 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
howard-stearns
0a3236dcc9
handControllerGrab update loop change
2017-01-16 14:54:32 -08:00
Seth Alves
23ea65e2b5
more changes to handle camera-relative-controller joints.
2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114
put code to delete prim-stylus tip back in
2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368
fix search ray getting left on. started adding stylus models
2017-01-16 07:46:12 -08:00
Seth Alves
4a451e95dc
don't call release when off state is entered. don't attempt to unhook stylus as a stray child
2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c
try a different way of keeping track of original parentIDs of grabbed entities
2017-01-15 10:16:28 -08:00
Seth Alves
e00814dd53
auto-end a near-grab if the parentID is changed to something else
2017-01-13 14:21:44 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
Seth Alves
611a926894
if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet
2017-01-12 13:45:03 -08:00
howard-stearns
88c2c534ad
don't set bogus values
2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628
remove log spam
2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732
use update signal instead of timer
2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db
fix mouse vs lasers, again
2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749
revert "fix competition between seek mouse and lasers"
2017-01-11 14:23:18 -08:00
Seth Alves
c93d83dadd
update lasers when distance-scrolling a web entity/overlay
2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1
removed committed code
2017-01-10 23:26:37 +00:00
Dante Ruiz
d0baa0e303
home button works with the stylus
2017-01-10 14:51:46 -08:00
Seth Alves
0fc1abc068
remember previous parentID in the script and try to put it back when releasing
2017-01-10 13:00:49 -08:00
Seth Alves
bff9e9be38
put back code that replaces previous parentID on release
2017-01-10 09:22:36 -08:00
Seth Alves
61f0c56a36
remove code that remembers previous state in userData
2017-01-09 14:20:03 -08:00
Seth Alves
fa803aebe9
use /~/ style to reference includes
2017-01-09 10:21:07 -08:00
Dante Ruiz
7205215baa
coding standard fix
2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d
fixed bug
2017-01-07 00:22:55 +00:00
Seth Alves
195b92d05d
lasers on webpage work again
2017-01-05 14:35:02 -08:00
Seth Alves
5e9c37777c
Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers
2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b
make showing of stylus be proximity based rather than raypick based
2017-01-05 12:49:50 -08:00
Brad Hefta-Gaub
cb69e70781
fix competition between seek mouse and lasers
2017-01-05 11:31:50 -08:00
Brad Hefta-Gaub
368f48f0a7
Merge pull request #9247 from huffman/feat/tutorial-touch-grip
...
Add support for new Touch grip mappings to tutorial
2017-01-04 17:58:05 -08:00
Seth Alves
a585d43a5e
attempt to get laser-based web scrolling to work, again
2017-01-04 16:51:47 -08:00
Seth Alves
fb4263de93
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers
2017-01-04 16:01:06 -08:00
Seth Alves
ed934c37ae
put code that allows lasers vs web entities or overlays back in
2017-01-04 15:23:55 -08:00
Dante Ruiz
f81402fb0f
improved tablet position
2017-01-04 11:09:26 -08:00
Brad Hefta-Gaub
d440532cff
make sure RPC is timely
2017-01-03 11:10:07 -08:00
Anthony Thibault
c201b6a7f9
Merge pull request #9256 from druiz17/moreButtons
...
all hub button now on tablet
2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
82ab8635d7
debugging
2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00
first cut at using wait signals to improve RPC timing
2016-12-30 09:13:21 -08:00
Dante Ruiz
61277c0605
Stylus now works in edit mode
2016-12-22 17:33:25 +00:00
Ryan Huffman
8b5a05c409
Fix right touch controller tip labels not showing up
2016-12-20 18:01:53 -08:00
Ryan Huffman
df0dfc761d
Add ability to disable avatar and object scaling in handController grab
2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27
Update tutorial to use new trigger configuration for touch
2016-12-20 18:01:53 -08:00
Stephen Birarda
ebd347fc15
only respect release of secondary for hold once pressed
2016-12-20 14:46:55 -08:00
Stephen Birarda
4fcccb5455
check for release of equip in this.nearGrabbing
2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16
return after release, duh
2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf
always unequip on secondary release
2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc
add special equip for oculus style grab
2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc
removed initial delay for seek beams
2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788
grip squeezes fingers too
2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc
Grip controllers can grab objects, slight delay on search beam
2016-12-20 14:11:33 -08:00
Seth Alves
36e843178a
diff minimization
2016-12-20 09:21:41 -08:00
Ryan Huffman
bf7066d4e3
Cleanup tutorial scripts
2016-12-20 07:45:35 -08:00
Ryan Huffman
e12ef0a187
Cleanup variable naming in touch controller config
2016-12-20 07:45:35 -08:00
Ryan Huffman
04efea7293
Cleanup implementation of touch controller config
2016-12-20 07:45:35 -08:00
Ryan Huffman
6e1459f4b3
Update Touch controller configuration
2016-12-20 07:45:35 -08:00
Ryan Huffman
3dfc3946ba
Fix positioning of Oculus Touch controller visual
2016-12-20 07:45:35 -08:00
Ryan Huffman
8aba8f7bf3
Remove cache buster from touchControllerConfiguration
2016-12-20 07:45:35 -08:00
Ryan Huffman
240dba5306
Fix oculus touch labels in tutorial
2016-12-20 07:45:35 -08:00
Ryan Huffman
74b07273d6
Update oculus touch labels to be emissive
2016-12-20 07:45:35 -08:00
Ryan Huffman
1ddc869c8e
Fix emissive channel on touch models
2016-12-20 07:45:35 -08:00
Ryan Huffman
ac33bf4d4a
Fix right touch joystick
2016-12-20 07:45:35 -08:00
Ryan Huffman
3879922e78
Reenable disabling of hand controllers
2016-12-20 07:45:35 -08:00
Ryan Huffman
53fb0a95fe
Update controller display to support non-string hardware resolution
2016-12-20 07:45:35 -08:00
Ryan Huffman
b835fc7ada
Add touch controller support to ControllerDisplay
2016-12-20 07:45:35 -08:00
Seth Alves
e5804dade0
get stylus working with web entities
2016-12-20 07:43:48 -08:00
Seth Alves
ae7af3e227
don't hide stylus so quickly
2016-12-20 07:43:48 -08:00
Seth Alves
e9c848bfe8
stylus for web overlays
2016-12-20 07:43:48 -08:00
David Rowe
25651800dd
Code review
2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519
don't flutter tablet when menu button is pressed. start on a stylus
2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8
Fix keyboard focus when switch highlight between overlays and entities
2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f
Fix Web overlay x, y coordinate calcs
2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced
First pass at controller interaction with 3D Web overlay
2016-12-20 07:42:21 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
Ryan Huffman
9730d07f59
Cleanup tutorial scripts
2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782
Cleanup variable naming in touch controller config
2016-12-16 16:01:26 -08:00
Ryan Huffman
009c982cdf
Cleanup implementation of touch controller config
2016-12-16 15:05:17 -08:00
Ryan Huffman
19a3fdcc01
Update Touch controller configuration
2016-12-16 15:05:17 -08:00
Ryan Huffman
f7ebda6931
Fix positioning of Oculus Touch controller visual
2016-12-16 15:05:17 -08:00
Ryan Huffman
b599ccea9e
Remove cache buster from touchControllerConfiguration
2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
2b88935812
Reenable disabling of hand controllers
2016-12-16 15:05:17 -08:00
Ryan Huffman
6fb39080e2
Update controller display to support non-string hardware resolution
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Anthony J. Thibault
8b99fa90e8
Merge branch 'master' into tablet-ui
2016-12-15 13:28:23 -08:00
Philip Rosedale
14c867fdbd
Can't resize if objects in both hands, avatar resize is seek + grips
2016-12-14 13:38:37 -08:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
Philip Rosedale
9370c8af6b
Added ability to rescale avatar
2016-12-12 15:26:53 -08:00
Philip Rosedale
a142c830fa
Merge branch 'master' of git://github.com/highfidelity/hifi into rescale
2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09
Both grip buttons enable rescale for a held object
2016-12-12 09:39:32 -08:00
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802
Fix Web overlay x, y coordinate calcs
2016-12-09 17:00:00 +13:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Ryan Huffman
996d3f5875
Merge pull request #9135 from druiz17/nearGrab
...
Fixed pressing the grip button causes a near grabbed object to drop
2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d
clean up
2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f
better solution
2016-12-05 18:08:36 +00:00
Seth Alves
24e54f25bf
Merge pull request #9108 from PhilipRosedale/drifting
...
Grab.js weaker at a distance
2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5
Fix indents
2016-12-01 12:54:38 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Dante Ruiz
1b24d373d2
fixed near grab issue
2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083
grip button fix
2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
Philip Rosedale
664b54c004
remove whitespace
2016-11-22 10:27:27 -08:00
Philip Rosedale
c1e044364f
Added distance attentuation of linear and angular rate
2016-11-22 10:24:02 -08:00
Anthony J. Thibault
270adfe692
removed debug prints
2016-11-17 11:40:05 -08:00
Anthony J. Thibault
38ac6fff03
Hand Controller rendering is camera relative
...
Basically, when using the third person camera in HMD mode. If the controllers are shown.
They should be shown in front of the users camera, not in front of the users avatar.
To accomplish this, two new faux joint indices are introduced.
CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX and CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX.
These joint indices can be used for Overlay parenting. (But not for entity parenting because they are not transmitted over the network).
They can also be queried for by using the MyAvatar.getAbsoluteJointRotationInObjectFrame() call.
These new indices are now used by the controllerDisplay.js for the hand controller rendering.
They are also used by system/libraries/controllers.js as the origin for hand controller grabbing and interaction lasers.
2016-11-17 11:33:12 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
Philip Rosedale
981f505a9c
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-14 14:26:45 -08:00
howard-stearns
e2fded846f
make hand-controller ui work in third person
2016-11-11 11:10:42 -08:00
Philip Rosedale
c0b1392685
Merge branch 'master' of git://github.com/highfidelity/hifi into drifting
2016-11-10 13:41:13 -08:00
Dante Ruiz
e22c36b4b7
fixed menu pop up delay
2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
Dante Ruiz
1a83cc2c3e
fixed deleted comment
2016-11-02 00:12:23 +01:00
Dante Ruiz
d29b1c34b1
fixed coding standard conflicts
2016-11-02 00:07:58 +01:00
Dante Ruiz
e9d10b609d
removed bad commit
2016-11-02 00:05:38 +01:00
Dante Ruiz
86abd9120e
Fixed menu out of view with HMD and Xbox controller
2016-11-01 14:30:48 -07:00
Ryan Huffman
d933155c71
Fix trigger highlight configuration
2016-10-27 20:16:34 -07:00
Ryan Huffman
69e7dababc
Collapse multiline dict to one line in controllerDisplay
2016-10-27 15:16:38 -07:00
Ryan Huffman
c0e372c380
Remove annotation API from controller display
2016-10-27 14:58:20 -07:00
Ryan Huffman
1f25ba8f1f
Update controller tips and trigger highlight in tutorial
2016-10-27 14:58:20 -07:00
Ryan Huffman
e9099b77a5
Add more debug to tutorial, new firecrackers, and adjust fuse
2016-10-27 14:58:20 -07:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Ryan Downe Karpf
7a4302057a
Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip
...
Update vive controller display to not hide on equip
2016-10-25 13:16:31 -07:00
Ryan Huffman
af749605ea
Update vive controller display to not hide on equip
2016-10-25 08:27:20 -07:00
Brad Hefta-Gaub
ed4279783d
CR feedback
2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
76ca3aa546
fix residual head laser
2016-10-24 15:25:06 -07:00
Brad Hefta-Gaub
779f326452
cleanup
2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e
gak
2016-10-24 14:47:10 -07:00
Andrew Meadows
ccc6f8eee2
fix teleport.js to work for out-of-body
2016-10-24 08:36:51 -07:00
Andrew Meadows
51a9a99381
Merge hifi/master into hifi/out-of-body-experience
2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546
more work on extra lasers
2016-10-24 07:46:04 -07:00
Anthony J. Thibault
ae301602e7
Fix for incorrect tip texture URLs.
2016-10-21 14:49:46 -07:00
Anthony J. Thibault
60f728585a
away.js now shows hand controllers in away mode.
...
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
2016-10-21 10:40:39 -07:00
Anthony J. Thibault
2193c5faad
Integrated controller display from tutorial scripts + assets
2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
1a28732b64
Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
...
Conflicts:
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
9008de72e0
Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments
...
Adjustment to position and visibility of grab sphere.
2016-10-19 21:51:02 -07:00
Anthony J. Thibault
55c062098a
Adjustment to position and visibility of grab sphere.
...
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
Seth Alves
7e4964db3e
Merge pull request #8684 from Menithal/controller-grab-unequip
...
Fixed HandcontrollerGrab distance unequip
2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
c082c74cc0
use head pose for controller in case there are no hand controllers available
2016-10-18 10:01:00 -07:00
Ryan Huffman
5f5dedaa40
Fix equip sphere not showing up
2016-10-17 10:53:02 -07:00
howard-stearns
140caf84d8
never interact with hud elements while holding something
2016-10-14 18:30:52 -07:00
Howard Stearns
fc8bbde60a
Merge pull request #8810 from ZappoMan/handControlsWhileLoading
...
make laser pointers work even while content is loading
2016-10-14 10:01:46 -07:00
Brad Hefta-Gaub
ef3c9ba78a
better handling of the teleport target overlays to prevent flashing and thrashing
2016-10-13 18:24:38 -07:00
Brad Hefta-Gaub
ddce0ef74a
make laser pointers work even while content is loading
2016-10-13 17:50:20 -07:00
Anthony J. Thibault
81db8f7e08
Merge branch 'master' into out-of-body-experience
2016-10-13 17:27:15 -07:00
Andrew Meadows
d54c07ed14
Merge 'master' into 'out-of-body-experience'
2016-10-12 13:35:27 -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
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
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
Menithal
4bed3ee036
Adjusted theoretical Unequip time to 250 ms
2016-10-08 01:36:57 +03:00
Andrew Meadows
55c90e7bca
Merge branch 'master' into out-of-body-experience
2016-10-07 15:18:08 -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
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
Menithal
a6040197eb
Fixed HandcontrollerGrab unequip.
...
Will now use deltaTime and a second instead of instantly disconnecting on
if more than 0.1 off. This is to avoid accidental disconnection due to
acceleration and latency
2016-09-29 22:24:07 +03:00
Anthony J. Thibault
98ffea2fb9
Merge branch 'master' into out-of-body-experience
2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub
2b01c60a55
Merge pull request #8615 from davidkelly/dk/1264
...
Make the equip sphere emissive
2016-09-19 16:33:55 -07:00
Anthony J. Thibault
aefe224215
Fix for jittery far-grab at low update rates
...
Clamp the blendFactor used to smooth out the motion of the far-grabbed object.
This prevents the newTargetPosition from over shooting it's goal.
2016-09-19 10:51:46 -07:00
David Kelly
22d80914e2
whitespace
2016-09-16 14:17:44 -07:00
David Kelly
ade17e6456
PR feedback
2016-09-16 14:15:14 -07:00
David Kelly
2ddd46f30b
Switch to the cool looking model instead
2016-09-16 10:56:59 -07:00
David Kelly
1acfe017e1
Make the equip sphere emissive
...
maybe this will make it visible in low ambient light situations?
2016-09-15 17:12:35 -07:00
Seth Alves
e5e9bb0052
Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments
2016-09-14 11:28:10 -07:00
Andrew Meadows
09c4720665
fix typo in teleport.js
2016-09-12 16:35:52 -07:00
Andrew Meadows
9728cf6904
fix typos in teleport.js
2016-09-12 16:24:08 -07:00
Andrew Meadows
0d300c3a47
teleport.js drags avatar along
2016-09-12 16:24:08 -07:00
Anthony J. Thibault
86351ca21c
Teleport bugs
...
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
2016-09-09 17:32:02 -07:00
Andrew Meadows
82522fbbb1
fix C++ism typo in JS script
2016-09-09 16:40:07 -07:00
Andrew Meadows
6b9cdb440b
update teleport.js to teleport HMD before avatar
...
(in theory, not tested)
2016-09-09 16:33:13 -07:00
Seth Alves
ecb0669972
try to keep far grab from getting stuck if the entity is brought very near to the grab-point
2016-09-08 17:02:29 -07:00
Seth Alves
0f98c51d89
distance-grabbed things collide with static entities
2016-09-08 16:13:22 -07:00
Seth Alves
9c96ffc9cb
don't show grab-point spheres if controller poses aren't valid
2016-09-07 16:31:02 -07:00
Seth Alves
746d0cd91c
get various hand lasers to all line up with grab-point sphere
2016-09-07 16:10:37 -07:00
Seth Alves
b45181ea92
don't back up pick-ray from hand
2016-09-07 13:32:26 -07:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
Seth Alves
616b094111
experimenting with position of grab sphere
2016-09-06 16:16:09 -07:00
Seth Alves
34e4b4ae19
move haptic-pulse for when grab-point enters a grabbable entity to the right section of code
2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd
fix grab-point sphere for right hand
2016-09-06 15:15:46 -07:00
Seth Alves
43c98b3f1e
attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere
2016-09-06 14:42:53 -07:00
Seth Alves
b8b1127d55
merge from upstream
2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
Anthony J. Thibault
3d5e8fc213
First pass of keyboard raising and lowering
2016-09-02 12:15:30 -07:00
Brad Hefta-Gaub
cf242eca9f
Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet
...
Marketplace tablet is a bit larger and lower DPI.
2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205
avoid having auto-unequip code trigger during a teleport
2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed
avoid a bootstrap
2016-09-01 17:51:02 -07:00
Seth Alves
da35281941
don't assume collides-with-dynamic during a multi-grab
2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d
if a hand is disabled while holding something, release it
2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c
include which hand in grab messages
2016-09-01 14:58:37 -07:00
Seth Alves
045042a9c6
don't disable grabbing when teleporting
2016-09-01 14:15:49 -07:00
Seth Alves
a35e527128
try to fix far-trigger
2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6
don't do auto-release test unless the hand is equipping
2016-09-01 09:57:46 -07:00
Anthony J. Thibault
823420ae0a
Working web entity keyboard
...
* Missing many keys
* Does not dynamically appear and disappear
2016-08-31 17:57:13 -07:00
Seth Alves
47259ee053
find equip-points with controller position rather than hand
2016-08-31 16:52:46 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
Seth Alves
617880479a
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2
ignoreIK for equipping. change how auto-unequip searches
2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Anthony J. Thibault
dcd91d4398
removed debug flag
2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb
Marketplace tablet is a bit larger and lower DPI.
...
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
2016-08-29 11:55:04 -07:00
Seth Alves
be1332532f
disable debugging prints
2016-08-29 03:39:52 -07:00
Seth Alves
5daf334a0e
avoid extra grab-point spheres when resetting scripts
2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef
keep near-grab radius small but still allow large equip hotspots
2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76
don't show grab-point sphere when near grabbing or equipping
2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0
handle another type of abandoned grab
2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7
don't leave stray blue search sphere when near-grabbing
2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e
fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand
2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4
fix code that notices and fixes an abandoned grab
2016-08-27 16:00:27 -07:00
Seth Alves
e4b2b7158f
hotspots with large radius work correctly, again
2016-08-27 09:30:26 -07:00
Seth Alves
acb04a0bc9
don't add children of controller joints until we know our avatar ID
2016-08-25 19:09:10 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15
in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity
2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde
grab-point sphere is a child of controller joint, so it doesn't jitter
2016-08-25 13:31:07 -07:00
Seth Alves
cab30651d0
cleanups
2016-08-25 09:47:14 -07:00
Andrew Meadows
fefe5e30ec
don't use globals and remove double definitions
2016-08-25 08:57:06 -07:00
Andrew Meadows
6f6a7bcc44
wrap default scripts with local scope
2016-08-25 08:57:06 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
Seth Alves
18852137b5
cleanups, avoid pop when grabbing
2016-08-23 17:06:53 -07:00
Seth Alves
dbe65df90b
merge from upstream
2016-08-23 16:42:02 -07:00
James B. Pollack
fb6fa687e8
in the right place... thanks howard!
2016-08-23 12:07:59 -07:00
James B. Pollack
fcf459645d
center after teleport
2016-08-23 12:02:57 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Seth Alves
6c80a35c4b
Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1
...
ignoreIK flag on action-grabbable objects works again
2016-08-22 18:48:39 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Anthony J. Thibault
ff4c194756
eslint fix
2016-08-19 15:31:57 -07:00
James B. Pollack
2b1e629cca
some extra checks on settings values
2016-08-19 14:51:15 -07:00
James B. Pollack
3922192cfc
update
2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a
cleanup
2016-08-19 14:29:14 -07:00
Seth Alves
ff95ef2492
ignoreIK flag on action-grabbable objects works again
2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746
bug fix for when web-entity is deleted while being scrolled
2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541
update turn rate for left stick
2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014
moar
2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e
fix bug
2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199
slow 180 rate
2016-08-18 16:50:50 -07:00
James B. Pollack
3a8de5ab0d
fix rotation function
2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4
remove prints
2016-08-18 15:29:49 -07:00
James B. Pollack
859d3ccadc
tweaks
2016-08-18 14:36:52 -07:00
James B. Pollack
2e22bc5e46
new coolin
2016-08-18 14:08:31 -07:00
James B. Pollack
992504e179
adjust coolin
2016-08-18 13:35:51 -07:00
James B. Pollack
b8213aed7b
naming and some logging for teleport stuff
2016-08-18 11:59:58 -07:00
James B. Pollack
37846d9f0c
store settings
2016-08-18 11:07:50 -07:00
James B. Pollack
1eaac8605f
invert the structure and make it work with oculus
2016-08-18 10:43:37 -07:00
James B. Pollack
09cd0b8f4a
debug prints 2
2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b
update name
2016-08-18 09:22:43 -07:00
James B. Pollack
9e14191217
recondition
2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829
debug prints
2016-08-18 08:43:26 -07:00
James B. Pollack
8ede4ddb66
longform
2016-08-17 17:33:24 -07:00
James B. Pollack
e69c89a93e
y
2016-08-17 17:00:17 -07:00
James B. Pollack
fdfcc235b6
as functions
2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139
get lsy lsx rsy values
2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee
update whens
2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24
demo and only do for vive
2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275
add whens
2016-08-17 15:50:19 -07:00
James B. Pollack
a7ba4ce1f9
jumping
2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1
demo changes
2016-08-17 15:08:43 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a
handControllerGrab now calls Entities.sendHoverLeaveEntity()
2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Seth Alves
c85e8d0580
don't show equip sphere until hand is in position to equip. widen unequip/drop cone
2016-08-16 11:18:12 -07:00
Anthony J. Thibault
1ddbd7022a
Moved keyboardFocus, mouse/touch event methods from Reticle to Entities
2016-08-11 11:52:04 -07:00
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -07:00
SamGondelman
2360e90d39
simplify valid check for rotation
2016-08-09 15:48:31 -07:00
SamGondelman
956078bc91
teleport works with xbox controller
2016-08-09 15:17:36 -07:00
Brad Hefta-Gaub
b903c974bc
Merge pull request #8371 from imgntn/teleport_cancel
...
Cancel mode for teleporting
2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a
cleanup
2016-08-08 12:20:48 -07:00
Seth Alves
090a0a6e9a
only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip
2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642
speling
2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7
adjust code that auto-unequips items when they are pulled too far from the equipping hand
2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635
Remove input restrictions on grabbable web entities.
...
You no longer have to be grabbing a grabbable web entity to interact with it.
2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5
Improved support for button rollover and hover
...
Send a combination of mouse and touch events to the web browser entity.
* MouseMove events for when the trigger is not depressed. This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed. This will give us the iPad like scrolling behavior.
2016-08-05 11:32:50 -07:00
Anthony J. Thibault
90a06f0d40
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-05 11:05:10 -07:00
James B. Pollack
80da690680
incease distance a bit
2016-08-05 00:04:30 -07:00
James B. Pollack
7d37f86337
different swapping method
2016-08-04 23:45:43 -07:00
James B. Pollack
80b6ca2b86
single call to istooclose
2016-08-04 16:47:10 -07:00
James B. Pollack
fb8263a882
cleanup
2016-08-04 16:35:50 -07:00
James B. Pollack
63aa0f8c3f
remove weird n
2016-08-04 16:18:13 -07:00
James B. Pollack
f93ed56124
cleaner code
2016-08-04 16:17:21 -07:00
James B. Pollack
c0cfee371e
cancel mode for teleporting
2016-08-04 16:08:51 -07:00
Chris Collins
be87f294d8
Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message
...
fix remote triggering handControllerGrab
2016-08-04 11:55:48 -07:00
James B. Pollack
5ad5899140
revert pointer changes
2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056
cleanup dead code
2016-08-02 21:26:04 -07:00
James B. Pollack
9d56c697e7
no delay!
2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb
no teleport while moving
2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb
start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck
2016-08-02 18:46:47 -07:00
Philip Rosedale
53ef9fa5a8
test commit
2016-08-02 16:05:46 -07:00
Thijs Wenker
3a2b0ffa08
Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js.
2016-08-03 00:47:28 +02:00
James B. Pollack
8541d4bd41
small change to protect
2016-08-02 15:41:28 -07:00
James B. Pollack
d00c1f62fc
fixes
2016-08-02 15:40:19 -07:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -07:00
James B. Pollack
f6984aaff8
clear timeout one more place
2016-08-02 14:42:21 -07:00
James B. Pollack
41aa485f11
one hand teleprt
2016-08-02 12:52:35 -07:00
James B. Pollack
7fae7e9c77
cleanup
2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df
updates
2016-08-02 12:25:24 -07:00
Anthony Thibault
cf7450beb7
handControllerGrab and web entity input integration
2016-07-29 17:50:45 -07:00
Eric Levin
5167809342
release near and far grab at trigger click detent
2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a
only pulse on release when held
2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2
Tuned haptic pulses for grab, release, equip, de-quip
2016-07-27 17:58:24 -07:00
James B. Pollack
6a72fe7df4
cleanup
2016-07-25 16:58:59 -07:00
James B. Pollack
5ed1e602e6
Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors
...
Fix script end errors
2016-07-25 16:50:05 -07:00
James B. Pollack
05e3a8613a
colors back to blue and red
2016-07-25 16:28:47 -07:00
James B. Pollack
9240672c9d
change distance hold origin
2016-07-25 13:06:09 -07:00
Brad Hefta-Gaub
1802f8e7a2
Merge pull request #8298 from imgntn/lazzzers
...
Update hand controller laser colors
2016-07-23 13:50:38 -07:00
James B. Pollack
c04a41c3cb
fix invisible characters from slack copying
2016-07-22 16:51:42 -07:00
Chris Collins
e755528cf2
Merge pull request #8278 from sethalves/fix-equip-fly-away
...
fix equip fly-away
2016-07-22 16:47:31 -07:00
Zander Otavka
2cd97bfe78
Fix squeezeHands.js error on script end
2016-07-22 15:55:42 -07:00
James B. Pollack
3607a34f55
tweak telecolors
2016-07-22 13:25:33 -07:00
James B. Pollack
e81f65d992
colors
2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f
remove all the old visualization methods
2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195
remove particle beam and lights
2016-07-22 09:19:13 -07:00
Thijs Wenker
be0ccad0d3
Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:26 +02:00
Thijs Wenker
b3b1bf7884
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays
2016-07-20 03:12:02 +02:00
Thijs Wenker
2adff24a05
silly workaround- workaround
2016-07-19 21:34:42 +02:00
Seth Alves
be001a652f
when doing a parenting grab, zero velocity
2016-07-19 11:50:53 -07:00
Brad Hefta-Gaub
866ba2f185
Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom
...
far-grabbed objects no longer fly away when the avatar body shifts
2016-07-19 10:40:48 -07:00
Anthony J. Thibault
212175bdaa
bug fix for far-grab pulling the object in the wrong direction
2016-07-19 10:23:00 -07:00
Thijs Wenker
11b461a730
Fixes duplicate target overlays for teleporter, make sure to delete overlay before creating one
2016-07-19 01:46:29 +02:00
Anthony J. Thibault
69500643f3
bugfix for saving attach points
...
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984
remove debug prints
2016-07-18 14:17:06 -07:00
Anthony J. Thibault
959a2f9915
far-grabbed objects no longer fly away when the avatar body shifts
...
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame. This hand vector was used to move the grabbed object position. However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.
Now, we track this hand delta in sensor a.k.a. room space. This is immune to the shifts caused by body shifting.
2016-07-18 13:10:16 -07:00
Anthony J. Thibault
5a01bf406e
remove obsolete handControllerMouse.js to avoid confusion
2016-07-18 11:29:41 -07:00
Anthony Thibault
c7c8046231
De-equip goes into a near grab instead of dropping the object.
2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb
Re-enable storing of attach points in user settings
...
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
the near grab action moves the entity.
2016-07-16 12:21:08 -07:00
Philip Rosedale
4925980cbb
Merge pull request #8255 from jherico/search_circle
...
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
Brad Davis
1145c3b590
Smaller and hotter circle, per Philip
2016-07-15 17:45:16 -07:00
Seth Alves
a0e6654ac6
Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux
...
Grab Script Polish (part deux)
2016-07-15 17:34:50 -07:00
Brad Davis
317dee1b23
Fix decoration inflation
2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2
Disable attach point saving
2016-07-15 15:36:20 -07:00
Brad Davis
0d811c489a
Removing debug logging
2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387
Make search line termination a circle, like 2D UI
2016-07-15 13:51:14 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Anthony J. Thibault
37d60c6c85
eslint clean
2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43
Merge branch 'master' into feature/grab-script-polish-part-deux
2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3
Remember object attach point offsets in user settings
2016-07-14 15:51:05 -07:00
Brad Davis
8685b23610
When using the hand controller as a mouse, disable the navigation focus state in QML
2016-07-14 12:11:12 -07:00
Anthony J. Thibault
eb5107d9a5
highlight the grabbed hotspot when the drop gesture is detected
2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d
Added haptics and hysteresis to drop gesture
2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3
removed shake to drop
2016-07-14 10:32:02 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c
Animate equip hotspots scale instead of alpha
2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538
First pass at equip sphere animation
2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4
Support for model overrides for equip hotspots rendering
...
Bug fix for modelScale on hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c
Fix for double rendering of equip hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975
Reduce calls to Entity.getEntityProperties().
...
By using a single EntityProprtiesCache instance instead of one per controller.
2016-07-13 19:13:39 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Seth Alves
1999193907
split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely
2016-07-12 11:42:58 -07:00
Seth Alves
367c26a5ee
wait a bit before resetting collides-with-my-avatar
2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487
back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release
2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74
Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing
2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244
reduced radius of grab sphere
2016-07-08 18:23:33 -07:00
Anthony J. Thibault
bec71e4af4
Went back to transparent spheres for equip points
2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3
experimenting
2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12
less changes to hand grab
2016-07-08 16:01:17 -07:00
James B. Pollack
ee970c5e07
cleanup
2016-07-08 15:16:26 -07:00
James B. Pollack
4f899d8752
play nice with grab
2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b
remove prints and format
2016-07-08 15:08:44 -07:00
James B. Pollack
3492367c63
cleanup comments etc
2016-07-08 15:03:59 -07:00
James B. Pollack
38e580b211
fix some bugs and also change it to use arrival mode
2016-07-08 14:50:21 -07:00
Anthony J. Thibault
c8d0decab7
Fix for far grab not working until after edit button is pressed
2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70
Added glow effect to search beam
2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
James B. Pollack
1cda8afa40
simplify code
2016-07-08 13:37:59 -07:00
James B. Pollack
24832df14a
changes
2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
James B. Pollack
1a46366557
uncomment
2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901
trying to fix interaction with grab script...
2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e
Equip hotspots render when your hand is near them.
2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053
make thumb and trigger work in any order and on either button released
2016-07-07 16:36:40 -07:00
James B. Pollack
71392bc1b2
change to sphere now that sphere alpha works.
2016-07-07 16:30:30 -07:00
James B. Pollack
5c83db3b28
take care of naughty intervals
2016-07-07 14:37:51 -07:00
James B. Pollack
4a9f6e677c
add new target model
2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177
make thumb and trigger mode an option
2016-07-07 12:39:11 -07:00
James B. Pollack
93081e73d8
thumb and trigger
2016-07-07 12:12:22 -07:00
James B. Pollack
8212ada4de
introduce delay
2016-07-07 11:42:41 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
James B. Pollack
54e0c131a5
cleanup and protect against some interval naughtiness
2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4
add instant mode
2016-07-06 18:13:42 -07:00
James B. Pollack
1728878982
working smooth arrival
2016-07-06 17:52:18 -07:00
Anthony J. Thibault
2db8160568
handControllerGrab improvements
...
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3
remove debug prints
2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37
terminate lines at intersection
2016-07-06 15:19:10 -07:00
James B. Pollack
dc8e21d76c
cleanup stretchy stuff
2016-07-06 15:16:31 -07:00
howard-stearns
110f5e9e2a
Don't compare distance when no intersection.
2016-07-06 15:08:57 -07:00
James B. Pollack
e993a69519
last commit for stretched beams -- doesnt work at long distances due to lack of precision
2016-07-06 14:06:53 -07:00
James B. Pollack
b2ef491b97
rotate target toward you
2016-07-06 13:20:42 -07:00
James B. Pollack
2d073cc99c
working teleporter in huffmans build
2016-07-06 12:31:03 -07:00
James B. Pollack
b0494ec9d5
bug notes
2016-07-05 17:48:30 -07:00
James B. Pollack
26950eaaa6
working second model adjustment with hack but wtf
2016-07-05 17:30:17 -07:00
James B. Pollack
c78dbe26b6
working initial beam, still trying to clear up no intersection beam issues
2016-07-05 17:25:21 -07:00
howard-stearns
b8e6572ebf
basic hand-controller editing
2016-07-05 17:00:54 -07:00
James B. Pollack
cbd1f8df88
add stuff for fading in/out and also for a nice stretchy beam
2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72
add teleport models etc
2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e
remove dupe
2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1
fix typo
2016-07-05 09:22:19 -07:00
Seth Alves
5ab82cd7c8
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-02 15:11:59 -07:00
James B. Pollack
9b822f97c0
end of day
2016-07-01 17:26:52 -07:00
James B. Pollack
00ce75ef48
more notes
2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26
cleanup
2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99
teleportr
2016-07-01 15:19:37 -07:00
James B. Pollack
4762091aaf
add easy mode
2016-07-01 11:12:20 -07:00
Ryan Downe Karpf
873b57219a
Merge pull request #8167 from hyperlogic/feature/equip-hotspots
...
equip-hotspots feature
2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1
fix vive bug
2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77
notes
2016-06-30 17:05:16 -07:00
James B. Pollack
82e074de0f
working teleporter
2016-06-30 16:05:44 -07:00
Anthony J. Thibault
d8e5e3cbe4
equip bug fix
...
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
Anthony J. Thibault
82b1cba81d
equip improvements
...
Allow the user to equip an object while near or far grabbing it from the other hand.
2016-06-30 13:58:44 -07:00
Howard Stearns
5556bbb0a3
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757
Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area
...
limit hand controller actions to recommended area
2016-06-30 11:06:32 -07:00
James B. Pollack
4b4e38a57c
end of day
2016-06-29 18:28:39 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
James B. Pollack
fd062d09dc
initial notes and research
2016-06-29 15:59:51 -07:00
Anthony J. Thibault
43d4dba4c0
iterate over hotspots not entities.
...
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473
WIP, equip-points work but they don't use the proper attach point.
2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637
Addition of equipHotspots
2016-06-29 13:53:06 -07:00
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
Seth Alves
52d017ac74
undo previous change
2016-06-28 19:22:19 -07:00
Howard Stearns
b551bc3c1a
Use the whole area, less a margin.
2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b
Use normal Script.update (60hz) instead of a timer (@20hz).
2016-06-28 17:44:30 -07:00
Seth Alves
b782ae667c
when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData
2016-06-28 16:36:37 -07:00
Seth Alves
630d5cfc82
make trigger more sensitive, print out position and rotation when releasing something
2016-06-28 15:47:17 -07:00
howard-stearns
c492d125e0
limit hand controller actions to recommended area
2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d
Only update the (invisible) cursor position from hand controllers when the
...
trigger is partially squeezed.
2016-06-28 11:36:08 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -07:00
Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Anthony J. Thibault
7bd553c09c
near grab logic to uses sphere vs entity box
...
instead of sphere vs sphere. Adjusted debug drawing accordingly.
2016-06-23 17:03:15 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Anthony J. Thibault
eabb8d08c0
Merge branch 'vive-ui' into feature/equip-hotspots
2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5
Grab script hotspot work
...
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
Anthony J. Thibault
2a82dddc2b
Draw attach points as if they were equip-hotspots
2016-06-21 17:36:36 -07:00
howard-stearns
223f9bda2e
gratuitous change to force things.
2016-06-21 17:03:49 -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
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
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
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
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
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
howard-stearns
5759c2d29d
final
2016-06-14 11:28:44 -07:00
Anthony J. Thibault
cb51d00c1d
Removed CONTINUE_FAR_TRIGGER and CONTINUE_NEAR_TRIGGER
2016-06-13 19:08:33 -07:00
Anthony J. Thibault
28b6cc2777
handControllerGrab.js is now eslint clean.
2016-06-13 18:54:21 -07:00
howard-stearns
dfd03d5e61
Prepare for working laser. But at this point, we still show the laser AND
...
the Reticle.
2016-06-13 17:15:51 -07:00
howard-stearns
526fc7d062
Make handControllerGrab independent of whether we're using laser or
...
Reticle.
2016-06-13 17:13:10 -07:00
howard-stearns
0366c891cc
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into use-system-pointer
2016-06-13 17:06:43 -07:00
Anthony J. Thibault
b01eb0439d
removed sticky thumb equip states.
...
* removed STATE_WAITING_FOR_EQUIP_THUMB_RELEASE and waitingForEquipThumbRelease
* removed STATE_EQUIP
* removed STATE_WAITING_FOR_RELEASE_THUMB_RELEASE and waitingForReleaseThumbRelease
* removed 'Hifi-Object-Manipulation' 'loaded' support and checkNewlyLoaded method.
2016-06-13 16:49:38 -07:00
Anthony J. Thibault
fe65df350b
Combined the release and off states.
2016-06-13 15:05:34 -07:00
Anthony J. Thibault
bd3326d2fc
Collapse continueNearGrabbing and nearGrabbing into a single state.
...
* Moved the update logic from STATE_NEAR_GRABBING, STATE_HOLD & STATE_EQUIP into the entryMethods
for those states.
* Removed STATE_CONTINUE_NEAR_GRABBING, STATE_CONTINUE_HOLD & STATE_CONTINUE_EQUIP states
This functionality has been moved into the updateMethod for their respective states.
This *should* be a pure re-factor no functionality was changed.
2016-06-13 14:40:30 -07:00
Anthony J. Thibault
6d2181f0f1
Combine DISTANCE_HOLDING and CONTINUE_DISTANCE_HOLDING states.
2016-06-13 14:40:30 -07:00
Howard Stearns
b0f6b59207
Merge pull request #8040 from hyperlogic/bug-fix/equip-hotspot-render
...
Only render equip-hotspots for objects with attach points.
2016-06-13 11:29:39 -07:00
Howard Stearns
357ccc17aa
Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse
...
fix paused interactions with mouse
2016-06-13 11:28:47 -07:00
howard-stearns
4344a35c60
Use the new system pointer functionality.
2016-06-10 16:00:16 -07:00
howard-stearns
542cfb2e11
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse
2016-06-10 13:02:49 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub
69ae33ad9a
Merge pull request #7997 from SamGondelman/touchFixes
...
Corrected Oculus Touch coordinate system so that hands track properly
2016-06-08 15:39:17 -07:00
Anthony J. Thibault
42068cf2dd
Only render equip-hotspots for objects with attach points.
2016-06-08 15:01:53 -07:00
howard-stearns
3138c4041b
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse
2016-06-08 11:54:00 -07:00
howard-stearns
74c5ddd49f
fix paused interactions with mouse
2016-06-07 09:50:10 -07:00
Anthony J. Thibault
b836a580ff
Updated some debug print information
2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d
Change equip-hotspot to a green sphere.
2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d
handControllerGrab: initial rendering of equip hot-spots
...
* When trigger is depressed, any entities that are marked with a wearable equip-point
will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
functionality is used to draw and delete the hot spots when entering
and exiting the searching state.
2016-06-06 14:40:57 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
eeb08fb401
Merge pull request #8014 from imgntn/leaphands
...
add leap hands to /system
2016-06-04 16:43:30 -07:00
SamGondelman
4fb8eac8ea
much better way of fixing script
2016-06-03 18:12:47 -07:00
James B. Pollack
da023bfbe3
leap
2016-06-03 15:40:04 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
howard-stearns
3e919cb7ac
cleanup
2016-06-03 10:42:02 -07:00
howard-stearns
6d3fd4f208
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into click-on-trigger
2016-06-01 14:17:27 -07:00
howard-stearns
84fa4402fd
Click on full trigger, activate on partial trigger.
2016-06-01 14:03:49 -07:00
howard-stearns
9ad19a2eaf
Draw grab balls in front of entities (not just the lines as before).
...
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
2016-05-31 14:57:31 -07:00
howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
howard-stearns
fdcd667d3c
Fix hand controller pointer after input changes.
2016-05-23 13:33:42 -07:00
Brad Hefta-Gaub
5906f88226
Merge pull request #7952 from sethalves/fix-walking-far-grab
...
fix distance-grabbing and walking at the same time
2016-05-20 16:54:52 -07:00
Seth Alves
a24d63a39c
make distance-grab work better when avatar is walking
2016-05-20 15:45:00 -07:00
howard-stearns
c299aef8f2
fix 588, 558
2016-05-20 12:15:30 -07:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub
53956c8210
reduce log spam
2016-05-19 07:50:06 -07:00
Seth Alves
b4df7cada7
don't mouse-grab things through an overlay
2016-05-18 16:16:31 -07:00
howard-stearns
fa90d823d5
Turn off hand-controller pointer when Interface doesn't have focus.
2016-05-18 11:49:12 -07:00
Seth Alves
009c288745
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
2016-05-12 13:29:40 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Howard Stearns
64dc31cd61
switch statement whitespace
2016-05-10 09:43:00 -07:00
Howard Stearns
2b3f6506b7
more whitespace
2016-05-10 09:38:39 -07:00
howard-stearns
9edd18c017
Fix mouse seek bugs.
2016-05-09 14:05:59 -07:00
howard-stearns
6f4204ca5b
Remove alert for route remapping on hardware change.
2016-05-09 11:41:00 -07:00
Seth Alves
9db839bc13
don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0
2016-05-04 15:01:00 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
