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
15,617 Commits 73 Branches 88 Tags 752 MiB
eedbb0b5bc
Commit Graph

12828 Commits

Author SHA1 Message Date
lambdatiger
eedbb0b5bc Revert to 60a0dae, merge conflict wasn't resolved properly 2024-06-20 00:04:34 -05:00
lambdatiger
60a0daef66 removed feet hitpoints & tightened multishot submunitions. 
Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit
 2024-06-19 23:23:02 -05:00
lambdatiger
474321ba7c Converted all positions for doFrag to AGL since we're converting to that now 2024-06-19 23:21:49 -05:00
lambdatiger
130037d7e8 Added default fragCount fallback value based on current ACE frag range calculation 2024-06-19 23:20:37 -05:00
lambdatiger
718c3d61c8 Only send blacklist updates to the server 2024-05-19 20:06:16 -05:00
lambdatiger
3d6c4068f4 fixed error (if statement with no argument) 2024-05-19 13:44:31 -05:00
lambdatiger
8d071f9eb5 added debug information and folded if statements 2024-05-19 13:40:26 -05:00
lambdatiger
f1483c59c3 Revert "Exposed projectile event handlers for both blacklist use and other shenanigans." 
This reverts commit eaff498f3f.
 2024-05-19 13:40:02 -05:00
