sabrina-shanman
|
acbdd2b3b5
|
Fix not building due to removed shape.transform
|
2019-10-16 17:04:19 -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 |
|
Sam Gateau
|
eecaeb1155
|
FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer
|
2019-10-16 04:02:05 -07:00 |
|
luiscuenca
|
93a1adc736
|
Fix camera position in first person
|
2019-10-15 18:25:33 -07:00 |
|
Anthony J. Thibault
|
288f9bfb16
|
Fix for HMD mode flying
In HMD mode you should fly/move in the direction you are looking.
|
2019-10-15 18:22:42 -07:00 |
|
Sam Gateau
|
f049ab7887
|
Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model
|
2019-10-15 18:12:09 -07:00 |
|
dooglifeSF
|
0510215240
|
Move magic number to constant for SLOW_SPEED_THRESHOLD.
|
2019-10-15 17:48:06 -07:00 |
|
Shannon Romano
|
bebb21fa9e
|
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script
Bugfix for legacy sit scripts
|
2019-10-15 16:19:49 -07:00 |
|
Anthony J. Thibault
|
14e5962675
|
Bugfix for legacy sit scripts
Don't return additive clip nodes as valid "roles" for users to override.
|
2019-10-15 15:29:24 -07:00 |
|
Zach Fox
|
1527bf2e11
|
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
|
2019-10-15 14:56:25 -07:00 |
|
dooglifeSF
|
a043f0a17e
|
Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s
|
2019-10-15 14:51:42 -07:00 |
|
Shannon Romano
|
f7862a0556
|
Merge pull request #16348 from sethalves/fix-snap-translate-actions
fix step translate actions
|
2019-10-15 13:18:01 -07:00 |
|
Zach Fox
|
9c03de7af6
|
Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction
|
2019-10-15 12:26:38 -07:00 |
|
Zach Fox
|
9b9110e163
|
Remove cachebusting code
|
2019-10-15 12:26:18 -07:00 |
|
Zach Fox
|
6c92091814
|
Merge pull request #16349 from zfox23/updateEmoteDisplayIcon
DEV-2426: Update Emote Indicator icon
|
2019-10-15 12:13:14 -07:00 |
|
Zach Fox
|
4770008383
|
DEV-2426: Update Emote Indicator icon
|
2019-10-15 11:39:00 -07:00 |
|
dooglifeSF
|
e757a6fd86
|
Merge branch 'master' into change_away_animation
|
2019-10-15 10:46:24 -07:00 |
|
Seth Alves
|
1f8a7cfea7
|
fix step translate actions
|
2019-10-15 09:23:35 -07:00 |
|
Sam Gateau
|
108d331d86
|
more
|
2019-10-14 17:45:07 -07:00 |
|
Zach Fox
|
3102a6ff08
|
Merge pull request #16339 from RebeccaStankus/ouputMutedOverlay
Fixed calculation of overlay position
|
2019-10-14 16:56:50 -07:00 |
|
dooglifeSF
|
589d4e992c
|
Change away anim to hosted afk_texting animation.
|
2019-10-14 16:48:45 -07:00 |
|
Shannon Romano
|
f29d4aad1b
|
Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build
Add Bullet3 patch for Xcode 11 build
|
2019-10-14 16:28:17 -07:00 |
|
RebeccaStankus
|
5831eb261f
|
Changed calculation of overlay size
|
2019-10-14 16:08:01 -07:00 |
|
Zach
|
e495dc7990
|
Fix crash on MacOS; don't do resizing in C++ anymore
|
2019-10-14 15:55:33 -07:00 |
|
sabrina-shanman
|
acca22e2d6
|
Remove unused primitive reference in GLTFSerializer
|
2019-10-14 15:30:03 -07:00 |
|
sabrina-shanman
|
2c99ab5e54
|
Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf
|
2019-10-14 15:05:13 -07:00 |
|
Sabrina Shanman
|
c38462bf6d
|
Merge pull request #16345 from highfidelity/master
Merge master into instancing
|
2019-10-14 14:54:22 -07:00 |
|
sabrina-shanman
|
82247072de
|
Create new mesh if GLTF primitive has different vertex attributes
|
2019-10-14 14:51:57 -07:00 |
|
Sabrina Shanman
|
b8df1c180f
|
Merge pull request #16343 from jherico/fix/DEV-2375
DEV-2375: ensure web entities stop playing audio
|
2019-10-14 13:04:57 -07:00 |
|
RebeccaStankus
|
4720c64af8
|
Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay
|
2019-10-14 13:02:54 -07:00 |
|
Zach Fox
|
341abb8185
|
Merge branch 'master' of github.com:highfidelity/hifi into friction
|
2019-10-14 12:36:35 -07:00 |
|
Zach Fox
|
a1b6b0af35
|
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
|
2019-10-14 11:50:59 -07:00 |
|
Brad Davis
|
6c35387b8d
|
also fix DEV-2083
|
2019-10-14 10:56:23 -07:00 |
|
Brad Davis
|
95b5c8a905
|
DEV-2375: ensure web entities stop playing audio
|
2019-10-14 10:46:32 -07:00 |
|