Merge branch 'feature/collision' into develop

Browse Source

...

This commit is contained in:

Menno

2021-05-28 16:14:49 +02:00

parent f1f1aac93d ef058b0087

commit 0c654a51b9

40 changed files with 6170 additions and 332 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

4495

res/House.obj Normal file

File diff suppressed because it is too large Load Diff

BIN

res/Mayo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 323 KiB

BIN

res/Texture.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 970 B