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,803 Commits 73 Branches 88 Tags 752 MiB
1d407b314b
Commit Graph

13803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Whigital
cdf02f629e
Only set unconscious upon entering CA (#7503) 
Hopefully fix players being able to self interact when transitioning from cardiac arrest -> unconscious
 2020-02-04 11:17:25 +00:00
Whigital
3be84e946b
[medical_status] Enable user input between death and respawn (#7502) 
Fix being unable to use any menus created while dead
 2020-02-04 11:15:45 +00:00
Whigital
95c213fd2b Update GREF with WeaponSlot comment 2020-01-31 18:42:19 +01:00
Whigital
b4ac3301c8 Update AFRF with WeaponSlot comment and author property 2020-01-31 18:41:37 +01:00
Whigital
cf732c17fc Update USAF with WeaponSlot comment 2020-01-31 18:33:16 +01:00
Whigital
7e91ffc7a2 Update CSW author fields and remove inherited properties on ace_csw_staticAACarry 2020-01-31 18:31:48 +01:00
Whigital
0b4a38de89 Remove GREF mag defs 2020-01-30 23:22:46 +01:00
Whigital
9aacdf3628 Remove AFRF mag defs 2020-01-30 23:22:36 +01:00
Whigital
bd90b1ae89 Remove USAF mag defs 2020-01-30 23:21:59 +01:00
Whigital
62a7db5c43 Remove CSW mag defs 2020-01-30 23:21:30 +01:00
Whigital
93173d43b2 Add magazines to carryable statics 2020-01-30 23:17:15 +01:00
PabstMirror
2feeec0d7f
Medical AI - Block healing when handcuffed (#7493) 2020-01-28 19:12:38 -06:00
PabstMirror
270a5a930f
Frag - Fix spallTrack (#7492) 2020-01-28 19:12:11 -06:00
dfr1238
2e7fee5256 Update tchinese (#7490) 
Update missing string
Fix string about STR_ACE_Medical_Treatment_VehiclesAndFacilities
 2020-01-28 09:28:31 -06:00
Cyruz143
ed1488edba Adding medical box to classnames page (#7472) 
* Adding medical box to classnames page

* Forgot advanced medical box
 2020-01-22 09:18:08 -06:00
jonpas
4ac04a8f92
Tools - Delete .github_changelog_generator (#7484) 
* Delete .github_changelog_generator

* Update Release Drafter replacer category tiltes
 2020-01-21 17:36:52 +01:00
commy2
798df92f2d
Merge pull request #7473 from diwako/allow_blood_for_none_medics 
Medical - Add setting for medic level to transfuse IVs
 2020-01-19 17:32:30 +01:00
commy2
a1c5b68c8e
Merge pull request #7475 from acemod/medical-cardiactimeout 
Medical - Increase Cardiact Arrest Time to 5 min
 2020-01-19 11:26:03 +01:00
Panisher
d9054e1c52 Overheating - Fix jamming sound (#7463) 
* This sound was heard all over the map

* secondaryWeapon changed to handgunWeapon

* add jamming sound

* add yourself to AUTHORS.txt
 2020-01-18 11:40:41 -06:00
M3ales
71da4360b8 Changed version to versionStr as fix for #7478 (#7479) 
Ensures return value of string is preserved.
 2020-01-18 11:15:49 -06:00
commy2
8a16c9da1b ACE_weaponThrown event 2020-01-18 18:12:01 +01:00
diwako
37bea2eb81 French translation by Elgin675 2020-01-17 17:45:06 +01:00
PabstMirror
5c774f5fe6
release-drafter - Add category for translations (#7439) 
* release-drafter - Add category for translations

* Update .github/release-drafter.yml

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

* Update release-drafter.yml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-01-17 08:59:50 -06:00
jonpas
5c1ea16fb0
Medical - Increase Cardiact Arrest Time to 5 min 2020-01-17 14:05:17 +01:00
PabstMirror
4cd087cf39 Merge branch 'master' into combine-bandage-settings 2020-01-16 21:30:40 -06:00
Taha
d8f18c685b Turkish Language Update (#7446) 
* Fatal

* Fatal

* Fatal

Turkish Language Update

* Fatal

* Update AUTHORS.txt

* Fatal

Fix

* Update AUTHORS.txt

* Update

* Delete stringtable.xml

* Update stringtable.xml

* Delete stringtable.xml

* Revert "Delete stringtable.xml"

This reverts commit 704c1e838c.

* Update stringtable.xml

* Fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-01-16 21:14:23 -06:00
diwako
c6147da1b8 Fix spelling 
Move setting above allowSelfIV
 2020-01-16 19:24:39 +01:00
diwako
3afac31a30
Merge pull request #1 from veteran29/patch-5 
Add polish translations
 2020-01-16 15:51:52 +01:00
Filip Maciejewski
b442f60e89
Add polish translations 2020-01-16 14:10:36 +01:00
diwako
db2900eeb9 Add setting for blood transfusion medic level 2020-01-16 00:28:02 +01:00
dfr1238
aee506db99 Update tchinese (#7461) 2020-01-13 23:32:46 -06:00
Elgin675
273d4ac161 fix translations: removes Blood_IV "keep cold" (#7457) 
* fix translations: removes the words "keep cold" from `Blood_IV` keys

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
 2020-01-13 23:32:24 -06:00
SimichRE
3ba441509d Russian translation (#7442) 
* Translation: Russian

Added missing translation to Russian

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml
 2020-01-13 23:31:33 -06:00
Filip Maciejewski
ad579bf5e4 Fix missing earplug actions (#7464) 
Fix bug introduced in #7400
 2020-01-13 18:34:42 +01:00
jonpas
3a65a73e94
Tools - Run Release Drafter only on original ACE3 repository (#7450) 2020-01-11 19:48:13 +01:00
commy2
c740ffe009 Merge branch 'hitreactions_throwWeapon' of https://github.com/acemod/ACE3 into hitreactions_throwWeapon 2020-01-11 19:29:49 +01:00
commy2
353feb6400 don't drop if inside a vehicle 2020-01-11 19:29:33 +01:00
Jo David
245a60fbbc Changed: Spanish translations updated (#7432) 
* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish translation updated

* Merge patch-12

* Laser - Spanish translation updated

* Logistics_uavbattery - Spanish translation updated

* Apply suggestions from code review

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>

Co-authored-by: ArgA-Maxtor <martincardozo@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-01-11 10:08:35 -06:00
AgentPiTi
4bfa882eb7 Polish Translations (#7449) 
* PL Translations

Done some of new Polish translations

* Fix doubles

* Apply suggestions from code review

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

* Polish Translations

Missing polish translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2020-01-11 09:49:30 -06:00
commy2
08a83840dc
Merge pull request #7416 from Dahlgren/feature/cook-off-event 
Cook Off - Change Cook Off events to global and add to events docs
 2020-01-11 11:02:03 +01:00
commy2
382a60ced7
Merge pull request #7444 from acemod/fixBrrrrt 
Aircraft - Fix ACE_Gatling_30mm_Sub class
 2020-01-11 09:42:43 +01:00
PabstMirror
12cb0993cf Aircraft - Fix ACE_Gatling_30mm_Sub class 2020-01-10 23:14:55 -06:00
Jo David
c7255e928c
Merge pull request #7441 from SimichRE/patch-2 
Russian Translations
 2020-01-11 06:11:15 +01:00
commy2
518006e864
Update addons/hitreactions/functions/fnc_throwWeapon.sqf 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2020-01-11 03:01:33 +01:00
commy2
bd2dc7367b
Update addons/hitreactions/functions/fnc_throwWeapon.sqf 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2020-01-11 02:58:51 +01:00
commy2
c97bd2fb01
Update addons/hitreactions/functions/fnc_throwWeapon.sqf 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2020-01-11 02:58:40 +01:00
commy2
b736928259 add function to throw current weapon 2020-01-10 22:12:59 +01:00
commy2
ea3f400fc1 add function to throw current weapon 2020-01-10 22:12:34 +01:00
SimichRE
d5e2eb3a17
Translation: Russian 
Added missing translation to Russian
 2020-01-10 18:54:30 +03:00
PabstMirror
4fd927ff6b
remove array from cookoff doc event 2020-01-10 09:51:14 -06:00