Merge branch 'develop' into feature/MovementCharacter

Browse Source

...

This commit is contained in:

SemvdH

2021-06-11 10:14:12 +02:00

committed by GitHub

parent 770b54bdd5 cca8680a98

commit eaab85ac33

36 changed files with 6346 additions and 4698 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

res/House.obj

-4495

File diff suppressed because it is too large Load Diff

res/pose/coco/pose_deploy_linevec.prototxt

+2976

File diff suppressed because it is too large Load Diff

res/pose/mpi/pose_deploy_linevec_faster_4_stages.prototxt

+2081

File diff suppressed because it is too large Load Diff