Commit Graph

11 Commits

Author SHA1 Message Date
Benjamin Jillich 27407540c7 Cleaning motion asset infos (#2197)
* Removing a bunch of legacy files.
* Removing asset info files containing legacy data.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-16 10:19:38 +02:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Aaron Ruiz Mora 35a7ca718b Fixed Physics script canvas assets failing in iOS (#1431) 2021-06-18 17:04:29 +01:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
crroby 62bcf16e85 Updated script and prefab 2021-06-14 09:17:28 -07:00
crroby 5e5aea8d94 Updated some of the physx samples 2021-06-11 16:28:27 -07:00
chcurran 119bc95844 Update graph to address SPEC-7168 2021-06-11 10:01:11 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
Benjamin Jillich 17997b3df8 [LYN-3135] Animation Editor: Some of the default animation assets are broken (#348)
* Cowboy asset was missing mesh group.
* There was a coordinate system rule mismatch between the animations and the character that led to skinning artefacts.
2021-04-27 18:40:04 +02:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00