ulteq
f15522a88f
ATragMX - Estimate bullet length instead of using a fixed value ( #4651 )
2016-11-10 18:35:57 +01:00
Glowbal
0394ea56b4
Increment build
2016-11-09 22:07:07 +01:00
Glowbal
3417c433fd
Prep v3.8.2
2016-11-09 22:06:48 +01:00
Glowbal
18218688a6
Merge branch 'release-v3.8.2'
...
Conflicts:
addons/atragmx/XEH_postInit.sqf
addons/atragmx/script_component.hpp
2016-11-09 21:59:54 +01:00
commy2
9e6ee0363d
fix tripflares script error ( #4647 )
2016-11-09 21:56:57 +01:00
PabstMirror
0975a4f004
MedicalAI - Fix treatment animion with no weapon ( #4633 )
2016-11-09 21:56:26 +01:00
ulteq
a43b70fe89
Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags
...
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
2016-11-09 21:55:39 +01:00
William Giokas
6a910e7fe4
ballistics: Added 20 round 6.5 Lapua and Creedmoor
2016-11-09 21:55:35 +01:00
ulteq
f2a85b63cf
Fixed a typo
2016-11-09 21:54:20 +01:00
ulteq
962a296710
Minor corrections in the ballistics module
...
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
2016-11-09 21:54:16 +01:00
Dystopian
272ec37603
Fix Full Repair menu not shown when damage returns 0 ( #4621 )
2016-11-09 21:53:21 +01:00
ulteq
c5322bff37
Fixes the ATragMX 'Done' button issue ( #4617 )
2016-11-09 21:52:32 +01:00
PabstMirror
910f975276
Fix ubc
2016-11-09 21:51:11 +01:00
PabstMirror
76dbdaaecf
Add semi-colon
2016-11-09 21:51:08 +01:00
ulteq
298a90b68a
Updates the ATragMX gun list
2016-11-09 21:51:05 +01:00
ulteq
91def9396c
Updates the ballistics module to support Apex
...
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
2016-11-09 21:51:01 +01:00
ulteq
661c22a04c
Adds realistic names for the QBZ-95 camo variants
...
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
2016-11-09 21:49:40 +01:00
ulteq
eb6319641e
Fix Kestrel4500 wind speed calculation ( #4609 )
2016-11-09 21:47:42 +01:00
PabstMirror
5463e9dff8
Merge branch 'master' into medical-rewrite
2016-11-09 13:12:42 -06:00
Dystopian
ff961a5bd6
Fix Full Repair menu not shown when damage returns 0 ( #4621 )
2016-11-09 13:11:47 -06:00
Karan Singh
09b89a0bbc
Fix typo in Eden Options ( #4615 )
...
* Fix typo in Eden Options
This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp
* Fix L13
2016-11-09 13:07:29 -06:00
commy2
370e746068
fix tripflares script error ( #4647 )
2016-11-09 13:02:48 -06:00
PabstMirror
20f40f8c55
Use single queue for blood cleanup ( #4586 )
2016-11-09 13:00:18 -06:00
BaerMitUmlaut
dac4a4dc42
Merged instant death and execution into one setting
2016-11-09 19:01:55 +01:00
BaerMitUmlaut
08a378bb2d
Added execution system, improved instant death
2016-11-08 19:37:56 +01:00
ulteq
0580bdcc8e
Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags
...
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
2016-11-08 09:34:48 +01:00
William Giokas
8c2b88da85
ballistics: Added 20 round 6.5 Lapua and Creedmoor
2016-11-08 09:34:48 +01:00
BaerMitUmlaut
928ded0e66
Fixed instant death and PREP
2016-11-07 23:46:10 +01:00
BaerMitUmlaut
ba9fc9240c
Removed traces of old state machine
2016-11-07 23:44:33 +01:00
BaerMitUmlaut
0427814961
Started transition to CBA state machine, removed revive in favour of extended cardiac arrest
2016-11-07 22:21:07 +01:00
BaerMitUmlaut
a65f1d19fa
Added state machine debug functionality
2016-11-07 22:19:55 +01:00
ulteq
51c12dba1d
Allow adding gun list entries via config
2016-11-07 16:40:34 +01:00
ulteq
3f4564605b
ATragMX - Implemented missing features
...
* Muzzle Velocity vs. Temperature Interpolation
* C1 Ballistic Coefficient vs. Distance Interpolation
* Coriolis and Spin drift output
* Options menu
* Truing Drop
---------------------------------
* Overworked default gun profiles
---------------------------------
* Fixed the Cancel buttons on the gun-, atmosphere- and target columns.
* Fixed some muzzle velocity entries in the default gun list.
* Fixed divide by zero error in the target range estimator
2016-11-07 16:40:34 +01:00
bux578
a0d6e0322b
fix typo in acerep7
2016-11-06 20:41:21 +01:00
SilentSpike
e399597678
Clean some cook off code
...
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
2016-11-06 12:29:37 +00:00
bux578
b6ad5d53df
Merge pull request #4637 from System98/master
...
Add missing german translations
2016-11-06 13:09:57 +01:00
System98
6272b95acc
Update chemlight translations
...
- Add missing commas to some chemlight-strings
2016-11-06 12:22:39 +01:00
System98
ac30aadb62
Merge remote-tracking branch 'refs/remotes/acemod/master'
2016-11-06 10:11:18 +01:00
System98
b0bf50c506
Unify and improve some german translations
...
- unify and improve some german translations
- fix a few typos
2016-11-06 10:10:36 +01:00
jonpas
cb9c69186c
Merge pull request #4640 from acemod/fixMakeArgs
...
Fix make.py checkexternal argument documentation
2016-11-05 20:44:00 +01:00
jonpas
43c2e299c9
Fix make.py checkexternal argument documentation
2016-11-05 20:10:08 +01:00
SilentSpike
5032619b9a
Add cook off 3den setting to ammo boxes
2016-11-05 14:48:48 +00:00
SilentSpike
7de56ad9b5
Fix #4630
...
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.
ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
2016-11-05 14:20:48 +00:00
System98
38be06c28c
Typo fix
...
- fix another typo
2016-11-05 13:50:26 +01:00
System98
5376a3045b
Fix typo
...
- Fiy typo in german translation
2016-11-05 13:43:57 +01:00
System98
7efe752f3c
Update german translation
...
- Add missing german translations
2016-11-05 13:42:55 +01:00
System98
a04aa31f21
Merge remote-tracking branch 'upstream/master'
...
- Sync fork with ACE3
2016-11-05 11:22:32 +01:00
bux578
0a047074e5
Merge pull request #4632 from acemod/acerep7
...
Add ACEREP7
2016-11-04 20:58:45 +01:00
bux578
f9f6afb8bb
increase date
2016-11-04 20:16:35 +01:00
bux578
f23d96d455
fix typos, wording
2016-11-04 09:24:21 +01:00