Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51798 commits 25 branches 0 tags 1.1 GiB
Commit graph

1734 commits

Author SHA1 Message Date
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
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -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
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
Matti Lahtinen
b1639ee3aa Removed a Stray Print json that would spam logs. 2017-02-27 23:40:06 +02:00
Menithal
9fbde41dc4 Styling formating and Rebuild attempt 2017-02-27 23:27:48 +02: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
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
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
David Kelly
baa7f81d79 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 18:38:57 -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