Ryan Huffman
1c3840dc78
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
2017-03-01 10:25:16 -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
Atlante45
38317a23c9
Keep orientation while seated
2017-02-27 17:33:26 -08:00
Seth Alves
117be16c31
pull from upstream
2017-02-27 16:48:23 -08:00
Atlante45
cd10b828dd
Store whether avatar is sitting in a setting
2017-02-27 16:38:57 -08:00
Atlante45
40fdc4ea41
Remove extra script
2017-02-27 16:38:57 -08:00
Atlante45
b82817e54c
Alternative sit script
2017-02-27 16:38:56 -08:00
Atlante45
e9316d30d0
More IK smoothing experimentation
2017-02-27 16:38:56 -08:00
Atlante45
834755588a
Reset sensors and body
2017-02-27 16:38:56 -08:00
Atlante45
68e3e23bfc
Remove Avatar parenting to chair
2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6
Use head orientation for sitting
2017-02-27 16:38:56 -08:00
Atlante45
0629c6dbf7
Cancel body pitch/roll when getting out of the chair.
2017-02-27 16:38:56 -08:00
Atlante45
0440e2fd60
Set higher tolerance
2017-02-27 16:38:55 -08: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
Atlante45
bf3a69a0b3
Add 2D UI when close to the seat
2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf
Get IK error and stand up based on it
2017-02-27 16:38:55 -08:00
Atlante45
8e9fc83759
Fix sit anim reference
2017-02-27 16:38:55 -08:00
Atlante45
53948b8547
Check other avatar, disable movement in edit mode
2017-02-27 16:38:54 -08:00
Atlante45
1dbc133f12
Add animation state handler to the script
2017-02-27 16:38:54 -08:00
Atlante45
9033242584
More sit script work
2017-02-27 16:38:54 -08:00
Atlante45
1b2120d7e1
Sit script first draft
2017-02-27 16:38:54 -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
Dante Ruiz
21c15927cf
Homebutton dimension and position scales with tablet
2017-02-27 19:33:52 +00: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
Philip Rosedale
4925b3c47c
Merge pull request #9756 from ctrlaltdavid/21122
...
Point index finger and raise thumb if not touching controller
2017-02-25 14:59:48 -08:00
Seth Alves
6a7e04f052
Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy
...
Make Debug defaultScripts.js option less error prone.
2017-02-25 08:57:23 -08: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
b2a35f45db
when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3
2017-02-24 13:04:43 -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
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
Seth Alves
0a2a1b1637
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
2017-02-23 15:25:09 -08:00
Seth Alves
9c0104a060
don't use Entities.getEntityProperties on tablet when it's an overlay
2017-02-23 14:55:52 -08:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
Anthony J. Thibault
84b29c6872
Reload all scripts when Debug defaultScripts.js is changed.
2017-02-23 11:02:25 -08:00
Seth Alves
84d9af14b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-23 10:40:18 -08:00
Anthony J. Thibault
83b3c12559
Removed Window.alert() because it was blocking the defaultScripts thread.
2017-02-23 10:28:16 -08:00
Anthony J. Thibault
1429a32928
Prevent use after free of ScriptEngine pointer when shutting down all scripts.
...
Before this change, if you were running with the Debug defaultScripts.js option on,
it could result in a dereference of a previously freed ScriptEngine pointer.
To prevent this, defaultScripts.js no longer explicitly calls ScriptDiscoveryService.stopScript() on
Script.scriptEnding.
2017-02-23 10:28:15 -08:00
Chris Collins
de84e07281
Merge pull request #9714 from thoys/fix-recorder-js-playback
...
Fix recorder.js playback in interface
2017-02-23 09:59:37 -08:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Seth Alves
4a778b9113
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-22 20:39:47 -08:00
Seth Alves
84f95e6776
oops
2017-02-22 19:18:42 -08:00
