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
10,872 Commits 73 Branches 88 Tags
Commit Graph

8954 Commits

Author SHA1 Message Date
commy2
158b1eed69 add server only event handler only on server machine 2016-09-19 10:05:16 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +02:00
PabstMirror
616ec642da Add AB Terrain Extension Logging (#4391) 2016-09-18 22:00:34 +02:00
BaerMitUmlaut
7388892dac Fixed weather for inherited CfgWorlds (#4360) 
* Fixed weather for inherited CfgWorlds

* toLower for inArray - check all configs exist
 2016-09-18 22:00:27 +02:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395) 
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
 2016-09-18 22:00:13 +02:00
PabstMirror
fbb054dec4 Merge pull request #4422 from acemod/incindNull 
Skip incindinary effects if projectile is null
 2016-09-18 14:54:18 -05:00
Glowbal
b74245c323 Merged branch medical-rewrite into medical-rewrite 2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00
BaerMitUmlaut
a8b490bfca Merge pull request #4358 from acemod/tweakFatigueDuty 
Tweak fatgiue duty factors
 2016-09-18 16:31:21 +02:00
commy2
6cc960aacc fix nocrosshair being in addons and optionals 2016-09-18 15:19:17 +02:00
commy2
031bb1ec91 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-18 15:17:01 +02:00
commy2
0ff4c20861 Merge pull request #4168 from acemod/nocross 
optional pbo to disable cross hair
 2016-09-18 15:08:43 +02:00
commy2
a5dcdf102f use TRACE macros for parseConfig function 2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d Fix handleDamage not working 2016-09-18 14:05:05 +02:00
Glowbal
7691af47f3 Further clean up 2016-09-18 13:33:22 +02:00
commy2
1c4cd81680 add displayName to blown off turret object 2016-09-18 12:19:29 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d Merge branch 'master' 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
 2016-09-18 11:51:21 +02:00
commy2
2b4c5f9c49 auto add blown off turrets to curator 2016-09-18 11:31:28 +02:00
PabstMirror
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
commy2
95409f6772 Merge pull request #4383 from acemod/support-disable-cookoff 
Add object attribute to disable cookoff for individual vehicles
 2016-09-17 18:50:34 +02:00
commy2
d5edc5a1f5 Merge pull request #4411 from acemod/burn-wheels 
incendiary and cookoff improvements
 2016-09-17 18:30:08 +02:00
commy2
e02516e5b5 invert reverted inverted 2016-09-17 18:08:08 +02:00
commy2
3d18374747 add object 3den setting for disabling cook off effects 2016-09-17 17:47:29 +02:00
Glowbal
e8f55348d8 Add ACE2 sys_Blood port 2016-09-17 16:52:25 +02:00
SilentSpike
e3d26c535a Merge pull request #4368 from 654wak654/delete-teleport-module 
Delete "Teleport Players" module after use
 2016-09-17 11:52:38 +01:00
Glowbal
48a198fea4 Add support for disabling cookoff for individual vehicles 2016-09-17 12:13:43 +02:00
Ozan Eğitmen
56751eff0e Revert "Delete "Group Side" module after use" 
This reverts commit 2880c6152afd69e488de15ed44dfde0f70adacec.
 2016-09-17 01:01:37 +03:00
classicarma
0d4a0a52ba translate gunbag 2016-09-17 01:47:01 +09:00
classicarma
7f208e094d translate grenades 2016-09-17 01:46:51 +09:00
classicarma
5c160db023 translate goggles 2016-09-17 01:46:34 +09:00
classicarma
3605778d60 translate gforces 2016-09-17 01:46:19 +09:00
classicarma
1e28c16ba2 translate gestures 2016-09-17 01:46:09 +09:00
classicarma
5fc3b05c21 translate frag 2016-09-17 01:46:00 +09:00
classicarma
f9e44a2820 translate flashsuppressors 2016-09-17 01:45:47 +09:00
classicarma
32939571e5 translate flashlights 2016-09-17 01:45:34 +09:00
classicarma
6312a19dd6 translate finger 2016-09-17 01:45:24 +09:00
classicarma
d1e57f9678 translate fcs 2016-09-17 01:45:14 +09:00
classicarma
47bd4e9991 translate fastroping 2016-09-17 01:44:56 +09:00
classicarma
4fabf8b1f1 translate exolosives 2016-09-17 01:44:45 +09:00
classicarma
647ad8c681 translate dragging 2016-09-17 01:44:37 +09:00
classicarma
4827a18aa0 translate digtags 2016-09-17 01:44:30 +09:00
classicarma
99c5122120 translate disarming 2016-09-17 01:44:22 +09:00
classicarma
dfa5a745a0 translate dagr 2016-09-17 00:58:02 +09:00
classicarma
24d365fa5d translate cookoff 2016-09-17 00:57:49 +09:00
classicarma
83a18e84de translate concertina_wire 2016-09-17 00:57:40 +09:00
classicarma
e767d65cfb translate common 2016-09-17 00:57:27 +09:00
classicarma
e6b2cc8a74 translate chemlights 2016-09-17 00:57:17 +09:00
classicarma
78ee33b46f translate cargo 2016-09-17 00:57:09 +09:00