Merge remote-tracking branch 'origin/master' into miami

Browse Source

# Conflicts:
#	src/control/RoadBlocks.cpp
#	src/core/Collision.h
#	src/core/Pad.cpp
#	src/core/SurfaceTable.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/peds/Population.cpp
#	src/render/Fluff.cpp
#	src/render/Shadows.cpp
#	src/render/Shadows.h
#	src/render/Sprite2d.cpp
#	src/weapons/BulletInfo.cpp

...

This commit is contained in:

Sergeanur

2020-08-07 12:34:41 +03:00

parent 40185161b8 f14b1fba09

commit 7d8ffa9ebd

34 changed files with 3423 additions and 306 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

1118

src/core/Collision.cpp

File diff suppressed because it is too large Load Diff