Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 00:34:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75712 commits 75 branches 59 tags 1.2 GiB
Commit graph

5850 commits

Author SHA1 Message Date
Angus Antley
382a03929e changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint 2019-02-15 07:06:43 -08:00
amantley
07a4f49c58 adding the armik nodes into the json 2019-02-05 17:21:39 -08:00
amantley
34d32eeda8 removed the extra ikoverlay in the avatar-animation.json 2019-02-04 10:17:22 -08:00
amantley
f68ee4e7ce merged with master 2019-01-31 09:56:46 -08:00
amantley
d547d5b854 changed the json reader to take an array not a string for the flex targets 2019-01-30 18:16:02 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering 
Case 20902: Give SendAsset.qml a background color
 2019-01-30 08:54:03 -08:00
Dante Ruiz
ccf02d8b65 fix SendAssets.qml 2019-01-29 17:16:27 -08:00
Simon Walton
e45634d4ea Merge remote-tracking branch 'upstream/master' into pal_username_update 2019-01-29 11:55:39 -08:00
Angus Antley
3994311583 starting the move of the initial head base spline to myskeletonmodel 2019-01-29 08:54:35 -08:00
amantley
1919cc3b1a disable mid joint when not valid. more work on this tomorrow 2019-01-28 17:49:46 -08:00
Simon Walton
d2af7eed3d Don't update PAL namecard with empty strings 2019-01-28 17:44:04 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
amantley
ffd3a24bf2 further cleaning, broke the arms 2019-01-28 13:53:30 -08:00
amantley
f8bfef6dbd cleaning up the _hipsIndex references, cleaning in general 2019-01-28 11:50:23 -08:00
Angus Antley
2679a3a30d changed the naming of the middle joint from secondary target to midJoint, also generalized the handling of the neck head rotation after the middle spline is updated 2019-01-27 16:30:13 -08:00
amantley
0b6d0b4baf renamed json to reflect spline node 2019-01-25 18:17:15 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type 
Added HMD Avatar Alignment Type
 2019-01-25 17:32:41 -08:00
Shannon Romano
fe874ca5b1
Merge pull request #14511 from danteruiz/spinbox-fixes 
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
 2019-01-25 17:30:16 -08:00
amantley
f2a7f37950 got rid of the lag in the spline code by setting the flex coeffs to 1.0 2019-01-25 17:11:07 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature 
MS20311: Oculus login feature
 2019-01-25 16:16:32 -08:00
amantley
bcbd9323c0 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-01-25 14:42:24 -08:00
amantley
446d7b9514 added the flex coeff for the primary and secondary spline targets to the json 2019-01-25 14:41:18 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature 2019-01-25 11:44:14 -08:00
Shannon Romano
90c7423dfb
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio 
MS20825: Login Screen Aspect/Crop with resizing
 2019-01-25 11:16:10 -08:00
amantley
37f92d2319 added code to read tip and base var info from the json 2019-01-24 17:02:30 -08:00
Wayne Chen
4880c7081e adding blurred images 2019-01-24 16:00:24 -08:00
Wayne Chen
5c55761e4d adding fill mode for aspect/crop 2019-01-24 15:57:04 -08:00
Wayne Chen
9da7465698 readding render session, adding newlines for oculus failure 2019-01-24 15:33:50 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
amantley
cdd03646c2 latest spline code with ik node removed started cleanup 2019-01-23 17:22:13 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Dante Ruiz
df34d8dcc0 fix spinbox and adjusting OpenVrConfiguration spin boxes 2019-01-23 14:59:37 -08:00
Wayne Chen
049282e2b3 fixing text alignment issues, adding some oculus user log 2019-01-23 14:38:06 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Wayne Chen
e6426cb680
fixing bug with cancel button 2019-01-23 10:26:51 -08:00
Clement
61be5a3cc4 Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
amantley
dbd03e2eb4 got the spline arms and legs working without any inverse kinematic node in the json, using _withIKnode.json 2019-01-22 11:53:18 -08:00
amantley
8d88c627b0 nearly have the arms legs and back working with out the ik node 2019-01-21 17:41:08 -08:00
amantley
6680ca53ad added updateHands2 which deals with two bone hands animvars 2019-01-20 08:56:39 -08:00
amantley
3a2697fa8c working on the two bone ik for the hands 2019-01-18 17:55:19 -08:00
amantley
7777162351 got the spine2 rotationa and the head spline working 2019-01-18 15:28:41 -08:00
SamGondelman
d6f0fbd17b fix snap app issue 2019-01-18 10:48:20 -08:00
Anthony Thibault
0ab13f1e48
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp 
Change Avatar App design for avatar collisions
 2019-01-17 16:06:17 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging 
case 20654: Updating user activity logging for login experience
 2019-01-17 12:59:12 -08:00
Wayne Chen
123f2d71e5 dismissing login dialog on popup if bad linking 2019-01-17 11:38:42 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00