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,374 Commits 73 Branches 88 Tags 752 MiB
aa0898154d
Commit Graph

10937 Commits

Author SHA1 Message Date
dfr1238
aa0898154d
Update /medical_ai/stringtable.xml 
Add missing string on tchinese
 2019-11-29 00:21:30 +08:00
dfr1238
9f6f838765
Update /interaction/stringtable.xml 
Add missing string on tchinese
 2019-11-29 00:17:58 +08:00
dfr1238
fd2e5a060b
Update /fastroping/stringtable.xml 
Add tchinese translate
 2019-11-29 00:13:50 +08:00
dfr1238
aea7447055
Update /explosives/stringtable.xml 
Add and update tchinese translate
 2019-11-29 00:09:59 +08:00
dfr1238
a81c1fae04
Update /medical_statemachine/stringtable.xml 
Add tchinese translate
 2019-11-29 00:01:09 +08:00
dfr1238
170e2e3441 Add\Update Trad Chinese Translate (#7286) 
* adding tchinese

* add tchinese translate

* add tchinese translate

* Update tchinese translate

* Update stringtable.xml

* Add tchinese translate

* Update tchinese translate

* Update Tchinese

* Add\Update Tchinese

* Add\Update Tchinese Translate

* fix string

* fix string
 2019-11-27 10:54:32 -06:00
PabstMirror
edefaf8220
Trenches - Add item check to progressBar (#7283) 
Fix #7282
 2019-11-27 09:51:22 -06:00
PabstMirror
c13148a9c4 Flashsuppressors - Update muzzle configs 2019-11-26 17:19:07 -06:00
PabstMirror
70438133f2
fix repair strings (#7284) 2019-11-26 16:08:41 -06:00
classic
f3535e436c Update Japanese translation (#7262) 
* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* 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 stringtable.xml

* Update stringtable.xml
 2019-11-26 14:08:14 -06:00
commy2
829240a93a
Merge pull request #7279 from Whigital/kestrel_layer_fix 
[kestrel_4500] Update hardcoded layer id
 2019-11-24 00:40:05 +01:00
Whigital
772a0fcd6a Alt. syntax in favor of obsolete BIS func. 2019-11-22 21:47:51 +01:00
Whigital
8ad6d3ccff Update hardcoded layer id 2019-11-22 20:14:26 +01:00
mharis001
2b4d807acc Add stringtable validation tool (#7274) 
* Add stringtable validation tool

* Add to CI
 2019-11-18 12:48:40 -06:00
Brett
f99157604f Tagging - Group spray paint items in Arsenal (#7268) 
* group spray paint in arsenal

* Title case

* Make Polish translation of Spray Paint items groupable
 2019-11-16 13:15:28 -06:00
PabstMirror
00a91610ea
Only play repatitive sounds when game is focused (#7265) 2019-11-16 12:42:15 -06:00
zharf
5a4f76efb0 Spectator - Restore HUD when coming out of spectator (#7191) 
Fixes #7186
 2019-11-05 12:47:46 -06:00
Tomas Herceg
42233ee449 Add czech translation (#7260) 
Add more czech translations
 2019-11-05 12:37:21 -06:00
Cyruz143
5033a98353 Fixing playsound3d limits (#7024) 2019-11-05 12:14:33 -06:00
Cyruz143
5d07029db7 Cookoff - Allow enabling only on player crewed vehicles (#7147) 
* Add setting for cookoff to only run for player crewed vehicles

* No point having per vehicle selection

* Merging mutliple settings in to one

* Fixing missing comma

* Using LSTRING for settings

* merging suggested fixes

* Moving enabled check to fnc

* Use existing strings for CBA options

* Reverting change to support legacy eden attribute settings

* Adding Pabsts fix for 3den attribute

* Update addons/cookoff/CfgEden.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-11-05 11:55:15 -06:00
PabstMirror
82c6c343b2
Map - Fix map shake (#7252) 2019-10-29 17:10:54 -05:00
PabstMirror
40a66f0bde
Add some editor previews (#7254) 2019-10-29 17:10:40 -05:00
PabstMirror
0e485ce5fc
Arsenal - Fix script error for weapons with 3+ muzzles (#7256) 2019-10-29 17:10:03 -05:00
PabstMirror
691e8d24c6
Repair - fix string (#7251) 2019-10-28 19:18:26 -05:00
mharis001
e78016d7f7
Repair - Add settings to control item requirements for different actions (#7243) 2019-10-24 22:52:04 -04:00
PabstMirror
f9d181c72e
Medical - Fix addDamageToUnit (#7247) 2019-10-20 16:48:26 -05:00
PabstMirror
c37783de0b
Medical - Change WoundReopening default setting (#7246) 2019-10-20 16:46:30 -05:00
PabstMirror
da5e9525b4
Medical - Make some constants variables (#7236) 
* Medical - Make some constants variables

* Add comments about varNames, calc k/l at runtime
 2019-10-20 11:14:31 -05:00
PabstMirror
37284bd0e8 Update docs 2019-10-17 13:17:37 -05:00
PabstMirror
bccf170573 Merge branch 'master' into cbaDisposable 2019-10-17 13:01:07 -05:00
Dedmen Miller
3946928cbe Refuel - Add events for start, stop and progress (#7023) 
* Add refuelTick Event

* Add refuelStarted event

* Add refuelStopped event

* Add event documentation

* Rename events

Fix EOF

* Rename one more event
 2019-10-13 13:08:35 -05:00
mharis001
2e5cdbd62c Explosives - Add ace_isEOD 3DEN attribute (#7080) 
* Add ace_isEOD 3DEN attribute

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
 2019-10-13 12:22:46 -05:00
PabstMirror
342e881fda
Debug to clipboard - Cleanup settings dump (#7240) 2019-10-13 12:21:55 -05:00
PabstMirror
9ac543aacc
Medical - Rename private version of setUnconscious (#7237) 2019-10-12 09:47:57 -05:00
BaerMitUmlaut
8c7f8d7d6a Medical Feedback - effects overhaul (#7215) 
* Intensify pain effects

* Add chromatic abberation effect, add blur with very high pain

* Add option for limited pain effects with only high pain blur

* Fix playInjuredSound

* Add instant feedback effects update when getting hit

* Cleanup

* Overhaul playInjuredSound

* Fix voice detection, simplify nearby unit filter

* Apply suggestions from code review

* Add Chromatic Aberration translations

* Use while loop instead of configClasses

* detach say3d dummies before deleting
 2019-10-11 15:00:53 -05:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224) 
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
 2019-10-11 15:00:25 -05:00
TWC-Rik
6ca4b2075d Nametags - Add Nation Ranks (#7094) 
* Adds icon and postInit

Adds German, British, Spanish, French ranks. Also adds postInit code
that loops through all factions and checks if ranks have been set there
in there for easy, permanent customistability.

* Removed white space

* commy2's postInit rewrite

Changes faction config entry to array with macros and changes the
postInit code to commy2's improved version.

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Adjusted arrays to be multi line

Also removed white space.

* Update addons/nametags/XEH_postInit.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>

* Add getVar setting, don't overwrite if already set
 2019-10-08 23:20:26 -05:00
PabstMirror
2f3d8db134
Medical - Report non-default settings to rpt (#7233) 
* Medical - Report non-default settings to rpt

* Update reportSettings.sqf
 2019-10-08 12:03:05 -05:00
PabstMirror
4eeac9f649
Medical - Death from sum of trauma (#7195) 
* Medical - Death from sum of trauma

* fixes

* Update fnc_determineIfFatal.sqf
 2019-10-08 10:45:09 -05:00
PabstMirror
a71879ccea
Medical - Increase severity of falling damage and Improve non-selectionSpecific wounds (#7214) 
* Medical - Increase severity of falling damage

* Improve non-selectionSpecific wounds

* Use macros for hitpoint indexes
 2019-10-08 10:44:49 -05:00
Daniel Lee
f4dbe5229e Medical - Option for treatment to require holstering/lowering weapon. (#7063) 
* Option for medical treatment to require holstering/lowering weapon, with an option for examine category items to still be available.

* Vehicles cause holster settings to be ignored.

Unsure whether to expand this into it's own setting (disallow all medical in vehicles? only allow if both medic and patient are in the same vehicle? what about people in the back of transports healing those in the cab?), but just going to leave it as is for now.

* Replace !isEqualTo with != in for performance reasons.

Resolves line 33 PR review.

* Merge settings, short circuit

* move logic to new file
 2019-10-08 10:44:36 -05:00
Broström.A | Evul
b514541bec Safemode - add public setWeaponSafety function (#7092) 
* Create fn_safeWeapon.sqf

* Update XEH_PREP.hpp

* Adjustments to script to meet demands 

not tested

* adjustment according to review

* minor adjustments

* Update fn_safeWeapon.sqf

* Rename and adjustments

* Adjustments

* Fixed typo

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fixed missing param in exsample

* Test fixes

* Update addons/safemode/functions/fnc_setWeaponSafety.sqf

Co-Authored-By: Filip Maciejewski <veteran29@users.noreply.github.com>
 2019-10-07 20:19:04 -05:00
pterolatypus
06a0f30a05 Removed a redundant conflict-check in fnc_lockSafety (#7189) 2019-10-07 20:07:14 -05:00
mharis001
13ffc07f27 Common - Optimize arithmeticGetResult function (#7232) 
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-10-07 19:41:46 -05:00
Björn Dahlgren
c1f3e8256b Dragon - Remove Shadow Buffer (ShadowVolume 1000+) lods (#7219) 2019-10-06 19:13:12 +02:00
PabstMirror
99db6802bb
Inventory - Adjust for changes to medical (#7112) 
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
 2019-10-06 11:10:56 -05:00
Laid3acK
ce0ccb2d1e Realistic names - Contact DLC rifles added (#7155) 
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_weapons_added

* contact_dlc_weapons_added
 2019-10-06 11:09:38 -05:00
BaerMitUmlaut
5bdbb5c398 Speed up carry animation (#7216) 2019-10-05 22:32:38 +02:00
PabstMirror
b236cf9a65
Medical - Fix addDamageToUnit (#7228) 2019-10-05 15:31:40 -05:00
mharis001
de39ad4c21 Medical - Add descriptions for limping and fracture settings (#7199) 2019-10-05 22:27:45 +02:00