Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51718 commits 76 branches 59 tags 1.2 GiB
Commit graph

648 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
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
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
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
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
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
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
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
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
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
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
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