Sergeanur 7c2b9478d5 Merge branch 'master' into miami ...

# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp

2020-05-13 00:55:52 +03:00

..

BulletInfo.cpp

Fix linux warnings

2020-05-12 23:18:54 +02:00

BulletInfo.h

Try to build with mingw

2020-04-20 18:18:46 +02:00

Explosion.cpp

Remove patches

2020-04-17 16:31:11 +03:00

Explosion.h

Removed refs from weapons/, WeaponEffects moved

2020-04-16 01:56:15 +03:00

ProjectileInfo.cpp

Fix linux warnings

2020-05-12 23:18:54 +02:00

ProjectileInfo.h

Try to build with mingw

2020-04-20 18:18:46 +02:00

ShotInfo.cpp

Try to build with mingw

2020-04-20 18:18:46 +02:00

ShotInfo.h

Try to build with mingw

2020-04-20 18:18:46 +02:00

Weapon.cpp

Merge branch 'master' into miami

2020-05-13 00:55:52 +03:00

Weapon.h

changed saving compatibility

2020-05-02 18:02:17 +03:00

WeaponEffects.cpp

1.1 patch stuff

2020-04-19 17:38:10 +03:00

WeaponEffects.h

Remove padding fields

2020-04-18 11:31:53 +03:00

WeaponInfo.cpp

Fix linux warnings

2020-05-12 23:18:54 +02:00

WeaponInfo.h

Fixed typos and made all assert functions optional

2020-05-10 21:49:33 +06:00

WeaponType.h

Try to build with mingw

2020-04-20 18:18:46 +02:00