Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source
This commit is contained in:
PabstMirror 2016-01-09 15:25:09 -06:00
commit 0397b3f9f4
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ace_advanced_ballistics.dll
View File

Binary file not shown.

4
extensions/CMakeLists.txt
View File

@ -89,8 +89,8 @@ endif()
string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ")
set(ACE_VERSION_MAJOR 3)
set(ACE_VERSION_MINOR 2)
set(ACE_VERSION_REVISION 0)
set(ACE_VERSION_MINOR 4)
set(ACE_VERSION_REVISION 1)
EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD
OUTPUT_VARIABLE T_ACE_VERSION_BUILD
OUTPUT_STRIP_TRAILING_WHITESPACE

5
extensions/advanced_ballistics/AdvancedBallistics.cpp
View File

@ -5,6 +5,7 @@
#include <unordered_map>
#include <random>
#define GRAVITY 9.80665f
#define ABSOLUTE_ZERO_IN_CELSIUS -273.15f
#define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS)
@ -572,8 +573,8 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function)
positionOffset[1] += cos(bulletDir + M_PI / 2) * horizontalDeflectionPartial;
}
double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity / -32.2) * cos(bulletDatabase[index].latitude) * sin(bulletDir);
velocityOffset[2] -= centripetalAccel * deltaT;
double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity) * cos(bulletDatabase[index].latitude) * sin(bulletDir);
velocityOffset[2] += centripetalAccel * deltaT;
double spinDrift = bulletDatabase[index].twistDirection * 0.0254 * 1.25 * (bulletDatabase[index].stabilityFactor + 1.2) * pow(TOF, 1.83);
double spinDriftPartial = spinDrift - bulletDatabase[index].spinDrift;

5
extensions/common/shared.hpp
View File

@ -1,5 +1,9 @@
#pragma once
//_USE_MATH_DEFINES + cmath needs to be first or M_PI won't be defined in VS2015
#define _USE_MATH_DEFINES
#include <cmath>
#include "targetver.h"
#include <assert.h>
#include <stdio.h>
@ -11,7 +15,6 @@
#include <map>
#include <unordered_map>
#include <memory>
#include <cmath>
#include <cstdint>
#include <streambuf>
#include "ace_version.hpp"

3
optionals/compat_rhs_usf3/CfgAmmo.hpp
View File

@ -139,7 +139,8 @@ class CfgAmmo
ace_frag_skip = 1;
ace_frag_force = 0;
};
class rhs_ammo_m69: GrenadeHand {
class GrenadeHand_stone;
class rhs_ammo_m69: GrenadeHand_stone {
ace_frag_enabled = 0;
ace_frag_skip = 1;
ace_frag_force = 0;