Seth Alves
4cf706dd96
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children
...
more correct kinematic motion of grabbed things
2018-07-11 10:34:44 -07:00
Andrew Meadows
dd6be374fa
cleanup and optimization rotational integration
2018-07-10 11:18:38 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping
...
Step Detection From Head and Hands Tracking
2018-07-10 09:59:22 -07:00
amantley
a2f8e024fb
added avatar constants changed for posterior and head velocity
2018-07-09 13:59:56 -07:00
amantley
55ae08c071
Merge remote-tracking branch 'upstream/master' into integratedStepping
2018-07-09 13:55:59 -07:00
Alexander Ivash
fb1a2037e3
move specifying custom properties for preferences dialog from C++ to QML (per Dante's request)
2018-07-06 21:00:55 +03:00
Alexander Ivash
2c07aa787f
allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request)
2018-07-06 21:00:54 +03:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
...
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
amantley
7f5f762208
fixing merge conflict
2018-07-02 15:54:21 -07:00
amantley
096d0d2827
reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update
2018-07-02 15:43:57 -07:00
luiscuenca
97a0edf026
spaces
2018-06-29 14:38:43 -07:00
luiscuenca
24d03ace4c
Changes from CR and decreased looking at angle to mitigate freaky eyes
2018-06-29 14:34:17 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892
...
Fix entity detaching from head joint not becoming visible
2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup
...
Always roll hifi-log.txt when starting
2018-06-27 12:32:20 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID
...
Include shapeID in RayPick results
2018-06-26 10:25:39 -07:00
David Rowe
40fb627504
Merge branch 'master' into 21892
2018-06-25 16:04:44 +12:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8
CR
2018-06-20 16:13:10 -07:00
SamGondelman
12a5d8b550
quiet ubuntu warnings, particle properties show radians
2018-06-19 12:51:35 -07:00
humbletim
dc5c5c20df
raypick partIndex commit
...
include shapeID for accessing proper material index
add raypick shapeID test script
2018-06-18 18:22:30 -04:00
Andrew Meadows
085130e3c9
avatars collide again again
2018-06-18 13:17:32 -07:00
Oren Hurvitz
0cb77362e8
Always roll hifi-log.txt when starting.
...
Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.
2018-06-17 13:44:14 +03:00
David Rowe
be4b929301
Fix cauterization when reparent entity to a different joint
2018-06-16 16:31:06 +12:00
Clément Brisset
11d84e780d
Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta
...
Add uncompressed KTX files to baked texture output
2018-06-13 11:49:41 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers
...
handle semantic version numbers in interface/sandbox update
2018-06-13 11:16:56 -07:00
Anthony J. Thibault
042f902d2e
Merge branch 'master' into scriptedBlendshapesFaceFlags
2018-06-11 17:13:30 -07:00
Ryan Huffman
38df5d3db5
Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta
2018-06-11 16:17:56 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
...
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
Stephen Birarda
9506e7edbe
check for update for dev-builds, handle semantic version
2018-06-08 17:20:57 -07:00
Anthony J. Thibault
c3da4e74de
Code review feedback
2018-06-08 16:22:00 -07:00
Ryan Huffman
faafd26d2a
Add uncompressed KTX files to baked texture output
2018-06-08 11:39:47 -07:00
amantley
913d78841d
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
...
synching with upstream master
2018-06-07 16:20:11 -07:00
amantley
67fc7b90b5
fixed get and set semi nibble to deal with 16 bits
2018-06-07 15:43:21 -07:00
amantley
dca93ca61f
fixed setatone16 function to return the correct result for additional flags
2018-06-06 16:44:12 -07:00
Bradley Austin Davis
fa51c15849
Use binary resources on OSX
2018-06-06 15:10:52 -07:00
Anthony J. Thibault
c3d1daf855
Merge branch 'master' into nativeCGCode
2018-06-04 09:32:38 -07:00
amantley
2879eeb687
added flags for procedural face movement AvatarData.cpp toByteArray and parseDataFromBuffer
2018-06-01 17:18:48 -07:00
samcake
386c0f9ab2
Re review adjustments
2018-05-31 12:16:57 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
...
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c
...
JSDoc fixes
2018-05-24 16:44:55 -07:00
Bradley Austin Davis
3beb77694f
Cached shader binaries and uniform data for shaders
2018-05-24 12:42:33 -07:00
Andrew Meadows
31dd59d212
double bits in collision groups
2018-05-24 11:28:52 -07:00
David Rowe
6d4f704279
Regularize some JSDoc usage
2018-05-21 09:32:10 +12:00
Dante Ruiz
3b59af3ed7
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
2018-05-18 16:42:31 -07:00
vladest
72838f6d34
Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons
2018-05-16 17:06:31 +02:00
David Rowe
fdeb0e3305
Avatar API JSDoc stubs
2018-05-16 09:20:54 +12:00
Anthony J. Thibault
ec638d9d91
Avatar can now look straight down without spinning 180.
...
Also, come code clean up and removal of unnecessary Y_180 flips.
2018-05-14 13:48:04 -07:00
amantley
8000bcd272
cleaned up cg code ie computeNewHipsRotation
2018-05-08 18:12:53 -07:00
amantley
3a10cacec0
1.added the swing twist code to update the follow rotation in MyAvatar.cpp
...
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head. Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity. This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
2018-05-07 17:41:35 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
