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

2206 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
samcake
664163eb17 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-28 18:13:01 -08: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
samcake
576660f6ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 18:17:28 -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
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
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
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00:00
David Rowe
31b6d528df Merge branch 'master' into 21176 2017-02-28 08:29:44 +13:00
samcake
699d177b20 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 09:18:20 -08: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
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -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
sam
7a4ec35b99 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-25 13:01:09 -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 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
samcake
1b501487fd simple shader checks 2017-02-24 16:03:28 -08:00
David Rowe
a205d2a00c Use animation for pointing index finger instead of setting joint angles 2017-02-25 11:36:06 +13:00
humbletim
3ac116545e * Switch trigger for deferred loads from timer to using leading entity completion 
* Bring back notion of tracking "bad scripts" to fail stampeding entities as a set
* Update stampede JS tests to highlight/troubleshoot preexisting unload issue
 2017-02-24 16:05:11 -05: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
David Rowe
a98824f483 Code review 2017-02-25 08:13:15 +13: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
David Kelly
d399f648d5 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 10:32:43 -08:00
David Kelly
2458f95c42 more of a peak loudness with decay, now 2017-02-24 10:31:55 -08:00
humbletim
02827552ae Add EntityScriptServer version of the stampede test 2017-02-24 12:31:18 -05:00
Menithal
10151c3f5b Added Multi-userdata field updater 2017-02-24 08:04:03 +02: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
Menithal
bdf241bafd Merge branch 'master' into grab-clone 2017-02-24 05:43:25 +02:00
David Kelly
4a4c914ca8 First cut at new styling 2017-02-23 18:53:22 -08:00
humbletim
0b73cef252 Add stampede test. 2017-02-23 19:10:44 -05:00
Seth Alves
0a2a1b1637 include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet 2017-02-23 15:25:09 -08:00
humbletim
8ab7a8cad5 fix bracket 2017-02-23 18:16:41 -05:00
humbletim
e794b64c31 Add resolvePath and include characterization/unit tests 2017-02-23 18:13:24 -05: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
Menithal
4d98cc436b Finished up Edit.js 2017-02-23 23:20:21 +02: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
Menithal
d59e2ca01a Merge branch 'master' into grab-clone 2017-02-23 20:33:48 +02:00
Anthony J. Thibault
83b3c12559 Removed Window.alert() because it was blocking the defaultScripts thread. 2017-02-23 10:28:16 -08:00