Commit graph

3810 commits

Author SHA1 Message Date
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
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07: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
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
Stephen Birarda
a922471b9a
Merge pull request #13018 from huffman/fix/logging-size-limit
Fix old log files not being cleaned up
2018-05-04 10:46:13 -07:00
Ken Cooke
b657c28a9b
Merge pull request #13099 from kencooke/glm-asan-warnings
Fix asan warnings
2018-05-04 09:24:51 -07:00
Ken Cooke
73ce02ce75 Fix asan warnings in byte-unpacking functions 2018-05-04 07:56:44 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
b4ea32bbb6 Correctly compute conical frustum for irregular ones 2018-05-03 18:19:29 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix
Keep CrashpadClient around for application lifetime
2018-05-03 16:48:29 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Ryan Huffman
b29984ab2c Remove max log age for rolling interface log 2018-05-02 10:01:15 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
Clement
538f24162f Define ViewFrustums type alias 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Clement
98cf48694e Expose secondary camera to game logic 2018-05-01 18:02:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -07:00