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
11,205 Commits 73 Branches 88 Tags 752 MiB
ab7af04530
Commit Graph

11205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
ab7af04530 Overhauled the medication system: 
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
 2016-12-06 20:42:10 +01:00
ulteq
b2838557fa Removed dead code 'hrCallback' 2016-12-06 18:55:54 +01:00
ulteq
02ac4c4084 Fixed minor bug in the heart rate calculation 2016-12-06 17:40:05 +01:00
ulteq
faa2b619ab Removed overly verbose debug logs 2016-12-06 17:35:52 +01:00
ulteq
fa77fb7194 Various fixes: 
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
 2016-12-06 17:26:11 +01:00
ulteq
978a81fb0a Removed dead code 2016-12-06 14:37:48 +01:00
ulteq
92da5c80a0 Partly fixed Medication 
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
 2016-12-06 12:58:12 +01:00
ulteq
7d6edd6c41 Brought the SQF variant of the woundsHandler back (for linux servers) 2016-12-06 10:59:29 +01:00
ulteq
db547a53b7 Increased unconsciousness wake up interval 2016-12-06 10:58:43 +01:00
PabstMirror
c47772eddc Fix stringtables 2016-12-05 19:40:26 -06:00
ulteq
46340fe8d8 Fixed accident 2016-12-05 23:03:25 +01:00
ulteq
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
ulteq
624315524e Fixed typo 2016-12-05 21:39:47 +01:00
ulteq
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01:00
commy2
9cba0baade manual merge 2016-12-05 20:18:15 +01:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
Glowbal
0b854a6077 Increase days inactive issues reminders 2016-12-04 14:30:00 +01:00
PabstMirror
8d1f988f5d AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-02 12:44:39 -06:00
commy2
d75eeac1e4 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-02 10:09:48 -06:00
BaerMitUmlaut
e082597e3c Merge pull request #4740 from acemod/fixBloodErr 
Fix blood drop selection if blood loss is high
 2016-12-02 06:13:08 +01:00
PabstMirror
4eba77f328 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-01 20:36:10 -06:00
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
PabstMirror
3566e6e7f5 Update SMG_02 base class for 1.66 (#4718) 2016-12-01 12:05:28 -06:00
PabstMirror
321bb0bc57 Add frag definitions for remaining ammo (#4736) 
Remove rpt warning
Close #342
 2016-12-01 11:01:55 -06:00
PabstMirror
962903f201 Unify javelin guidance for RHS ammo (#4737) 2016-12-01 11:01:24 -06:00
ulteq
448dcddc55 ATragMX - cleanup and some fixes (#4714) 
* ATragMX - Improved the default gun profiles
* Recalculated all muzzle velocities (based on 15 degrees Celsius)
* Recalculated all scope base angle (based on the new muzzle velocities)

* ATragMX - Removed lots of duplicate code
* Introduced dynamic simulation interval (based on muzzle velocity)

* ATragMX - Fixed simulation interval for the truing drop feature
 2016-12-01 10:23:03 +01:00
ulteq
50e144672f Ballistics - Cleanup (#4721) 
* Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries
* from all vanilla ammo types

* Removed all unused ammo types

* Ballistics - Removed more unnecessary config entries
 2016-12-01 10:21:59 +01:00
BaerMitUmlaut
c8ddc601ef Merge pull request #4738 from KaiSforza/cyrus 
Realisticweights: Updated cyrus weight
 2016-12-01 08:50:27 +01:00
William Giokas
b9fbd2723a Realisticweights: Updated cyrus weight 
Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen
Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life
counterpart. This just changes the weight to 140, similar to that of the
SVDK, a possible real-life counterpart for this rifle.
 2016-12-01 01:27:02 -06:00
jonpas
34a38cf9b2 Merge pull request #4731 from acemod/pboProjectNote 
Add PboProject .hpp exclusion note
 2016-11-29 20:10:32 +01:00
jonpas
3d1820e3fd Add PboProject .hpp exclusion note 2016-11-29 20:06:44 +01:00
BaerMitUmlaut
ac28bce578 Fixed state machine not running for units 2016-11-29 12:35:26 +01:00
BaerMitUmlaut
c10d4c51de Merge pull request #4722 from acemod/afRemEH 
AdvFatigue - Remove setVar when removing eh
 2016-11-28 00:17:38 +01:00
PabstMirror
bc89a260ff AF - Remove setVar when removing eh 2016-11-27 16:38:33 -06:00
ulteq
dff577d5d1 ATragMX - Simplified Coriolis calculation (#4716) 2016-11-27 09:56:23 +01:00
jonpas
23ff6252cf Update blank component (#4711) 2016-11-25 17:38:06 -06:00
ulteq
8f16702e64 Advanced Ballistics - Performance improvement (#4708) 
* Up to 16% faster frame times with 200 simultaneously flying projectiles
 2016-11-25 19:25:03 +01:00
magicsh0tz
ed0fd5f6f6 Switched to CBA_fnc_waitAndExecute (#4709) 
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
 2016-11-25 19:18:04 +01:00
classic
05ddca5b90 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-11-25 18:50:07 +01:00
ulteq
aaebdc3752 ATragMX - Minimize the integration error (#4703) 
* The goal is to keep the error below 0.1 MRAD
 2016-11-25 10:29:49 +01:00
ulteq
7d22fce8da Advanced Ballistics - New default simulation interval (#4707) 2016-11-25 00:15:41 +01:00
ulteq
b2ba95913a ATragMX - Truing Drop fix (#4704) 
* Fixes a bug in the truing drop feature that occurs when the zero range is greater than the truing range
 2016-11-25 00:15:04 +01:00
jonpas
a6fa317d93 Add GitHub Changelog Generator configuration file (#4705) 2016-11-25 00:14:28 +01:00
Glowbal
30f492d704 Add module documentation (#4297) 2016-11-25 00:11:27 +01:00
Glowbal
050384e960 Merge branch 'release' 
Conflicts:
	docs/_config.yml
	docs/_config_dev.yml
 2016-11-25 00:08:32 +01:00
ulteq
f9e273237f Advanced Ballistics - extension rebuilt (#4706) 2016-11-24 12:40:34 -06:00
jonpas
6b9f991e60 Merge pull request #4702 from acemod/makeArchiveNoBuild 
Remove build number from release archive
 2016-11-24 11:24:25 +01:00
jonpas
a89bcd65d7 Remove build number from release archive 2016-11-24 11:07:29 +01:00
ulteq
87b9671757 AdvancedBallistics - Abort after adjusting the muzzle velocity (#4700) 
* Always adjust the muzzle velocity when advanced ballistics is enabled
 2016-11-24 00:11:25 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00