lambdatiger
eaff498f3f Exposed projectile event handlers for both blacklist use and other shenanigans. 2024-05-19 00:15:05 -05:00
lambdatiger
b9aa3cb65b Fixed an issue with fragments being created above water for explosions below the surface 2024-05-19 00:14:14 -05:00
johnb432
e2dce5e102 Readd blacklist 2024-05-18 11:16:43 +02:00
johnb432
4f0c1671e6 Merge branch 'master' into pr/9728 2024-05-09 18:27:02 +02:00
PabstMirror
9d168756df
CUP Compat - Fix NVG Black/Green translations (#9976) 
* cup compat - fix nvg black/green

* Capitalize some colors
 2024-04-30 00:55:59 -05:00
johnb432
4f1c2fa8d7
Common - Fix adding unusable throwables (#9980) 
* Prevent adding unusable grenades

* Update fnc_addToInventory.sqf

* Update addons/common/functions/fnc_addToInventory.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_addToInventory.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-29 12:13:47 -05:00
johnb432
0f5b7c8762
Grenades - Fix unconscious AI being affected by flashbangs (#9978) 
* Stop players being affected by AI flashbang code

* Stop affecting unconscious AI

* Update fnc_flashbangExplosionEH.sqf
 2024-04-28 21:49:36 -05:00
johnb432
7c4f4cf8f8
Grenades - Fix flashbangs causing pain for invulnerable units (#9981) 
Disable flashbang pain for invulnerable units
 2024-04-28 09:07:15 -07:00
johnb432
6e32fc1144
Hearing - Add earplugs only if not present (#9987) 
Only add earplugs if not present
 2024-04-28 09:04:56 -07:00
johnb432
3b806295f7
Hearing - Use class EH instead of extended EH (#9986) 
Use class EH instead of extended EH
 2024-04-28 09:02:50 -07:00
johnb432
60b87f0b41
Medical - Add _createLitter to medical events (#9959) 
Added `_createLitter` to medical events
 2024-04-26 17:35:57 -05:00
Apricot
b513a110f5
Translations - Improve Japanese localization (3.17.1) (#9977) 
Tweaks
 2024-04-26 17:34:11 -05:00
Dystopian
a12ad9ec59
Interact menu - Fix condition in consolidated menu (#9946) 
Fix condition in consolidated menu
 2024-04-25 00:23:10 -05:00
johnb432
1eca83db9f
Common - Fix animations not playing (#9973) 
Update CfgMoves.hpp
 2024-04-24 23:41:27 -05:00
johnb432
9e6f624a68
Cargo - Fix undefined variable and config entries (#9965) 
Cargo fixes
 2024-04-23 14:07:16 -07:00
Hexo
a0e4f09555
Translations - French (Map tools) (#9953) 
* Update translate Hearing french

* update map tools

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-04-22 17:15:05 -05:00
Tim Beswick
23842aab39
Medical - Fix script error when bandaging (#9956) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-19 16:57:41 -03:00
johnb432
7480ae377d
Scopes - Stop changing CBA setting value directly (#9954) 
Update XEH_postInit.sqf
 2024-04-19 10:27:04 -07:00
johnb432
dda6b9d2dc
Medical Treatment - Enforce bandage effectiveness variable type (#9950) 
Enforce bandage effectiveness variable type
 2024-04-16 13:33:40 -07:00
lambdatiger
afc3b109d3
Merge branch 'acemod:master' into master 2024-04-15 20:28:53 -05:00
lambdatiger
559c611fdb and the debug context 2024-04-14 03:43:24 -05:00
lambdatiger
868c6135bf Forgot to update doFragRandom docs with previous changes 2024-04-14 03:34:42 -05:00
lambdatiger
283b80645e Added unneeded class details to make PBOproject happy 2024-04-13 21:38:28 -05:00
lambdatiger
d6c400ee54 Missed variable when updating 2024-04-13 21:30:23 -05:00
lambdatiger
ce60bd35de Almost finished with compats and I had some changes to align vanilla as well 2024-04-13 21:22:31 -05:00
lambdatiger
3c2a3c7ef2 caught calc error while answer johnb's question 2024-04-13 21:21:05 -05:00
lambdatiger
eb24c11e82 Reformatted for legibility and debug output 2024-04-13 21:20:35 -05:00
lambdatiger
25f14af679 updated debugging output and fixed velocity error 2024-04-13 21:20:06 -05:00
lambdatiger
2206ef4ff1 Removed unused classes, redefined using macros to minimize error and make review easier 2024-04-13 21:19:43 -05:00
Hexo
b637a0ea09
Update translate Hearing french (#9949) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-04-13 15:09:48 -05:00
V1nsyara
32707dd860
Language Russian - Update translation (#9947) 
Russian
 2024-04-13 14:53:50 -05:00
PlayerBotPro
6165b46ab6
Medical Treatment - Fix Painkiller has no effect when Advanced Medication is off (#9942) 
* fix: Painkiller has no effect when Advanced Medication is off

* Change PainKillers_PAIN_SUPPRESSION to uppercase

* Update addons/medical_treatment/functions/fnc_medicationLocal.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-11 12:58:50 -03:00
johnb432
bcf1133477
Scopes - Notify restart req. for enable & pressure settings (#9944) 
* Moved keybinds, made settings require restart

* Move keybinds
 2024-04-11 17:43:19 +02:00
OverlordZorn
2b5ea1628f
Weather - Winter Terrain Temperatures (#9943) 
* a -> an

* Added last resort catch for winter maps to define suitable temps

* removed debug line

* purge 🧼

* added check for "snow" in raintexture

* cleaned up conditions

* Update arma-3-scheduler-and-our-practices.md

* isNull && {}

* Update fnc_getMapData.sqf

* Update fnc_getMapData.sqf

* Update fnc_getMapData.sqf

* changed order in condition checks and indentation

* not so lazy

* deep config lookup -> _cfg

* comment

* removed accidental empty line

* 🎢

* Update fnc_getMapData.sqf

* Revert "Update fnc_getMapData.sqf"

This reverts commit a57d114182.

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/weather/functions/fnc_getMapData.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* then -> exitWith

---------

Co-authored-by: Mr. Zorn <56258612+PulsarNeutronStar@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-10 08:26:30 -03:00
lambdatiger
3255dbef36
Compats - Add/Fix Adv, Vehicle Damage ERA and SLAT arrays (#9925) 
* added missing hitpoints and new classes

* added CUP compats

* Fixed missing base class and missing comma
 2024-04-10 08:25:46 -03:00
johnb432
5130a22008
Hearing - Add setting to add earplugs to all units (#9935) 
Add option to add earplugs to all units
 2024-04-10 08:23:50 -03:00
johnb432
095ce88279
Hearing - Notify restart req. for combat deafness setting (#9934) 2024-04-07 12:59:14 -03:00
Grim
6a2f3a21f2
Medical - Fix broken AI ragdolls if AI unconsciousness is disabled (#9917) 
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-04-06 22:20:51 -03:00
BrettMayson
f3f7f2c492
Medical Status - API to modify getBloodLoss (#9926) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-06 22:18:07 -03:00
PabstMirror
431c4d616e
Casing - Move model lookup to cartridge config (#9893) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-06 22:12:06 -03:00
PabstMirror
5ca3465b8a
Medical Treatment - Only create litter on empty container (#9924) 2024-04-06 22:11:51 -03:00
johnb432
f5e8e06c24
Interact Menu - Add nil handling for condition (#9922) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-04-06 22:11:09 -03:00