Sergeanur cc94419a72 Merge branch 'miami' into lcs ...

# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp

2021-01-20 19:32:03 +02:00

..

BulletInfo.cpp

Merge branch 'master' into miami

2020-10-18 17:15:49 +03:00

BulletInfo.h

Try to build with mingw

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

Explosion.cpp

fix UB

2020-12-31 16:14:51 +01:00

Explosion.h

rename var

2020-10-05 19:05:13 +03:00

ProjectileInfo.cpp

Fix UB in ProjectileInfo.cpp

2020-12-31 16:34:50 +01:00

ProjectileInfo.h

Weapon layer in Peds

2020-05-15 21:21:25 +03:00

ShotInfo.cpp

Weapon flags changed from bit fields to bit mask (R* vision)

2020-12-26 14:22:02 +02:00

ShotInfo.h

Try to build with mingw

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

Weapon.cpp

Merge branch 'miami' into lcs

2021-01-20 19:32:03 +02:00

Weapon.h

weapons

2020-08-27 19:52:43 +03:00

WeaponEffects.cpp

PlayerPed and "Redefine controls" menu done, fixes

2020-12-02 14:21:46 +03:00

WeaponEffects.h

Remove padding fields

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

WeaponInfo.cpp

Ped: WeaponInfo: little fixes and renamings

2020-12-28 03:25:26 +03:00

WeaponInfo.h

Weapon flags changed from bit fields to bit mask (R* vision)

2020-12-26 14:22:02 +02:00

WeaponType.h

Control updates

2020-10-11 12:56:33 +03:00