Sabrina Shanman
|
6db993fe05
|
Merge pull request #16397 from sabrina-shanman/instancing_skinning
(DEV-561) First pass at skinning for GLTF
|
2019-10-23 15:41:12 -07:00 |
|
sabrina-shanman
|
ca164375f1
|
New skinning for GLTF
|
2019-10-23 10:41:36 -07:00 |
|
Sabrina Shanman
|
68e39eee2e
|
Merge pull request #16377 from samcake/instancing
Instancing: Clean ups, simpler Skin Cluster(s) updates
|
2019-10-18 11:46:27 -07:00 |
|
Sam Gateau
|
a95a4b5aa2
|
Address warnings and comments from review
|
2019-10-18 11:43:25 -07:00 |
|
sabrina-shanman
|
ad6720240f
|
Introduce hfm::Mesh.clusterWeightsPerVertex
|
2019-10-18 11:30:48 -07:00 |
|
Sabrina Shanman
|
5d91d22314
|
Merge pull request #16379 from highfidelity/master
Merge master into instancing
|
2019-10-18 10:24:35 -07:00 |
|
Sam Gateau
|
0321e2c2c3
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-18 10:22:20 -07:00 |
|
Sam Gateau
|
c93ac05994
|
Merge pull request #16378 from sabrina-shanman/instancing_skinning
(DEV-559) Move skinning reweighting code out of model prep
|
2019-10-18 10:21:26 -07:00 |
|
Maia Hansen
|
825fe122a9
|
Merge pull request #16376 from kencooke/audio-wasapi-qt5.12.3
DEV-589: Rebase our audio plugin to Qt 5.12.3 / Qt 5.13
|
2019-10-18 10:11:51 -07:00 |
|
sabrina-shanman
|
be9931bcab
|
Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer.
|
2019-10-18 10:08:45 -07:00 |
|
Ken Cooke
|
6101f54d4b
|
Rebase WASAPI audio plugin on Qt 5.12.3
|
2019-10-18 06:11:00 -07:00 |
|
Sam Gateau
|
695b9cdba6
|
Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform
|
2019-10-18 03:31:06 -07:00 |
|
Maia Hansen
|
fbb47bcfbb
|
Merge pull request #16370 from AndrewMeadows/secondary-shadows
DEV-2293: secondary canera shadow config should recognize performance tier restrictions
|
2019-10-17 18:26:29 -07:00 |
|
Sabrina Shanman
|
e1db1f1de2
|
Merge pull request #16374 from samcake/instancing
Instancing: removing the debug message and warning on int cast
|
2019-10-17 16:40:40 -07:00 |
|
Sam Gateau
|
c89e682b77
|
address warning
|
2019-10-17 16:24:21 -07:00 |
|
Shannon Romano
|
db0a5f3e41
|
Merge pull request #16363 from SimonWalton-HiFi/avatar-mixer-reduce-log-spam
DEV-606: Remove excessive avatar-mixer logging
|
2019-10-17 16:05:07 -07:00 |
|
Sabrina Shanman
|
8bfd479b0f
|
Merge pull request #16371 from samcake/instancing
Instancing: removed dead code and addressing obj serializer
|
2019-10-17 16:03:01 -07:00 |
|
Shannon Romano
|
3f711b7427
|
Merge pull request #16368 from luiscuenca/enableFirstPersonCameraLegacy
DEV-2413: Restate legacy first person camera mode
|
2019-10-17 16:01:31 -07:00 |
|
Sam Gateau
|
bd57cc7b14
|
Fixing bad indexing
|
2019-10-17 15:56:41 -07:00 |
|
luiscuenca
|
33ea63c708
|
Fix warnings and update controls
|
2019-10-17 15:06:12 -07:00 |
|
Sam Gateau
|
55ed7d9a53
|
Add support for shape generation for obj serializer
|
2019-10-17 14:53:32 -07:00 |
|
Andrew Meadows
|
8aa1bddcee
|
RenderSecondView shadow config follows that of RenderMainView
|
2019-10-17 14:11:18 -07:00 |
|
luiscuenca
|
63c2b41929
|
Restate legacy first person camera mode
|
2019-10-17 13:26:42 -07:00 |
|
Sam Gateau
|
01bb8fa601
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-17 09:55:50 -07:00 |
|
Shannon Romano
|
95f00e2caa
|
Merge pull request #16362 from huffman/fix/mac-early-exit
DEV-830: Remove call to processEvents on Mac in ~Application
|
2019-10-16 22:22:58 -07:00 |
|
Shannon Romano
|
6d8b5e2e19
|
Merge pull request #16364 from luiscuenca/tweakNoNeckView
DEV-2316: Tweak camera position in first person to further hide neck
|
2019-10-16 22:15:34 -07:00 |
|
Sabrina Shanman
|
f402dbbf2b
|
Merge pull request #16324 from sabrina-shanman/instancing_gltf
(DEV-561) Enable instancing for GLTF static meshes (WIP)
|
2019-10-16 17:54:19 -07:00 |
|
Sam Gateau
|
9159258b50
|
clean ups
|
2019-10-16 17:42:36 -07:00 |
|
luiscuenca
|
9000b4c7f8
|
Tweak camera position in first person to further hide neck
|
2019-10-16 17:31:10 -07:00 |
|
sabrina-shanman
|
acbdd2b3b5
|
Fix not building due to removed shape.transform
|
2019-10-16 17:04:19 -07:00 |
|
Simon Walton
|
84eab3cdd4
|
Remove excessive avatar-mixer logging
|
2019-10-16 16:58:37 -07:00 |
|
Ryan Huffman
|
e83ac8c0dd
|
Remove call to processEvents on Mac in ~Application
|
2019-10-16 16:14:27 -07:00 |
|
Brad Hefta-Gaub
|
6d895942f3
|
Merge pull request #16350 from ctrlaltdavid/DEV-2391
DEV-2391: Fix Recording.stopRecording() crash
|
2019-10-16 15:33:13 -07:00 |
|
sabrina-shanman
|
0c3e81f52f
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-16 14:03:01 -07:00 |
|
sabrina-shanman
|
5df4092f67
|
Merge branch 'instancing_gtlf_wip' into instancing_gltf
|
2019-10-16 13:40:23 -07:00 |
|
Sabrina Shanman
|
78cb3ac1c3
|
Merge pull request #16359 from samcake/instancing
DNM: Instancing: Rendering correctly the DEFORMED hfm::SHapes
|
2019-10-16 13:33:57 -07:00 |
|
Sam Gateau
|
e9e9d1cdfe
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-16 13:15:40 -07:00 |
|
Sam Gateau
|
6b7c6f1e2d
|
Merge pull request #16360 from samcake/upstream-instancing
Upstream instancing update
|
2019-10-16 13:15:19 -07:00 |
|
Sam Gateau
|
af269a4720
|
Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing
|
2019-10-16 11:57:15 -07:00 |
|
Sam Gateau
|
5d4ad793c4
|
Merge branch 'instancing' of github.com:highfidelity/hifi into upstream-instancing
|
2019-10-16 11:53:06 -07:00 |
|
Sam Gateau
|
60e6206c1b
|
Merge branch 'instancing' of github.com:samcake/hifi into instancing
|
2019-10-16 11:49:52 -07:00 |
|
Sam Gateau
|
a0f366315c
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing
|
2019-10-16 11:49:46 -07:00 |
|
Anthony Thibault
|
5115b52ca0
|
Merge pull request #16356 from luiscuenca/fixLookAtNoHead
DEV-2316: Fix camera position in first person
|
2019-10-16 10:52:53 -07:00 |
|
Shannon Romano
|
a6842b5cba
|
Merge pull request #16346 from dooglifeSF/change_away_animation
New AFK "away" animation
|
2019-10-16 09:17:51 -07:00 |
|
luiscuenca
|
a9aeceff55
|
Undo rig changes
|
2019-10-16 09:10:30 -07:00 |
|
luiscuenca
|
02837be13f
|
Get state using CharacterController
|
2019-10-16 09:04:03 -07:00 |
|
Shannon Romano
|
71ef645781
|
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
Fix sliding when stopping from run.
|
2019-10-16 09:03:00 -07:00 |
|
Shannon Romano
|
c2270765c1
|
Merge pull request #16355 from hyperlogic/bug-fix/hmd-flying-fix
Fix for HMD mode flying
|
2019-10-16 08:42:22 -07:00 |
|
Sam Gateau
|
0a9c389641
|
last issue
|
2019-10-16 08:06:35 -07:00 |
|
Sam Gateau
|
fc4a314fd3
|
Merge branch 'instancing' of https://github.com/highfidelity/hifi into instancing
|
2019-10-16 04:08:58 -07:00 |
|