Sergeanur 655eaa36ce Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/Script.cpp # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/render/Fluff.cpp # src/render/Hud.cpp		2020-06-15 17:44:47 +03:00
..
BulletInfo.cpp	small fixes	2020-06-13 13:57:25 +03:00
BulletInfo.h	Try to build with mingw	2020-04-20 18:18:46 +02:00
Explosion.cpp	CAutomobile done	2020-05-31 17:05:59 +02:00
Explosion.h	CAutomobile done	2020-05-31 17:05:59 +02:00
ProjectileInfo.cpp	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
ProjectileInfo.h	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
ShotInfo.cpp	fixed compiler errors	2020-05-24 17:27:12 +02:00
ShotInfo.h	Try to build with mingw	2020-04-20 18:18:46 +02:00
Weapon.cpp	CBike done	2020-06-07 00:01:59 +02:00
Weapon.h	CBike done	2020-06-07 00:01:59 +02:00
WeaponEffects.cpp	VC CParticle done	2020-05-27 02:16:31 +03:00
WeaponEffects.h	Remove padding fields	2020-04-18 11:31:53 +03:00
WeaponInfo.cpp	fixed compiler errors	2020-05-24 17:27:12 +02:00
WeaponInfo.h	fixed compiler errors	2020-05-24 17:27:12 +02:00
WeaponType.h	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00