Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 14:38:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
51738 commits 75 branches 59 tags 1.2 GiB
Commit graph

16862 commits

Author SHA1 Message Date
Zach Fox
c9c07c4269 Basically rebase and squash 2017-03-06 10:03:41 -08:00
Ken Cooke
50f92cb934 redo unsafe optimization 2017-03-04 15:29:23 -08:00
Ken Cooke
46c5f96113 redo unsafe optimization 2017-03-04 15:24:03 -08:00
Ken Cooke
117bba8b6a redo unsafe optimization 2017-03-04 15:17:09 -08:00
Anthony J. Thibault
e56f02d94f Changed default for preferFingerOverStylus to false. 2017-03-03 14:12:04 -08:00
Anthony J. Thibault
45febe8565 Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
Seth Alves
807e15ade9 Merge pull request #9798 from AndrewMeadows/faster-avatar-updates-2 
avoid animation blending for other avatars
 2017-03-02 18:37:18 -08: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
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
88d6fe6a04 fix offset relative to endParent 2017-03-02 16:26:56 -08:00
Seth Alves
5f570c1ba8 fix up bounds handling in Line3DOverlay 2017-03-02 16:16:48 -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
Andrew Meadows
a55ab94cd9 other avatars use jointData no Rig animation 2017-03-02 07:52:02 -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
Anthony J. Thibault
465a9e2008 Responsiveness improvement to tablet 
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
 2017-03-01 14:31:04 -08:00
Andrew Meadows
148100b26f fix bug drawing avatar above ground 2017-02-28 15:10:20 -08:00
Andrew Meadows
c6730f7c58 Merge pull request #9745 from AndrewMeadows/faster-avatar-updates 
Faster avatar updates
 2017-02-28 10:55:21 -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
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Atlante45
9ce10742ec Move avatar not joint 2017-02-27 16:38:57 -08:00
Atlante45
e9316d30d0 More IK smoothing experimentation 2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6 Use head orientation for sitting 2017-02-27 16:38:56 -08:00
Atlante45
e503542b6a Fix transform computation 2017-02-27 16:38:55 -08:00
Atlante45
8c232b5abb Initialize max offset to infinity 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
7132969083 Add hips pinning capability to MyAvatar 2017-02-27 16:38:54 -08:00
Atlante45
6821c8621f More sit work 2017-02-27 16:38:54 -08:00
Seth Alves
df034ea6da remove commented-out code 2017-02-27 11:27:59 -08:00
Seth Alves
8110921abf git rid of _mouseToOverlays until I remember why I thought I needed it 2017-02-27 11:11:04 -08:00
Ryan Huffman
5b59939195 Merge pull request #9602 from huffman/feat/shortbow-entity-server 
Add shortbow to marketplace scripts
 2017-02-27 11:09:52 -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
Seth Alves
36bcaa8d0f delete tablet overlays when switching domains 2017-02-25 08:43:06 -08:00
kunalgosar
d6c1f1c99a Fixed Wed Entity not leaving Focus 2017-02-24 18:18:48 -08:00
Seth Alves
34755dd75d notify children of an overlay when the parent overlay moves 2017-02-24 13:57:49 -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
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
Andrew Meadows
faa272c67c don't blend animations for otherAvatars 2017-02-23 17:36:45 -08:00
Andrew Meadows
4bbbcb61be expand avatar update time budget 2017-02-23 17:36:45 -08:00
Andrew Meadows
14e7392a89 minor cleanup 2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e avoid unnecessary copy of priority_queue 2017-02-23 17:36:45 -08:00
Seth Alves
a286c72b3b cleanups 2017-02-23 15:12:45 -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
Seth Alves
2c42309aaa perfer tablet over other overlays for mouse-clicks 2017-02-23 13:32:24 -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
Chris Collins
de84e07281 Merge pull request #9714 from thoys/fix-recorder-js-playback 
Fix recorder.js playback in interface
 2017-02-23 09:59:37 -08:00
Thijs Wenker
5033e7be11 CR fixes 2017-02-23 18:22:36 +01:00