Merge branch 'miami' into lcs
# Conflicts: # premake5.lua
This commit is contained in:
@@ -871,7 +871,7 @@ public:
|
||||
void SetAimFlag(CEntity* to);
|
||||
void SetAimFlag(float angle);
|
||||
void SetAmmo(eWeaponType weaponType, uint32 ammo);
|
||||
void SetEvasiveStep(CEntity*, uint8);
|
||||
void SetEvasiveStep(CPhysical*, uint8);
|
||||
void GrantAmmo(eWeaponType, uint32);
|
||||
void SetEvasiveDive(CPhysical*, uint8);
|
||||
void SetAttack(CEntity*);
|
||||
|
||||
Reference in New Issue
Block a user