Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 16:56:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52387 commits 72 branches 56 tags 1.2 GiB
Commit graph

674 commits

Author SHA1 Message Date
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Ryan Huffman
1285f2a9eb Merge pull request #9937 from thoys/boppo 
El Boppo the Clown punching bag game
 2017-03-22 09:30:54 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Thijs Wenker
a8740614e2 CR Fixes 2017-03-18 01:22:06 +01: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
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
Seth Alves
a67f8ac0ed Merge pull request #9807 from Menithal/21166-remove-limit 
#9761 Cloneable Improvement
 2017-03-08 07:15:06 -08:00
Seth Alves
a2d2c41f02 remove debug print 2017-03-06 11:45:49 -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
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
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
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
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
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
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