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

10974 Commits

Author SHA1 Message Date
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
mharis001
9474250975 Change medical item masses to be same as old medical (#7200) 2019-10-05 22:25:38 +02:00
Josuan Albin
aec7a78a58 Remove Atropine (#7212) 
* Change items to scope 1 to keep mission backwards compatibility
 2019-10-05 22:25:29 +02:00
Dedmen Miller
07be4bd9da Don't force Camera position in Arsenal Loadouts list (#7209) 2019-10-04 19:57:06 -05:00
Dedmen Miller
d1b840fc2d Log checkPBO errors to server log (#7210) 2019-10-04 19:56:25 -05:00
Dedmen Miller
8cc27338a6 Add missing German translation for chemlights (#7211) 2019-10-04 19:50:39 -05:00
mharis001
4cbc83687c Fix undefined variable in reload checkAmmo function (#7223) 2019-10-04 19:13:14 -05:00
Björn Dahlgren
1128ff0f3f Remove duplicate class declaration from laserpointer (#7218) 
Regression from #7217
 2019-10-02 23:28:00 +02:00
Dedmen Miller
af88d2980d Laserpointer - Add vanilla Joint Rails 2019-10-02 10:54:24 +02:00
Björn Dahlgren
8dd9f36ff9 Wrong texture path for ace_csw_tripod_m122.p3d, csw -> apl (#7201) 2019-09-29 19:51:00 +02:00
Björn Dahlgren
6899d8a860 Invalid lod properties with trailing space in ace_cws_tripod_spg9.p3d (#7202) 2019-09-29 19:50:53 +02:00
PabstMirror
a53a2725e9
Remove unused medical DLLs (#7198) 
* Remove unused medical dlls

* x
 2019-09-28 17:09:20 -05:00
mharis001
8b8ec19828 Localize partial wound, fix injury list color flashing (#7196) 2019-09-28 16:25:39 -05:00
mharis001
35a4ffbad6 Expand advanced diagnose setting tooltip (#7197) 2019-09-28 16:25:29 -05:00
PabstMirror
d6507cf119
Medical - epiBoostsSpontaneousWakeUp (#7076) 
* Medical - epiBoostsSpontaneousWakeUp

* Update initSettings.sqf

* Move setting, add strings

* Update initSettings.sqf

* Update addons/medical/stringtable.xml

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
 2019-09-28 16:11:32 -05:00
PabstMirror
c426103f23 Extension changes for Medical Rewrite and Linux compilation (#6909) 
* Fix Medical HandleDamageWounds memory leak (#6809)

* Use strncpy and disable MSVC unsafe warnings (#7171)
* Set 64-bit correctly from generator string, Disable SSE2 flag on 64-bit (non-existent)

* Tweaks for Linux extensions (#5762)
* Tweak CMakeLists for Linux compilation
* Conform SQF extensions check for Linux server extensions support
* Add *.so to tools
* Split extension check into Windows and Linux
* Disable Medical extension loading for now
* Add client/server separation to extension loading
* Add Arma config documentation on extension creation
 2019-09-28 23:03:55 +02:00
PabstMirror
b8c45c0a57
Medical Statemachine - Fix locality EH breaking current state (#7136) 
* Medical Statemachine - Fix locality EH breaking current state

* Handle Injured state

* Update fnc_localityChangedEH.sqf
 2019-09-28 15:52:49 -05:00
mharis001
ec9e6c088b Medical - Only stitch wounds on not bleeding body parts (#7044) 
* Only stitch wounds on not bleeding body parts
 2019-09-28 21:48:19 +01:00
Matsuo Yutani
edc05b8056
Fixed Mistype 2019-09-19 21:44:46 -03:00
Matsuo Yutani
31f5eab2db
Removed weird dot from the first line 2019-09-19 21:42:28 -03:00
Matsuo Yutani
ec0533fd08
Removed weird dot from the firts line 2019-09-19 21:41:41 -03:00
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
PabstMirror
03576b86b9
MedicalSM - Tweak isPlayer checks style (#7178) 2019-09-12 21:50:50 -05:00
jonpas
2d0c61a874
Use CBA Versioning System properly (#7173) 
* Use CBA Versioning System properly

* Update CBA include to CBA v3.12.2 + excessive concatenation cleanup
 2019-09-10 17:49:07 +02:00
mharis001
5dbaef4e07 Improve medical statemachine settings (#7154) 
* Improve medical statemachine settings

* Multi-line condition and update fatal injury description

* Check isPlayer in DeathAI transition

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-09-09 23:30:56 -05:00
LachlanSneddon
b4c1d0cb57 Minor logic fixes (#7174) 2019-09-07 12:18:12 -05:00
PabstMirror
0880ea25a3
Medical Treatment - Add logging for splints (#7170) 
* Medical Treatment - Add logging for splints

* addToTriageCard
 2019-09-06 21:47:20 -05:00
jonpas
dd9692792d
Remove outdated CBA Shared Version Display (#7172) 
Replaced by Arma 3's main menu
 2019-09-06 21:57:54 +02:00
PabstMirror
daa4581fe9
Maptools - Make GPS display a real 3d object (#7086) 
* Maptools - Make GPS display a real 3d object

* Fix header

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
 2019-09-05 15:58:05 -05:00
PabstMirror
edd5c44853
Medical - Improve loading/unloading of unconc patients (#7109) 
* Medical - Improve loading/unloading of unconc patients

* Update fnc_loadPersonLocal.sqf

* Multi-line

* Formating

* Update fnc_loadUnit.sqf
 2019-09-05 15:56:53 -05:00
PabstMirror
d6c39e661f
Medical StateMachine - Tweak dead state handling (#7061) 
* Medical StateMachine - Tweak dead state handling

- Don't call setDammage inside HandleDamage EH
- Add death reason on entering death state

* add a getVar disable in case this causes problems

* Cleanup

* cleanup

* Update addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>
 2019-09-05 15:56:14 -05:00
PabstMirror
9d0e474cf5
Fix statBarStatement still using AI values for firemodes (#7163) 2019-09-05 15:48:49 -05:00
PabstMirror
54125e3697
CSW - Add drag after deploy setting, fix container storage (#7164) 2019-09-05 15:48:26 -05:00
Laid3acK
2e4e59f6e0 Ballistics - Contact DLC rifles added (#7156) 
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added
 2019-09-03 19:09:12 -05:00
Josuan Albin
1caf6fb08f Rearm - Add distance setting (#7137) 
* Add rearm distance setting

* Set rearm distance slider maximum at 50m

* Update addons/rearm/stringtable.xml

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

* Fix rearm action check

* Update addons/rearm/stringtable.xml

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

* Update addons/rearm/initSettings.sqf

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

* Update addons/rearm/functions/fnc_rearm.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-09-03 19:06:50 -05:00
PabstMirror
0fa8330833
Common - Handle changes to UAVControl command (multi seat) (#7161) 2019-09-03 19:05:45 -05:00
Josuan Albin
2950a48447 Fix statBarStatement still using AI values for firemodes 2019-09-03 15:32:27 +02:00
barman75
3cb10e0aa4 Translations - Russian (medical) (#7093) 
* Missing RUS translation (medical)

* Minor misspells corrections

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

* authors
 2019-08-28 10:28:56 -05:00
commy2
4204205908
Merge pull request #7140 from Bosenator/master 
Movement - Display Inventory Weight in Stream Friendly UI Mode
 2019-08-25 19:27:17 +02:00
commy2
be09fd10a3
Merge pull request #7135 from acemod/slideshow-improv 
Fix slide order in slideshow
 2019-08-21 23:07:15 +02:00
commy2
100ac0ff72
Merge pull request #7138 from Elgin675/ace_medical_french_translation 
Addition / modification of the French translation
 2019-08-21 23:06:14 +02:00
jonpas
f1b1ec0d55
Fix undefined variable in View Distance 2019-08-14 17:42:01 +02:00
Elgin675
d7bf026a00 Corections mineures 2019-08-14 14:56:26 +02:00
Bosenator
15fe3c0a18 display inventory weight in stream friendly UI mode 2019-08-14 09:47:24 +01:00
bux
6abe054e95 enable cache 2019-08-13 08:42:58 +02:00
bux
5e1411bee2 Remove Cover Image Stuff, Reverse Arrays 2019-08-13 08:41:30 +02:00
Elgin675
5754d6c506 Fixed an error on the last commit (merge incorrectly). 2019-08-13 02:38:54 +02:00
Elgin675
7f71980c85 Modifications demandées effectuées 2019-08-13 01:32:16 +02:00
Elgin675
927e051ea7 Addition / modification of the French translation 2019-08-12 22:47:16 +02:00
Josuan Albin
df8814e344 Add self stitching setting (#7134) 2019-08-12 20:05:59 +01:00
bux
2f0a5e0c84 Make slideshow add slides in proper order by going through the array backwards, add cover image filed for slideshows, fix wonky german translation 2019-08-12 13:23:32 +02:00
PabstMirror
9ffca544a6
Advanced Throwing - Call muzzle EH and fix RHS inheritance (Compat with RHS 0.4.9) (#6879) 
* Advanced Throwing - Call muzzle EH and fix RHS inheritance

* UBC for rhs
 2019-08-11 17:59:05 -05:00
PabstMirror
ebb1ef628f
Merge pull request #7042 from acemod/cswSuperBranch 
Crew Served Weapons - Final Integration
 2019-08-11 17:57:27 -05:00
PabstMirror
82e7b70f6e
Cargo - fix tankf (#7124) 2019-08-07 22:38:40 -05:00
PabstMirror
f5782fd1ff
Medical - Various debugging and fix cpr anim speed (#7122) 
* Medical - Various debugging and fix cpr anim speed

* Update fnc_setCardiacArrest.sqf
 2019-08-06 08:10:33 -05:00
PabstMirror
75a8ba2b34
Cargo - No cargo on Contact UGV (#7123) 2019-08-06 08:10:05 -05:00
commy2
0fd442451f Interaction Menu - fix a crash when loading savegames (#7115) 
* fix a crash when loading savegames

* fix a variable name

* optimize

* Put CAManBase actions into seperate bucket

* Apply suggestions from code review

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

* Fast exit for All

* CaManBase

* can't skip mans
 2019-08-01 20:52:20 -05:00
Vdauphin
66f62bb1a2 Zeus - FIX ace_zeus_fnc_moduleSetMedicalVehicle setting wrong variable (#7107) 
* FIX set medical vehicle zeus module

Since https://github.com/acemod/ACE3/pull/6933 `isMedicalVehicle` should be use instead of `medicClass`

* isMedicalVehicle is a boolean

44050df98b/addons/medical_treatment/functions/fnc_isMedicalVehicle.sqf (L20)
 2019-07-31 11:20:27 -05:00
PabstMirror
3e97d99893 Merge branch 'master' into cswSuperBranch 
Conflicts:
	optionals/compat_rhs_usf3/CfgMagazines.hpp
	optionals/compat_rhs_usf3/config.cpp
 2019-07-25 15:19:17 -05:00
jonpas
06996d30e1 Update Load Order for 1.94 Contact DLC (#7101) 
* Update loadorder for 1.94 Contact DLC

* Require Arma 3 v1.94
 2019-07-25 13:43:04 -05:00
classic
a7723b793b Update Japanese translation (#7111) 
* 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 Japanese translation
 2019-07-22 09:49:54 -05:00
Vdauphin
8611bbb0bc
FIX French STR_ACE_Common_Anywhere 2019-07-16 22:54:38 +02:00
PabstMirror
ded81418e6
Medical Engine - Report any fatal head damage (#7103) 2019-07-16 13:00:28 -05:00
Whigital
c7d07f7bd7 Update class with correct inheritance (#7100) 2019-07-12 10:04:33 -05:00