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

5802 commits

Author SHA1 Message Date
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
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
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
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
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
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
amantley
e5b16ef174 implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp 2019-01-16 18:31:52 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
Wayne Chen
3b913db609
fixing typo 2019-01-15 14:21:37 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
luiscuenca
824a93f900 Fix menu update on app reopened 2019-01-14 12:27:59 -07:00
luiscuenca
43d967329c Change Avatar App design for avatar collisions 2019-01-14 10:13:12 -07:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -08:00
amantley
3b5d8db650 updated the json to have a spline node at the root 2019-01-08 17:33:14 -08:00
David Back
d9e229d38e remove add Grid entity button, fix color 2019-01-07 18:20:20 -08:00
David Back
90e2feb977 replace placeholder icon with real icon from Alan 2019-01-07 18:20:20 -08:00
David Back
e0e9a7de15 tabs 2019-01-07 18:20:20 -08:00
David Back
9013eee352 add grid entities to create - icons pending 2019-01-07 18:20:19 -08:00
Jeff Clinton
75d26dc45f
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption 
Add menu checkbox to toggle collisions with other avatars
 2019-01-07 08:58:09 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Thijs Wenker
5d40e1e480 - CR/style fixes 
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
 2019-01-04 23:39:04 +01:00
Thijs Wenker
a3f72a7a08 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-04 21:10:35 +01:00
Ryan Huffman
6d5b9a88e4 Remove dead code in AvatarUploadStatusItem 2019-01-04 11:29:07 -08:00
Ryan Huffman
c2ceeb3d76 Apply AvatarPackager code review cleanup 2019-01-04 09:41:31 -08:00
Ryan Huffman
f27ee1767c Fix rename not working correctly in AvatarPackager 2019-01-04 08:43:43 -08:00
Thijs Wenker
8625037285 Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager 2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats 
Fix network stats to use low-level values
 2019-01-03 16:54:03 -08:00
Ryan Huffman
93f53cf43d Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 2019-01-03 14:18:40 -08:00
Ryan Huffman
847496048f Fix waiting-for-inventory sticking around on avatar uploader 2019-01-03 13:51:45 -08:00
Thijs Wenker
68521e11a7 Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager 
# Conflicts:
#	interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
#	interface/resources/qml/hifi/avatarPackager/InfoBox.qml
 2019-01-03 22:13:04 +01:00
Thijs Wenker
ecc578c2dd - error messages 
- style changes
 2019-01-03 22:00:22 +01:00
Ryan Huffman
7953507cb8 Update avatar project rename to have audio and highlighting 2019-01-03 11:59:16 -08:00
Ryan Huffman
c13badcbc8 Fix project rename focus and create project not initializing 2019-01-03 10:20:13 -08:00
Clement
f163bbc0d5 Sample connections stats every seconds 2019-01-03 10:04:38 -08:00
Ryan Huffman
9c96f7bd01 Add RalewayButton 2019-01-03 08:21:52 -08:00