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
13,809 Commits 73 Branches 88 Tags 752 MiB
25e212cfa3
Commit Graph

13809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Maciejewski
25e212cfa3
Interaction - Show current team color in Team Management menu (#7650) 
* Show current team in interaction menu

* Use nametags color for Team Management icon color

* Use nametags color in Join team action icons colors

* Update addons/interaction/functions/fnc_modifyTeamManagementAction.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-04-30 11:39:03 -05:00
Elgin675
ff252a5bf9
Translations - fix some french keys (blood status and trenches) (#7670) 
* Translations: fix some french "blood lost" status

* Translations: fix some french "trenches" keys
 2020-04-30 11:37:56 -05:00
TyroneMF
ef7a98a7ee
Documentation - Add Medical Rewrite settings explanations and presets (#7657) 
* Update Medical System Document

- Explanations of settings
- Example "Basic" and "Advanced" medical setups.

* Cleanup

- Minor changes to the way certain things were written.
 2020-04-28 10:23:06 +02:00
classic
7cc168e1b9
Updated japanese translation (#7668) 2020-04-27 11:24:34 -05:00
billw2012
8f1dc1d252
New group side in Leave Group interaction is same as original group side (#7667) 
Previously it would be `side player`, now it is `side group player`, which is more consistent (as unit and group sides are not necessarily the same).
 2020-04-27 06:22:48 +02:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
commy2
1d407b314b
fix Unknown name (#7662) 2020-04-24 23:59:47 +02:00
PabstMirror
1e2b88f170
Minor RPT cleanup (#7658) 2020-04-22 10:05:22 -05:00
PabstMirror
11f1c2b626 Update version.html for ace3.13.2/acex3.5.2 2020-04-22 09:36:04 -05:00
PabstMirror
fea3bcd569 Merge branch 'release-3.13.2' 2020-04-22 09:33:35 -05:00
Jo David
a182a01c47
clear up medical documentation and remove outdated info, add "curated" medical settings (#7597) 2020-04-21 11:51:14 -05:00
PabstMirror
a17f108ea8 Prep 3.13.2 Build 49 2020-04-21 11:01:45 -05:00
PabstMirror
b682e8fb6a Merge branch 'master' into release-3.13.2 2020-04-21 11:01:08 -05:00
Elgin675
123ac52404
Translations - Add French Dragging_RaiseLowerRotate key (#7656) 2020-04-21 09:48:53 -05:00
PabstMirror
c824163fff Prep 3.13.2 - Build 48 2020-04-20 10:51:17 -05:00
PabstMirror
d898b7de81 Merge branch 'master' into release-3.13.2 2020-04-20 10:50:45 -05:00
Jo David
3b15014099
Dragging - Add possiblity to rotate a carried object (#7640) 
* Add possiblity to rotate a carried object

* simplify the code by using cba_events_control instead of a custom set variable

* le ACE and don't save frames
 2020-04-20 17:45:59 +02:00
PabstMirror
21c927195a
Cargo - Re-enable damage on unloaded tanks (#7655) 2020-04-20 17:45:27 +02:00
Elgin675
c4667c896f
French translation: Medical_Damage_Eden_threshold keys (#7652) 
STR_ACE_Medical_Damage_Eden_threshold_DisplayName
STR_ACE_Medical_Damage_Eden_threshold_Description
 2020-04-19 21:29:01 -05:00
Filip Maciejewski
eb8856e7c5
Vehicles - Configurable speed limiter step (#7601) 
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-Authored-By: Elgin675 <elgin675@hotmail.com>
 2020-04-20 02:17:42 +02:00
diwako
142fc1e3de
Medical - Add ability for unit specific damage threshold (#7455) 2020-04-20 02:17:13 +02:00
PabstMirror
f0f90ec866
Tools - Add dummy files for check external (#7600) 2020-04-19 18:52:59 -05:00
Blutze
217ccce465
Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle (#7634) 
* check for variable and ai, use correct type

* clean up negations

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-04-19 11:30:02 -05:00
PabstMirror
36cbdb301e Prep 3.13.2 Build 47 2020-04-18 19:25:17 -05:00
Joko
ab989d4c34
Map Gestures - Improve transmit process (#7646) 
* simplify map gestures transmit process

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* remove setPlayerOwner call

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-04-18 19:15:12 -05:00
shukari
4302a944d7
ace_cargoLoaded for zeus module (#7520) 2020-04-18 16:14:54 -05:00
jonpas
9bf1d50383
Documentation - Update packages (#7645) 2020-04-18 20:19:05 +02:00
jonpas
90a8e5a1d6
Extensions - Fix buffer overflows and Artillery Tables for GCC (#7641) 
* Dynload - Fix buffer overflow

* Fix more buffer overflows

* Fix Artillery Tables compilation for GCC
 2020-04-18 12:41:37 -05:00
jonpas
ddff1c3095
Tools - Enable CI HEMTT artifacts (#7644) 2020-04-18 19:04:26 +02:00
Vdauphin
82d7980ada
CSW - Add event when deploy weapon succeded (#7635) 2020-04-14 09:34:34 -05:00
PabstMirror
fafc597321
CSW - Update 3den config for 1.98 changes (#7335) 2020-04-14 09:33:25 -05:00
Rutger "RedBery" Meijering
b3f7de9f0f
Cargo - Fix tankx vehicles receiving water damage when loaded (#7636) 
* Adds tankX simulation type to check for water damage fix

* Changes simulationType to variable

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: Dystopian <sddex@ya.ru>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: Dystopian <sddex@ya.ru>
 2020-04-14 06:57:11 +02:00
PabstMirror
c4514b3fb3
Reload - Fix check ammo display for empty GL launchers (#7624) 
* Reload - Fix check ammo display for empty GL launchers

* Improve display for secondary muzzle
 2020-04-10 15:13:55 -05:00
Elgin675
68ef196bcf
Translation fr: fix inaccurate 'ACE_Medical_Fractures_SplintHasEffects' key. (#7633) 2020-04-10 15:13:33 -05:00
ace3mod
41cfed9bd2 [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2020-04-09 03:55:30 +02:00
mharis001
a7260c6974
Magazine Repack - Add inventory context menu action (#7631) 2020-04-09 03:52:54 +02:00
javathezone
ee3a721429
Documentation - Fix Mk6 Mortar elevation mistake (#7630) 
* Update mk6mortar.md

* Update docs/wiki/feature/mk6mortar.md

Co-Authored-By: Blutze <37950828+Blutze@users.noreply.github.com>

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
 2020-04-08 13:23:48 +02:00
pterolatypus
79ea841eeb
Medical Damage - Determine ammo damage type through config property (#7608) 
* Determine ammo damage type through config property

* Tabs

* Add warning when property is missing

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Fixed up inheritance
Some classes were not editable;
changes moved to relevant subclasses instead

* Newlines for readability

* More sensible default value

* Fix mistakes I added

* Update addons/medical_damage/CfgAmmo.hpp

* Pre-cache special values for damage types

* Support # values

For backwards compatibility

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-04-07 21:52:20 -05:00
Filip Maciejewski
64c30a94be
Map - Detect switchable flashlight attachments for map (#7578) 2020-04-07 17:48:32 +02:00
Laid3acK
cf3b0467ac
Ballistics - B_50BW_Ball_F updated (#7572) 
* 50bw_noformat

* 50bw_noformat

* 50bw_noformat

* 50bw_noformat

* 50bw_noformat
 2020-04-06 10:27:39 -05:00
TyroneMF
9c4aef3096
Realistic Names - Add 2D optics (#7571) 
* Add 2D optics to realistic names.

* require ace_optics
 2020-04-06 10:23:24 -05:00
jonpas
e4d7583991
Documentation - Add DeTex as Mikero requirement (#7626) 2020-04-06 10:10:40 -05:00
pterolatypus
90338fd893
Fix typo in HandleDamage (#7629) 2020-04-06 16:05:57 +01:00
PabstMirror
a84af7ba9a
Medical - Improve some error msgs (#7588) 2020-04-05 05:01:51 +02:00
jonpas
dd0ca9dc84
Respawn - Add save gear event (#7607) 2020-04-04 10:24:59 -05:00
Saborknight
68143cba41
Explosives - Remove "Activate mine" action menu item (#7622) 
* Fixed - "Activate mine" action menu item still showing

The "Activate mine" action menu item was still showing, but only after an explosive was set, then diffused.

* Update addons/explosives/config.cpp

Co-authored-by: commy2 <commy-2@gmx.de>
 2020-04-04 14:58:10 +02:00
BaerMitUmlaut
54086bb2ef
Fix being stuck dragging when in combat pace (#7617) 2020-04-03 18:28:14 -05:00
Rutger "RedBery" Meijering
1f20047410
Rearm - Fix vehicles failing rearm due to case differences (#7609) 2020-03-20 17:54:30 +01:00
TWC-Rik
be3d69ff25
Reload Launchers - Improve External Launcher Reload (#7605) 
Launchers reloaded by an external player will be instantly loaded since
the external player already has to go through a loading bar.
 2020-03-15 21:41:55 +01:00
Brandon Danyluk
3286913df3
Add TCVM to authors 2020-03-12 09:35:52 +01:00