Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51718 commits 2 branches 0 tags 1.1 GiB
Commit graph

2147 commits

Author SHA1 Message Date
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
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
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
155a310852 Merge pull request #9761 from Menithal/21166 
WL#21166 Cloneable Equipment
 2017-03-02 16:33:13 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -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
Menithal
91fa871d55 Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey 2017-03-02 21:40:45 +02:00
Menithal
9c31f66b75 Addressed CR of 9684 2017-03-02 21:39:56 +02:00
Ryan Huffman
1564c76ab4 Merge pull request #9792 from huffman/feat/hand-controller-drop 
Add Hifi-Hand-Drop so scripts can cause grabbed items to be dropped
 2017-03-02 10:51:35 -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
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
231ebef117 Removed stray debugPrint 2017-03-02 01:01:57 +02:00
Menithal
fd1fded276 Fixed Clone instancing issues 2017-03-02 00:59:45 +02:00
Menithal
82236bdcb9 Merge remote-tracking branch 'upstream/master' into 21166 2017-03-01 22:09:29 +02:00
Menithal
f538ac24f3 Various Properties 2017-03-01 22:07:02 +02:00
David Kelly
45293ab130 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-03-01 12:55:54 -07: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
David Kelly
efe44425a6 cr feedback, plus something I missed 2017-03-01 09:26:03 -07:00
David Kelly
1fc57ce9a6 alan's feedback 2017-02-28 11:51:40 -07: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
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