LorenLuke
6f96ca1a64
Added missing magazine and ammunition definitions.
2019-08-31 15:13:38 -07:00
LorenLuke
15c65c5779
Adds HEI magazine.
...
Configs default "1000Rnd_Gatling_30mm_Plane_CAS_01_F" magazine as CM5:1.
Keeps "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51" for legacy reasons.
2019-08-08 12:17:00 -07:00
LorenLuke
7d9c7d5483
Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1
2019-08-08 12:08:22 -07:00
LorenLuke
e6b843f2d2
Fixes double deflecting definition
2019-08-05 12:56:19 -07:00
LorenLuke
92e0d55ef0
Add caliber and deflecting values for AP rounds
2019-08-05 11:10:15 -07:00
LorenLuke
344662e76c
Adds stringtable magazine values
2019-08-04 20:45:05 -07:00
LorenLuke
6b67c5e365
Adds stringtable entries
2019-08-04 20:38:13 -07:00
LorenLuke
e2c6dee3d9
Fixes deafness issue
2019-08-04 12:35:37 -07:00
LorenLuke
cc1dff28f2
Merge branch 'master' of github.com:acemod/ACE3 into patch-1
2019-08-04 11:45:21 -07:00
LorenLuke
8e46e0d131
Fixes accidental late-night reversion
2019-08-04 04:00:26 -07:00
LorenLuke
06fded2ed8
Removes Tabs
2019-08-04 03:49:23 -07:00
LorenLuke
5183d11160
Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1
2019-08-04 03:41:51 -07:00
LorenLuke
113eb70c55
Progress commit
2019-08-04 03:36:40 -07:00
commy2
0fd442451f
Interaction Menu - fix a crash when loading savegames ( #7115 )
...
* fix a crash when loading savegames
* fix a variable name
* optimize
* Put CAManBase actions into seperate bucket
* Apply suggestions from code review
Co-Authored-By: commy2 <commy-2@gmx.de>
* Fast exit for All
* CaManBase
* can't skip mans
2019-08-01 20:52:20 -05:00
LorenLuke
135643d604
Adds Combat Mix Magazine to cannon Magazines
2019-08-01 16:24:47 -07:00
LorenLuke
0eee72e393
Removes Whitespace from CfgAmmo
2019-08-01 14:47:45 -07:00
LorenLuke
d5146a9b3b
Removes Whitespace from CfgWeapons
2019-08-01 14:46:35 -07:00
LorenLuke
a41640d411
Added missing semicolon
2019-08-01 02:27:12 -07:00
LorenLuke
539c4a7a10
Adds Combat Mix Magazine
2019-08-01 02:21:28 -07:00
LorenLuke
09b66294c2
Adjusts 30mm cannon projectiles
...
Adjust 30mm cannon projectile damage.
Adds AP projectile.
Adds Combat Mix Projectile Capability.
2019-08-01 02:19:11 -07:00
LorenLuke
b485078e53
Adds Missing Close Brace
...
Adds Missing Close Brace
2019-08-01 01:28:33 -07:00
LorenLuke
41c89aa1a6
Fixes A-10 Cannon Dispersion
...
Changes A-10 Cannon Dispersion to realistic levels.
2019-08-01 01:25:39 -07:00
Vdauphin
66f62bb1a2
Zeus - FIX ace_zeus_fnc_moduleSetMedicalVehicle setting wrong variable ( #7107 )
...
* FIX set medical vehicle zeus module
Since https://github.com/acemod/ACE3/pull/6933 `isMedicalVehicle` should be use instead of `medicClass`
* isMedicalVehicle is a boolean
44050df98b/addons/medical_treatment/functions/fnc_isMedicalVehicle.sqf (L20)
2019-07-31 11:20:27 -05:00
jonpas
06996d30e1
Update Load Order for 1.94 Contact DLC ( #7101 )
...
* Update loadorder for 1.94 Contact DLC
* Require Arma 3 v1.94
2019-07-25 13:43:04 -05:00
classic
a7723b793b
Update Japanese translation ( #7111 )
...
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
2019-07-22 09:49:54 -05:00
Vdauphin
e592b6b975
Missing return line in coding guide lines for SETPVAR ( #7106 )
2019-07-17 00:02:12 +02:00
commy2
06da5c33dd
Merge pull request #7105 from Vdauphin/patch-1
...
FIX French STR_ACE_Common_Anywhere
2019-07-16 23:17:39 +02:00
Vdauphin
8611bbb0bc
FIX French STR_ACE_Common_Anywhere
2019-07-16 22:54:38 +02:00
PabstMirror
ded81418e6
Medical Engine - Report any fatal head damage ( #7103 )
2019-07-16 13:00:28 -05:00
ace3mod
a8580d0298
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2019-07-12 17:06:56 +02:00
ace3mod
e444684d38
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2019-07-12 17:06:23 +02:00
Whigital
c7d07f7bd7
Update class with correct inheritance ( #7100 )
2019-07-12 10:04:33 -05:00
Whigital
cf389fba76
[compat_rhs_usf3] ACE Explosives functionality for RHS USAF ( #7099 )
...
* Enable ACE Explosives functionality for RHS USAF explosives
* Update with requested changes
* Reorder requiredAddons as per suggestion
2019-07-12 10:04:12 -05:00
PabstMirror
0c47d45d31
Medical - Fix hitpoints on VR units ( #7098 )
2019-07-12 10:03:22 -05:00
dependabot[bot]
5b05c59fd5
Bump lodash from 4.17.11 to 4.17.13 in /docs/src ( #7097 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-07-11 10:16:56 -05:00
commy2
b962d85592
Merge pull request #7095 from acemod/feedbackPainBlackout
...
Medical Feedback - Fix short blackout on any pain
2019-07-11 07:36:18 +02:00
PabstMirror
03dcae9074
Medical Feedback - Fix short blackout on any pain
2019-07-10 13:53:17 -05:00
PabstMirror
e1c650d56e
Medical - add dummy cfgVehicle entries for old modules ( #7091 )
...
* Medical - add dummy cfgVehicle entries for old modules
* add medical_menu
* Update addons/medical/CfgVehicles.hpp
Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-07-05 15:32:19 -05:00
PabstMirror
1534f8cd8d
Quickmount - Improve interactu menu getIn for static weapon ( #7090 )
...
For small static weapons getInNearest would sometimes not detect the vehicle as the `getCameraViewDirection` may be pointing at the interaction node and not the vehicle
2019-07-05 15:22:07 -05:00
PabstMirror
fa910a7fd8
Small med stuff ( #7084 )
...
* Small med stuff
* update adv fatigue comment
* disable medical debug by default
* Fix tourniquet call to addToTriageCard
2019-07-03 10:40:42 -05:00
PabstMirror
05e4f74e73
Medical AI - Adjust healing logic for rewrite ( #6902 )
...
* Medical AI - Adjust healing logic for rewrite
- move state machine from config to sqf
- move all healing logic to seperate func
- attempt to handle healing for new system
* prioritize unitReady medics
* move setting to subcategory under medical
* Use faster GET_WOUND_BLEEDING
* Update fnc_healingLogic.sqf
* Update for wound array changes
* Update treatment events changes
* Fractures/splint
* formating / use GET_OPEN_WOUNDS
* Use non-localized medical category
2019-07-03 09:59:28 -05:00
PabstMirror
aa41fffdb7
Cargo - Add array to disable paradrop effects ( #7016 )
2019-07-03 09:58:46 -05:00
commy2
8a867cc997
shorten transition 'run lowered rifle' -> 'jump with rifle' ( #7078 )
...
* shorten transition 'run lowered rifle' -> 'jump with rifle'
* jump instead of vault while spriting with weapon lowered
* format the configs
2019-06-28 12:11:00 -05:00
PabstMirror
6586cb0144
Update fnc_handleStateUnconscious.sqf ( #7079 )
2019-06-28 12:01:03 -05:00
mharis001
b2f4b8ea20
Medical - Cleanup settings ( #7057 )
...
* Cleanup medical settings
* Fix extra [
* Allow giving IV/blood to self by default
* Medical Blood - Settings improvements and cleanup (#7069 )
* Add more blood settings and cleanup
* Fix include before header
* Update addons/medical_blood/functions/fnc_init.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Disable debug
* Cleanup moved settings
* Fix remaining setting descriptions
2019-06-28 11:50:11 -05:00
PabstMirror
de13ab0f47
Medical - Rework CPR and Bleeding in cardiac arrest ( #7060 )
...
* Medical - Rework CPR and Bleeding in cardiac arrest
* remove cprCreatesPulse, add cprSuccessChance
* hide cpr for basic diagnose
* Update addons/medical_statemachine/functions/fnc_enteredStateCardiacArrest.sqf
Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-27 19:01:20 -05:00
SilentSpike
56cb638aff
Stop AI firing at unconscious units ( #7074 )
...
This just reimplemented the behaviour from #5864
I believe we though using `setUnconscious` command would make this
unnecessary, but testing seems to show that's not the case
2019-06-27 17:11:51 -05:00
PabstMirror
80e203c371
Maptools - Don't convert vanilla straight lines ( #7072 )
2019-06-27 12:57:30 -05:00
PabstMirror
f04b26b93e
Medical - Finish splint/fracture ( #7045 )
...
* Medical - Finish splint/fracture
- Add replacement items
* Add splint models
* Add fracture sound effects
* Add treatment interaction icon
2019-06-22 16:47:35 -05:00
Katalam
d26fcb6f1a
Changed animation for cpr ( #6918 )
2019-06-22 15:55:42 -05:00