Commit Graph

1604 Commits

Author SHA1 Message Date
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
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
0fa8330833
Common - Handle changes to UAVControl command (multi seat) (#7161) 2019-09-03 19:05:45 -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
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
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
Vdauphin
8611bbb0bc
FIX French STR_ACE_Common_Anywhere 2019-07-16 22:54:38 +02:00
PabstMirror
8763184b6a
CSW/Dragon cleanup and rearm compat (#7068)
* Dragon work

cleanup
remove unused p3ds
add pos_gunner_dir/pos_gunner to static
add [csw] prefix to arsenal version
add sight interaction icons

* Update fnc_staticWeaponInit_unloadExtraMags.sqf

* ace_rearm compat

allows pulling carry mags out of rearm trucks

* Update fnc_ai_handleFired.sqf

* Re-add 3den attributes

* cleanup and move A2 staticweapon strings to ace_csw
2019-07-05 17:57:22 -05:00
Brandon Danyluk
7b13a75305 RHS CSW compatability (#7082)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat

* RHS compatability

* Modified all tripod p3ds to have [0,0,0] at the mount. Ported AGS-30, Kord, M220, and SPG-9 tripods to APL And added them to CSW. Changed RHS compats to use new ported tripods. Changed strings to reflect real names.

* Change from M224 Mortar Bag -> Mk6 Mortar bag

* Add named propert (Autocenter) to make P3D [0,0,0] the center of the object instead of engine calculated

* oh no tabs

* remove some more evil tabs

* fix changes lost in merge

* fix bad merge pt2

* Fix UBC
2019-07-04 17:56:49 -05:00
mharis001
b2f4b8ea20 Medical - Cleanup settings (#7057)
* Cleanup medical settings

* Fix extra [

* Allow giving IV/blood to self by default

* Medical Blood - Settings improvements and cleanup (#7069)

* Add more blood settings and cleanup

* Fix include before header

* Update addons/medical_blood/functions/fnc_init.sqf

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

* Disable debug

* Cleanup moved settings

* Fix remaining setting descriptions
2019-06-28 11:50:11 -05:00
PabstMirror
445e082cc4
Common - Let isEOD handle non bools (#7067) 2019-06-21 11:21:33 -05:00
C0kkie
f6b35a63ab Translations - German (#6920)
* Add all missing german translations for the ace medical system

* RHS Compat - Add 2 round hellfire to pylon options (#6893)

* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon

* Fastroping - Add user setting to confirm cutting ropes (#6876)

* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml

* compatibility with CBA scripted 2d optics framework

* compatibility with CBA scripted 2d optics framework

* Bewusstlosstatus -> Bewusstlosigkeit

* Verblutungseffekt -> Blutungs effekt

* Aktivitere ACE Sanitäter Aktionen -> Aktiviere Sanitäter Aktionen

* Sanitätermenüs -> Sanitätsmenü

* kritsche -> kritische

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for advanced fatigue, ai, arsenal & ballistics

* Update addons/ai/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for ace cargo

* Add missing german translation for vehicles

* Add missing german translation for weaponselect

* Add missing german translations für ace repair

* Add missing german translations for ace quickmount

* Add missing german translations for ace explosives

* Add missing german translations for ace common

* Ace flashlight missing german translation

* Add missing german translations for ace scopes

* add missing translations for ace respawn

* Add missing german translations for ace overpressure

* ACE Nametags german translation

* .

* ace magazinerepack german translation

* ace interaktion german translations

* add missing german translation for ace interaction menu

* ACE Hearing german translations

* Update stringtable.xml

* Update stringtable.xml

* Missing german translation in ace dogtags

* Missing german translations ace hot

* ace pylons missing german translations

* ACE Cook off German Translations

* zeus german translations

* Fast roping german translations

* gforces german translations

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Map - Don't enable map light for parachutes (#6961)

* Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)

* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

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

* Common - Don't add UAV AI to localUnits array (#6951)

* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

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

* Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions

* Update stringtable.xml

* Nightvision german translations

* Update stringtable.xml

* remove non-stringtable stuff ???
2019-06-08 10:35:42 -05:00
Brandon Danyluk
b1d5bbe450 Adds Crew Served Static Weapons (#5652)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat
2019-06-07 23:47:39 -05:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933)
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* Apply suggestions from code review

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

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-03 10:31:46 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

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

* Apply suggestions from code review

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

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

* Apply suggestions from code review

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

* next iteration, still WIP

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

* next iteration 2, still WIP, sorry

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

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

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

* Apply suggestions from code review

small fixes

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

* Apply suggestions from code review

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

* minor misspells corrections

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

* minor misspells corrections

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

* /arsenal and /captives resolve

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

* minor changes in /scopes, almost done

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

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
PabstMirror
c6609cbdb9
Common - Fix script error with uniqueItems in scheduled (#6998) 2019-05-13 17:20:01 -05:00
classic
7b44138282 Update Japanese translation (#6980)
* 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

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
2019-05-11 23:33:49 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* Apply suggestions from code review

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

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
PabstMirror
83cd316b2e
Common - Don't add UAV AI to localUnits array (#6951)
* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:30:43 -05:00
PabstMirror
6d50667359
Fastroping - Add user setting to confirm cutting ropes (#6876)
* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml
2019-04-03 12:18:55 -05:00
PabstMirror
3769679237
Add tool to verify stringtable entries exist (#6889)
* Add tool to verify stringtable entries exist

* Update circle.yml

* test

* Allow running from root directory as well as from inside the tools directory
2019-03-31 15:27:51 -05:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
Medical rewrite
2019-03-30 15:20:15 -05:00
commy2
6ac2906aba setMass method to disable collisions 2019-03-24 09:26:00 +01:00
Unknown
a8d28ebedc Merge remote-tracking branch 'upstream/master' into medical-rewrite 2019-03-21 17:51:19 -04:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
Magnetar
82131b3643 Fix include in wrong location 2019-03-17 17:48:44 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
commy2
df8b23b9ba version check handle minor versions below 10 2019-03-16 11:05:01 +01:00
commy2
f248e81c65 version check handle minor versions below 10 2019-03-16 11:00:20 +01:00
Dedmen Miller
7f04d00b7f Add localUnits array and use that inside medical statemachines (#4836)
* Added localUnits EH

Code by @Commy2

* Init localUnits Variable

* use localUnits for medical_blood statemachine

* use localUnits for medical_ai statemachine

* Remove bracket hell

* Add Deleted EH

* Run at preInit, move to seperate file

* Handle Respawns, Filter Dead

* Add detection for Fake deleted EH

* Use a getter function

* delete all objNull at deletedEH

* Cleanup header/comments

* Move isBleeding check to inside statemachine

* opps

* debug off
2019-02-26 23:28:16 -06:00
PabstMirror
191c4fb694
Disable debug on ace_common_fnc_readSettingsFromParamsArray (#6820) 2019-02-17 12:58:07 -06:00
Dedmen Miller
598738c22f Common - Use CBA addons instead of activatedAddons (#6802)
* Use CBA addons instead of activatedAddons

* Better checks

* Betterest checks

* Delay call to toLower until needed

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-02-14 12:49:56 -06:00
PabstMirror
af3b8ec7fc Common - checkfiles use cba's list of CfgPatches 2019-02-08 16:39:57 -06:00
commy2
547dfff683 Common - optimize toHex (#6788)
* optimize toHex

* Use predefined hex array in preInit
2019-01-26 11:01:41 -06:00
NeilZar
9eb7d0d75d Change PBO check error messages (#6751)
**When merged this pull request will:**
- Change the error messages for PBO version checking

They were a bit confusing. `Missing server addon(s)` was most of the time interpreted as `You're missing server addon(s)`.
2018-12-30 05:11:19 +01:00
Jakub Ochalski
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
Josuan Albin
de828a2997 Parachute - Fix "hide altimeter" setting (#6721)
* Fix hide altimeter setting not working

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Clean up altimeter PFH

* Put ! back inside
2018-12-06 16:36:35 -06:00
PabstMirror
0104030666
Add param for settings that require restart (#6512) 2018-11-02 12:58:57 -05:00
PabstMirror
b97ec2c8c8 Common - disable light from green weap lasers 2018-10-25 11:40:27 -05:00
jonpas
4ff01967b6
Add Feature Camera Player EH and Handling (#6573)
* Switch to CBA Feature Camera handling

* Register ACE3's Feature Cameras

* Backwards compatiblity for old ace event

* Require CBA 3.9
2018-10-12 14:59:40 +02:00
Andrea Verano
5594b9cef1 Italian Translation Update (#6621)
Added new strings in:
-Advanced fatigue
-Arsenal
-Ballistics
-Common
-Concertina wire
-Dogtags
-Explosives
-Maverick
-MicroDAGR
-Night vision
-Overpressure
-Realistic names
-Scopes
-Zeus

Fixed some strings in:
-Common
-Concertina wire
-Hitreactions
-HuntIR
-Inventory
-Laser
-Maverick
-Medical ai
-Missile guidance
-Realistic Names
-Spotting scope
-Switch Units
-Tactical ladder
-Tripod
2018-10-08 20:49:37 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
mharis001
803d497d8a Improve checking of unit items (#6350)
* Add uniqueItems function

* Optimize dogtag children actions function

* Optimize getDetonators item search

* Store CfgWeapons lookup in getDetonators

* Update items to use new function

* Update items to use new function 2

* More optimization of uniqueItems function

* Update items to use new function 3
2018-09-17 14:03:28 -05:00
Dystopian
0e980907fe Fix some item type magic numbers (#6487)
* Fix item type magic numbers

* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
classic
d31f004ac2 Update Japanese translation (#6503)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-08-06 11:18:59 -05:00
Dedmen Miller
7a0a00ea09 Cleanup using SQFLint (#6485)
* Use private
* Fix wrong spacing
* Fix wrong variable being used
* Cleanup empty line after header
* ace_common_fnc_getCountOfItem
* Remove useless _return variable
* Naming
2018-08-02 15:02:10 +01:00
PabstMirror
2203cb7b16
Common - Update showHud function for new elements (#6459)
Showhud command has been updated to 10 elements
2018-07-21 18:03:00 -05:00
Glowbal
e8f00fbe7c
Merge remote-tracking branch 'origin/master' into medical-rewrite 2018-07-18 20:42:41 +02:00
PabstMirror
fa7b2ed73d
Fix unit info base class (#6430) 2018-07-13 12:35:56 -05:00
shukari
5fe82662e5 ace_infoDisplayChanged will now trigger also for mods (#6422)
* add RscUnitInfo to DisplayLoad eh

* delete all ace_infoDisplayChanged that also have initDisplay with RscUnitInfo
2018-07-13 12:19:58 -05:00
alef
3673a6f56a Italian Translation Update (#6425)
* Fix wrong order shown in addon category list

Just put 'ACE' at begin

* Typo

* Add/Fix: arsenal, nightvision and others.

common, explosives, maverick, gforces, pylons, hearing, marksers, repair,
flashlights, nametags, interaction, vehicles, medical_menu, medical_ai,
interact_menu, medical
2018-07-11 10:17:13 -05:00
Dissyu
e5a15d200f Traditional Chinese update (#6408)
Traditional Chinese update
2018-06-27 14:16:11 -05:00
maike1860
e3c5396593 Add Chinese translation Modify grammar (#6400)
Translations-  Chinese: Modify grammar
2018-06-22 19:14:11 -05:00
mharis001
fdf6100fb6 Add ACE Flags (#6394) 2018-06-18 15:01:32 -05:00
Vdauphin
f9943658e9 Cargo - Support of object without ace_cargo_size defined in config or -1 config value (#6364)
* Add: Now findUnloadPosition support also cargo object

- use of ace_cargo_fnc_getSizeItem to determine size of item

- prefer the config way instead of manually set size

- This will also take into account object manually added to the cargo system with ace_cargo_fnc_setsize

- use the cargo object for ace_cargo_fnc_unloadItem.

* FIX: old work around

* FIX: error when cargo module is not loaded

* As suggested by @orbis2358

This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement.

* Use ACE framework to check if module is present

* FIX: EFUNC and isEqualto

- _itemSize here is always number
- here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

* FIX case where config value is `-1`

- if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem
-
 https://github.com/acemod/ACE3/issues/6357#issuecomment-393525374
2018-05-31 22:48:19 -05:00
Dedmen Miller
4ede9858e5 Fix minor typo in fnc_cachedCall (#6346) 2018-05-16 20:00:51 -05:00
commy2
d6a88ac34a
Merge pull request #5828 from xrufix/AimCoef
Add ability to set aiming coefficient for mission scripting.
2018-05-16 07:53:09 +02:00
classic
2cd4615d5d Update Japanese translations (#6340)
* 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

* 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

* 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

* 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

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-05-11 08:39:32 -05:00
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
mharis001
7239ad561f Change ACE Hint preview (#6271) 2018-04-15 13:14:31 -05:00
commy2
ede072cd5c
getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
rufix
b6b58d4860 Update headers 2018-04-10 03:55:28 +02:00
Dedmen Miller
50abe911a5 Change stringToColoredText to accept a hex string (#6241) 2018-04-09 16:20:03 +01:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait (#6160) 2018-02-21 11:05:17 +01:00
Dystopian
e683c524d7 Map - Add Camping Light support (#6087)
* Add Camping Light support

* Add intensity check
2018-02-13 13:27:57 -06:00
PabstMirror
c864a6d569 Vehicle Lock - Convert to cba settings (#6133)
Switch vehicleStartingLockState from slider to list
Close #6014
2018-02-10 03:32:14 +01:00
PabstMirror
2b89b3102b HuntIR - Register as a feature cam (block NVG border) (#6138)
Fix #6135
2018-02-10 03:31:38 +01:00
Dystopian
59783a2e7a Small changes to persistent laserpointer (#6101) 2018-02-09 15:31:05 -06:00
PabstMirror
ba5d44b848
Allow displayTextStructured to be moved via game layout settings (#6102)
* Allow displayTextStructured to be moved via game layout settings

Fix #6081

* Fix comment, add upperleft bounds check
2018-02-09 14:27:40 -06:00
PabstMirror
9e213f0e9a
Fix movedToSQF (#6124) 2018-02-09 14:27:21 -06:00
God of Monkeys
3c697ca80b Chinese Language Update (#6130)
Chinese Language Update
2018-02-07 15:15:15 -06:00
BrenSilent
4258b9a6d6 [German Translation] Update for new Settingsmenu (#6015) (#6016)
* German translation update

This updates partially the german translation for the new cba settings UI

* Fix tooltipp

Fixes the tooltipp for the safezone when switching units

* Fixes

Various fixes after review

* Missed two

Fix in stringtable for arsenal

* Gonna catch em all

Another small mistake i missed.
2018-02-01 12:09:11 -06:00
sbng-PAPA
6ce8b8473a korean translate 3.12.x (#6071) 2018-01-28 15:42:32 -06:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building (#6049) 2018-01-15 19:02:06 +01:00
PabstMirror
00ba133b21 Dev helper function to convert settings to code (#5752)
* Dev helper function to convert settings to code

* fix double //

* Add movedToSQF config

* Fix paramArray settings

* Add movedToSQF to moveMarkers

* Add tabs
2018-01-07 02:46:47 +01:00
Josuan Albin
0acbde1489 Various ACE Arsenal fixes (see description) (#5996)
* Copy the array properly when using preStart cache in openBox

* Fix add and removeVirtualItems erroring out when passing false as arg

* Disable face, voice, and insignia tabs in 3DEN

* Move grenadeList and putList outside of foreach in scanConfig

* Fix grenadeList and putList indentation

* Change the camera handling in onArsenalClose

Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN.
Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed.

* Fix message control overflowing, move width defines to defines.hpp

* Add ability to exit arsenal and not apply a loadout in 3DEN

* Add ACE3 logo to common, fix config pathing to a non existing file
2018-01-05 18:56:21 +01:00
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString (#6007)
* Deprecate common function numberToDigitsString
2018-01-02 17:00:01 +00:00
commy2
183fc93c5a
Merge pull request #6001 from acemod/fishykins-master
add allowFadeMusic setting
2018-01-02 17:12:47 +01:00
commy2
ef77bb077e
Merge pull request #5987 from acemod/setHidden-forgetTarget
make setHidden use forgetTarget
2018-01-02 16:28:10 +01:00
commy2
32755e4e91
forget only different side 2018-01-02 16:26:13 +01:00
commy2
be56c991ed
Update stringtable.xml 2018-01-02 16:00:35 +01:00
commy2
f8ff279c6b Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2018-01-02 15:11:14 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +01:00
commy2
6a70ab1ff4 allowFadeMusic setting 2018-01-02 14:57:19 +01:00
commy2
6dec4c8259 Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master 2018-01-02 14:37:13 +01:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
commy2
13e52b4410 make setHidden use forgetTarget 2017-12-29 02:48:20 +01:00
commy2
4db844e596 merge 2017-12-23 01:47:43 +01:00
Christian Klemm
ead5fb4a5e Added config params for white/blacklisting digging (#5898)
* Added config params for white/blacklisting digging

* changed to canDig option

* Update README.md

* Update fnc_canDig.sqf
2017-12-20 15:41:50 -06:00
commy2
801afb3061 update extension check (#5899) 2017-12-20 15:41:06 -06:00
SilentSpike
2bf67ea057 Use common icon function for vehicle actions (#5923)
* Use common icon function for vehicle actions

* Always create vehicle icon namespace
2017-12-20 14:30:50 -06:00
PabstMirror
c2d6fa53d4
Remove enum warnings (#5931) 2017-12-19 12:13:38 -06:00
PabstMirror
e6683e8077
Add slider settings (#5920)
* Add slider settings

* WARNING to INFO

* tweak scopes / adv fatigue
2017-12-16 11:51:15 -06:00
commy2
0eccca6174 display carried weight in SI and imperial (#5918) 2017-12-16 04:50:17 +01:00
Andrea Verano
2ecc835438 Italian Translation Update (#5914)
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes

Fixed some strings in:
-Medical
-Scopes
2017-12-14 23:32:51 -06:00
Christian Klemm
d83ce62ee8 Adjusted dig surface whitelist for jungle maps (#5897)
* Added grasstall to dig surface whitelist

* Added forest to dig surface whitelist
2017-12-12 17:20:55 +01:00
classic
51f29b7b37 Update Japanese translation (#5891)
* Update Jpn translation

* Update Jpn translation

* Add Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn tranlastion

* Update Jpn tranlation

* Update Jpn translation

* Updatr Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* fix for incorrect indentation

* re-fix incorrect indentation
2017-12-12 17:17:51 +01:00
PabstMirror
2aaef9e791
Fix some undefined funcs / strings (#5889)
* fix missing respawn func / spectator string

* fix readSettingsFromParamsArray, cleanup spec event

* cleanup usless if statement
2017-12-11 13:10:30 -06:00
PabstMirror
be67cf0737
Transfer old client settings to CBA (#5882)
* Transfer old client settings to CBA

* Remove cleanup code
2017-12-10 12:13:17 -06:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear (#5876)
* Add note to enum script error

* Bump Arma/CBA versions

* req 1.78
2017-12-08 21:39:35 -06:00
Dedmen Miller
18d4b9660d Add endRadioTransmissions Event (#5873)
* Add endRadioTransmissions Event

* Update fnc_endRadioTransmission.sqf
2017-12-08 10:44:24 -06:00
commy2
44912253af
Merge pull request #5864 from acemod/avoid-setCaptive
replace usage of setCaptive with camouflageCoef trait
2017-12-07 23:08:37 +01:00
commy2
24214fc576 Add zeus-like compass control to common (#5860) 2017-12-07 21:51:57 +00:00
PabstMirror
6a6b03eb57 Fix undefined var 2017-12-07 12:45:59 -06:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive 2017-12-07 19:11:09 +01:00
Dystopian
36b61fdb6e Block adv. throwing when player is busy (#5534)
* Add throw blocking status effect

* Add concertina_wire and tripod support

* Add launcher in hands support

* Disable effect sending more than once

* Fix EFUNC using, add trace

* Disable vanilla throw blocking

* Improve status handling

* Fix rearm status key
2017-12-07 11:26:21 -06:00
Josuan Albin
2bde515aaa Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons

* Add CBA settings for camera control

* Merge the 2 inverted settings into one

There's no man crazy enough to need one inverted and the other normal

* Add back missing newline

* Change rscCommon, don't redefine base classes

* Change anim to "civil" when not in a weapon or special tab

* Fix current handgun ending up in launchers tab and vice versa

* Change back virtualItems first index to primary secondary handgun

* Add ace_arsenal_hide config check and config entry

* Add dogtags handling in postInit

* Add CBA setting for fontHeight for left and right panel

* magazineGroups

* Add base layout for loadouts GUI

* Prepare the SQF base for the loadouts display

* Continue laying the base for the SQF of the loadouts display

* Add CBA settings for the loadouts display

* Implement button logic for loadouts display

* Finish button logic, start adding filling and button funcs

* Add editBox for loadout names

* Add loadout saving and deleting

* Add loadouts loading

* Add select current after list is refreshed after saving

* Redo button layout, Add rename button, Add messages

* Add double click loading

* Fix loadout deleting not triggering curSel change

* Keep cursor at same index when deleting loadouts

Woops

* Reload pictures when saving over old loadout

* Fix loadout save not updating the pictures properly (again)

* Add close button for loadouts dialog

* Fix weight not updating when using arrows to add / remove items

* Make the arsenal layout a bit prettier

* Start adding non available items and missing mods for loadouts

* Remove useless lines in fillLoadouts

* Move buttonHide above panel fill in loadoutsClose

* Change the way weapons are checked in fillLoadoutsList

* Add weapon in container support for fillLoadoutsList

* Add mag in container check for fillLoadoutsList

* Add item check for containers in fillLoadoutsList

* Fix item duplication when loadout loadouts

* Switch anim to civil for the rest of the tabs that need it

* Make extra sure item duplication won't happen

* Fix right panel hiding issues

* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab

* Fix initBox erroring out if the object is null

* Move loadout checking to it's own func

* Force panel reload every time loadoutList change

I'm forced to do this, I can't save arrays in listnboxes

* Change how loadouts are retrived from the listnbox

* Fix save overwriting existing loadout not updating right row

* Fix indentation in buttonLoadoutsSave

* Fix reserved var error

* Fix fillLoadoutlist tab check

* Fix accessories in containers not being checked properly via verifyLoadout

* Fix binos not being detected properly by verifyLoadout

* Fix pre-filled backpacks not behaving properly

* Add mine detector check in configScan and onArsenalOpen

* Add extra traces

* Add mine detector check in non cached part of addVirtualItems

* Move right panel greying to it's own func

* Fix right panel listnbox for items with mass under 1

* Redo unique items sorting in onArsenalOpen

* Add loadoutSaved EH, handle empty name box for loadout saving

* Reapply inisgnia after loadout is loaded

* Change LoadoutSaved to loadoutSaved

* Rename savedLoadout to onLoadoutSave

* Change buttonLoadoutsSave layout to prepare base weapon saving

* Save base class for weapons when saving loadouts

* Remove unused profiling code related code

* Add not implemented warning messages for export and import

* Fix error when saving with a container or weapon slot being empty

* Remove dogtags from loadout upon loadout saving

* Change how misc item mass is retrieved

* Remove vanilla "NoVoice" from voices to avoid an error related to it

* Use tolower for currentData and itemsToCheck in fillLeftPanel

Avoid camelCase issues with the commands that don't fucking respect it.

* Remove redundant check in postInit

* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic

* Prepare sharedLoadouts addition

* Add loadout sharing

* Add proper saving and loading for shared loadouts

* Change loadout deleted / unshared EH name, add said EH to unsharing

* Remove shared loadouts from disconnected players

* Fix error in buttonLoadoutsSave, add row when other share a loadout

* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText

* Add data when adding a new row via CBA EH

* Remove mode, add arg to openBox to have arsenal prefilled

* Cleanup buttonClearAll code

* Fix itemInfo behavior when switching between items that don't have logos

Fix #23

* Add copy paste and arrow key support for searchbars

Close #22

* Add back newline at EOF for onKeyDown

* Change default camera setting from non inverted to inverted

* Fix import and export "not implemented" message

* Rename share button to Unshare when loadout selected is shared

* Improve missing items logging, cache verifyLoadout check

* Remove unused var

* Add full 3DEN support

* Remove 3DEN sphere and grid, set helper center dir properly

* Change 3DEN lightsource intensity

* Save 3DEN inventory properly

* Rewrite onArsenalClose 3DEN comment

* Fix sharedLoadouts check

* Add 3DEN support for defaultTab

* Add new event for 3rd parties in buttonCargo

* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox

* Fix defaultLoadout save button

* Remove unallowed command

* Fix arsenal messages not working in 3DEN

* Add export current loadout, Add export defaultLoadoutsList

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Add import button functionality

* Change export / import messages

* Change message to use scheduled only

* Attempt to sanitize data in import func

* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check

* Replace 2 last traces in verifyLoadout

* Change defaultLoadoutsList export format and add a 3DEN check for it's default value

* Fix original array being modified in fillLoadoutsList

* Improve shared loadout check

* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox

* Add zeus support for arsenal rewrite, fix openBox camera check

* Add isPlayer check to arsenal rewrite part of bi module

Arsenal rewrite does not seem to work on remote players, welp, I tried at least

* Fix shared loadouts loadout index being null

Forgot to change that one getVar

* Hide shared column if sharing is disabled on My loadouts tab

* Remove trace from loadoutsLoad, add trace to shared and unshared EHs

* Fix postInit trace

* Fix sharing EHs being broken, remove traces in them, prevent possible issue

yeah, _x params doesn't work there :p

* Fix fillLoadoutsList error

* Start translating and code reviewing

* Add editing vehicle crew loadout support for arsenal

* Move left panel filling above 3DEN handling to avoid float crew members

* Fix onArsenalClose EOF, add header for it

* Move onButton EHs to config, remove placeholder stats func

* Add headers for onLoadouts funcs and verifyLoadout

* Clean up buttonClearAll

* Fix assigned items not being added properly to currentItems on loadout load

* Add more function headers

* Make rename work in default loadouts tab in 3DEN

* Add more functions headers, continue code review

* Add more functions headers, finish code review

* Fix loadout saving to profile from an other tab than my loadouts

* Fix loadout saving even more

* Attempt to fix loadouts handling

From totally broken to somewhat usable.

* Even more fixing

* Add back onLoadoutSave EH

* Add back author message in loadoutSave

* Add back EOF newline

* Add back loadout caching

* Remove unique items from saved and loaded loadouts

* Add unique item support for the remaining container tabs

* Fix mag check for magazine type in container

* Add support for CfgVehicles and CfgGlasses in miscItems

* Add button highlighting for loadouts display, fix mag put and throw check

* Change shared column to show a proper icon

* Revert "Move onButton EHs to config, remove placeholder stats func"

This reverts commit 1be5d92426.

* Add back EOL newline in prep, remove stats placeholder again

* Add part of the german translation

* Add more translations, change how shared button text is managed

* Add scheduled check in openBox to avoid issues with people using addaction

Because you know they will.

* Add translations for import and export messages

* Fix comms tab defaulting to empty

* Align buttons perfectly for loadouts display, translation for delete action

* Add loadout saved translations

* Add load and rename messages translations

* localized interaction name in initBox

* Fix issue when admins deleted a loadout didn't change the icon status for authors

* Fix loadout import, update unique items list after import / loadout load

* Beautify UI a bit

* Add setting to toggle missing / unavailable items RPT logging

* Add settings strings

* Increase button size for main display

* Change DLC logo side in infoBox

* Change loadouts display buttons spacing, change deleteLoadout button active color

* Remove camera rotation limit

* Add polish translation

* German translation by @bux

* Order

* Fix typo in buttonExport, add credits in handleMouse

* Fix right panel item count not updating properly in certain scenarios

* Add loadoutName check when importing default loadouts, change assignedItems check

* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar

* Fix syntax check in removeVirtualItems count

* Shorten onSelChangedRightListnbox by improving current tab check

* Improve fillLeftPanel weapon tab filling

* Move lnbSetPicture occurences for the loadouts display to a define

* scan config opti

* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab

* Fix sharing and RPT logging settings having the same var

* Add newline at EOF for funcs that are missing it

* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace

* newline eof

commy contributed too!

* Fix delete button not working as intended in public tab

* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig

* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"

This reverts commit 496e6f8223.

* Add new Cfg entry for handling unique items saving, add entry to chemlight shields

* Fix currentMag tab not detecting current mag properly (still experimental)

* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques

* Change how the right panel first update works

* Fix updateRightPanel very obscure bug and header typo

* Move postInit EHs for medical and dogtags to their respective postInit

* Fix medical postInit typo

* Add currentMag tabs for primary and secondary muzzles properly

* Fix container compatible mags tab not showing anything

* Replace an inline if to select in fillRightPanel

* Attempt to fix accs recognition when switching weapons

* Improve currentMag2 tab show / hide logic

Secondary and handguns can't have a secondary mauzzle

* Add strings for currentMag and currentMag2 tabs

* Readd strings that tabler accidentally removed

* Make sorting for the right panel stay the same when switching items / tabs

* Replace bis_fnc_addWeapon by the addWeapon command

bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems

* Replace BIS_fnc_overviewAuthor in itemInfo

It works better

* Display itemInfo box properly for currentMag1 and 2 tabs

* Don't reset arsenal vision mode after quitting arsenal

* Improve showItem

* Remove trace from showItem

* Move getWeight and weight string from movement to common

* Fix typos in addVirtualItems

* Comment back compile cache for common

(Not yet for arsenal, not until it's validated for a merge)

* Replace secondaryMuzzleMag tab icon by @Max255PL 's

* Update @Max255PL 's icon

* Add missing author strings

* Add debug trace for a specific issue

* Add more traces in loadoutsSave

* Fix bug in loadoutsSave, remove debug traces

* Fix typo in loadoutsSave

* Fix uniqueBase cfg check for all cases in loadoutsSave

* Improve whitelisting for current weapon accs and mags

* Update CBA settings strings, change RPT logging to be turned off by default

* Update polish translation by @max255PL

* Fix saving loadouts when no loadout has ever been saved

* Make loadout screen lighter

* Save camera position and view mode for ace arsenal

* Improve loadouts screen presentation

* Improve loadouts screen readability

* Improve camera angle in loadout screen

* Improve loadout renaming, Fix bug linked to renaming

* Fix wrong loadout being used while renaming and color not being reapplied

* Fix other possible issue with renaming

* Change missing items color to be more colorblind friendly

* Fix typo and improve return check in getWeight

* Disable debug and re-enable compile cache for common and arsenal

* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 08:48:10 +01:00
PabstMirror
4b42eb4385
ST Nightvision Effects (#4694)
* Merge ST Nightvision

* Cleanup

* Header cleanup

* Add ace setting for fog

* Cleanup debug

* Manual merge refuel changes

* Add new setting for effect scaling

* Cleanup

* Use ace_common_fnc_getZoom

* Fix compat inheritance changes

* Fix stringtable

* Add category

* Tidy function headers

* Replace global event with remote event
2017-12-06 13:15:33 -06:00
commy2
eba99f4707 only use for medical, keep setCaptive for captives 2017-12-06 17:22:07 +01:00
commy2
1890c71c65 replace usage of setCaptive with camouflageCoef trait 2017-12-06 16:55:01 +01:00
Dystopian
0d69f6ac67 Add persistent laserpointer (#5821)
* Add persistent laser

* Fix init in favour of CBA Settings one
2017-12-03 07:22:49 +01:00
classic
504d54461e Update Japanese translations (#5831)
* Update Japanese translation for captives

* Update Jpn translation for common

* Update Jpn translation for cookoff

* Update Jpn translation for finger

* Update Jpn translation for googles

* Update Jpn translation for hitreactions

* Update Jpn translation for interaction

* Update Jpn translation for magazinerepack

* Update Jpn translation for mk6mortar

* Update Jpn translation for noradio

* Update Jpn translation for overheating

* Update Jpn translation for pylons

* Update Jpn translation for rearm

* Update Jpn translation for respawn

* Update Jpn translation for scopes

* Update Jpn translation for spectator

* Update Jpn translation for switchunits

* Update Jpn translation for vehiclelock

* Update Jpn translation for weaponselect

* Update Jpn translation for weather

* Update Jpn translation for zeus

* Update Jpn translation for reloadlaunchers

* fix the tag
2017-11-30 16:52:27 -06:00
Dystopian
fc8a70872f Lock object while loading to cargo + disable disassembling (#5624) 2017-11-29 14:07:30 -06:00
Dystopian
64384280d0 Fix repair sound (#5706)
* Fix repair sound

* tabs
2017-11-29 13:36:48 -06:00
rufix
6b0ee1de09 Better readability. 2017-11-29 20:00:51 +01:00
rufix
d6af0ea0eb Replace tabs with spaces. 2017-11-29 19:27:51 +01:00
rufix
e1f919303b Fix typo. 2017-11-29 19:06:00 +01:00
rufix
8021ce4215 New function "setAimCoef" at common, change ace_advanced_fatigue_fnc_handleEffects to use new function instead of setCustomAimCoef 2017-11-29 18:09:05 +01:00
Dystopian
eab909e60e Unify settings and keybinds categories (#5815) 2017-11-28 13:32:51 -06:00
Dystopian
d0f256699e Get compile cache back (#5820) 2017-11-25 14:42:04 +01:00
God of Monkeys
257bde4eef Update Chinese stringtable (#5786) 2017-11-17 10:18:54 -06:00
Andrea Verano
4d24840181 Italian Translation Update (#5779)
Added new strings in:
-captives
-common
-cookoff
-finger
-goggles
-hitreactions
-interaction
-magazinerepack
-mk6mortar
-noradio
-overheating
-rearm
-respawn
-scopes
-spectator
-switchunits
-vehiclelock
-weather
-zeus

Fixed some strings in:
-goggles
-magazinerepack
-nightvision
-sandbag
-switchunits
-trenches
-vehiclelock
-weather
2017-11-16 23:35:49 -06:00
ulteq
9d383d5add
Settings - Added more categories (#5771) 2017-11-15 20:10:20 +01:00
PabstMirror
d1f6b0a9d8 Add support for custom slider settings using ace_settings config (#5750) 2017-11-13 10:27:09 +01:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
commy2
568ef50c02 simplify some code (#5727) 2017-11-04 11:05:33 -05:00
PabstMirror
5c4dbdcbda Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_adjustPainLevel.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/stringtable.xml
	addons/medical_ai/functions/fnc_healUnit.sqf
	addons/medical_ai/functions/fnc_isInjured.sqf
	addons/medical_menu/functions/fnc_handleUI_DisplayOptions.sqf
2017-10-24 16:13:12 -05:00
Daniel Jupp
c34b1e1376 Disabled Debug Define (#5645) 2017-10-20 22:46:51 +02:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
Ozan Eğitmen
1b86063ade Add Pylons Component (#5517)
* Initial commit

* Change order

* ace-ify functions

* Add function headers, tweak onPylonMirror function

* Finish localization

* Fix trivial idc collision

* Styling

* Add self as author

* Add interaction for the dialog

* Add settings to enable menu and change behaviour

* Add strings

* Move changes into pylons component

* Progress

* Only one function left!

* Fix issues with overlapping players, Use LINKFUNC

* Add progress bar

* I need to switch branches

* Remove old pylon weapons from aircraft

* Explicitly set new pylon's ammo to 0

* Replace magic numbers with ID list

* Align controls properly

* Remove space before eol

* Add ability to add/remove FRIES

* 🐛 Whoops

* Fix logic errors

* Value of 1 means helicopter has built-in FRIES

* Add pilot/gunner switch button

Working on those buttons also helped me improve both the static and
on-the-fly (pun intended) parts of the dialog.

* Add quick zeus module

* Add a way to retrieve scripted pylon turrets

Not entirely reliable, but if used in both rearm and pylons, missions
that only use ace will work perfectly.

* Use getNumber default

* Use common's getPylonTurret

* Make dialog close on apply for zeus

* Handle UI Scaling better

* Prevent progressBar from failing in zeus

* Remove unnecessary stringtable key
2017-10-11 14:05:54 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
PabstMirror
af48c6a86c Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical_treatment/functions/fnc_actionLoadUnit.sqf
2017-10-02 22:29:30 -05:00
jonpas
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521)
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Ozan Eğitmen
45a66ccfa1 Medical & Captive Load Menu Overhaul (#5519)
* Add load in child actions to medical & captive

* Add actions with proper structure

* Move vehicles actions code to common function

* Simplify code in config, Fix docs

* Remove unused vars

* Fix header example

* Add _distance param to fnc_nearestVehiclesFreeSeat

* Change docs

* Fix spacing
2017-09-29 22:00:47 +02:00
classic
9dfc76b6d5 Update the Japanese translation (#5565)
* Update the Jpn translation

following to official localization.

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

added more natural words and fix miss translation.

* Update the Jpn translation

fixed for miss translation.

* Update the Jpn translation

just tweaks

* Update the Jpn translation

added to new entry. fixed or tweaked to few entry.

* Update the Jpn translation

added the jpn translation to new entry

* Update the Jpn translation

Added the Jpn translation to new entry.

* Update the Jpn translation

tweak to jpn translation

* Update the Jpn translation

following to official Japanese localization

* Update the Jpn translation

support to new entrys and few fix

* Update the Jpn translation

just tweaks to few entrys
2017-09-28 16:04:24 +02:00
PabstMirror
80e5088013 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/stringtable.xml
2017-09-27 15:48:22 -05:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
jonpas
430c136a61 Deprecate isUnderwater (replaced by underwater command from 1.66) (#5560) 2017-09-26 19:35:00 -05:00
PabstMirror
75e58a8dce Fix unloading unconscious unit 2017-09-26 17:45:10 -05:00
PabstMirror
30fcbb66ae Add ace_common_fnc_getPylonTurret func (#5548)
* Add getPylonTurret function

* cleanup

* debug

* Fix
2017-09-26 21:47:13 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
PabstMirror
ddf72d5878 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
Josuan Albin
1ba330e853 Add toggle flashlight and NVG zeus modules (#4556)
* Add toggle flashlight and NVG modules

* Remove excessive spaces in moduleToggleNvg

* Fix indentation and typos to fit review

* Add an option to add gear, fix headers

* Change category to utility

* Add QOL improvement suggested by pabst

* Fix locality issues

* Remove locality check before enableFlashlight targetEvent

* Remove locality check before addWeaponItem targetEvent

* Add a player check in moduleToggleNVG, change modules category

* Add the same QOL in toggleNVG than in toggleFlashlight
2017-09-21 20:43:35 +02:00
Ozan Eğitmen
90f92db01d Replace UI icons with vanilla/common ones (#5532)
Also removes some _very_ old paa files that belong to AGM/CSE
2017-09-21 16:22:28 +02:00
PabstMirror
30a8d2db7b Use CBA Misc Items (#5502)
* Use CBA Misc Items

* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
jonpas
170cd8e5de Remove deprecated stringRemoveWhitespace (#5483) 2017-09-07 20:12:47 +02:00
Vdauphin
5ca113d0ba FIX: ace_common_fnc_loadPerson don't detect taru with place for crew (#5464)
When you load somebody inside a vehicle the ace_common_fnc_loadPerson is
used. This fonction acutually search nearestObjects of type ["Car",
"Air", "Tank", "Ship_F"] to put player inside. Infortunatly, the taru
family with crew place (exemple
:"Land_Pod_Heli_Transport_04_medevac_black_F") are not detected because
the corresponding parent class of
"Land_Pod_Heli_Transport_04_medevac_black_F" is :
["Land_Pod_Heli_Transport_04_medevac_F","Pod_Heli_Transport_04_crewed_base_F","StaticWeapon","LandVehicle","Land","AllVehicles","All"].
To avoid this, the "Pod_Heli_Transport_04_crewed_base_F" parent class
should also be search by nearestobjects.
2017-08-28 22:51:03 -05:00
PabstMirror
eb18d23181 Allow digging in malden grass (#5453) 2017-08-24 15:00:25 -05:00
PabstMirror
52915e1104 Common func to run config tests (#5170)
* Common func to run config tests

* Add map config testing, malden data and reverse map config's latitude

* Headers

* Simplify config levels

* Header

* fix example
2017-08-22 16:21:41 -05:00
PabstMirror
74fd0f507f Add EH for UAV control, Add Hellfire support (#5305)
* Add EH for UAV control, Add Hellfire support

* cycle guidance keybind

* Handle broken PlayerViewChanged

* humps

* UAV Self-interactions (#5379)

* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
2017-08-22 16:07:45 -05:00
PabstMirror
a67815d072 Disable damage on cars loaded as cargo (#5402) 2017-08-22 13:27:11 -05:00
PabstMirror
accaf9fd01 Compatibility with newest mikro tools (#5442)
* Compatibility with newest mikro tools

- Remove all use of `access` in configs
- Add skeleton cfg for rtms
- Remove use of `-L` in makePbo for non-bin

* Tabs in model.cfg
2017-08-22 12:53:58 -05:00
SilentSpike
d3ce75daef Spectator overhaul (#5171)
- Overhauls the spectator module entirely to share a similar UX to BI's "End Game Spectator" while maintaining some of the extended flexibility of ACE Spectator.
- Simplifies spectator setup by reducing the number of settings. More advanced setup is still possible via the API functions provided.
2017-08-12 14:25:48 +01:00
Dystopian
dd3a66a643 Fix adv. throw key handling when reloading (#5336)
* Fix throw key handling when reloading

* Consider UGL reload to ace_common_isReloading var

* Fix if space, change private var assign

* Shorten UGL check
2017-07-10 21:44:02 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
Fishy
b84aec3051 Update fnc_setHearingCapability.sqf 2017-06-29 15:04:32 +01:00
Fishy
ea22ebdf09 Update XEH_preInit.sqf 2017-06-29 15:03:53 +01:00
PabstMirror
d02dacf613 Refuel - change nozzle position calc (#5279) 2017-06-22 22:58:57 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
PabstMirror
c6e70a4e88 Add malden to getMapData (#5297)
* Add malden to getMapData

* Merge with CWR2 malden
2017-06-21 19:40:17 +02:00
PabstMirror
ffe31d9759 Fix isFeatureCameraActive (#5291) 2017-06-21 15:34:10 +02:00
Glowbal
ba05b74fd2 Merge branch 'release' 2017-06-20 20:19:29 +02:00
PabstMirror
bec55114fa Add load,unload and radial actions (#5270)
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
2017-06-15 14:35:33 -05:00
Laid3acK
3034212701 gos ndjenahoud latitude (#5275) 2017-06-13 23:15:34 -05:00
Moritz Schmidt
e770f669b6 Fix isFeatureCameraActive for Spectator enhacements (#5269)
* fix isFeatureCameraActive for spec 

ace_spectator_camera was removed in 77c2b99ee5 .
spectator module initializes three separate cameras instead, of which for example ace_spectator_freeCamera can be used to check if spec mode is active

* use ace_spectator_isSet to check for spec mode
2017-06-13 13:53:41 +02:00
PabstMirror
356a8f640a Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
PabstMirror
d1f4b90714 Fix minor debug that got left in (#5260) 2017-06-08 11:55:19 -05:00
PabstMirror
f35f80ee82 Rearm - Pylon Support and Dynamically Add Supply Actions (#5183)
* Dynamic Add

* Support 1.70 Pylon Loadouts

* Properly handle old compat pbos - Update RHS Compat

* Re-add documentation

* cleanup headers (note from other pr)

* Cleanup

* Fix var spelling
2017-06-08 11:47:52 -05:00
PabstMirror
1be9e7ca30 Merge pull request #5182 from acemod/GitHawk-rearm_supply
Rearm - Limited Supply (Fix Merge Conflcits)
2017-06-08 11:45:12 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
Andrea Verano
0affa14a1b Italian Translation Update (#5243)
Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus
2017-06-03 22:27:51 -05:00
PabstMirror
ddccfe563b Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
PabstMirror
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176)
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
SilentSpike
2ca3716277 Fix Zeus teleport players module (#5175)
* Add dummy function to zeus UI modules

This removes the message about the module having no function when in SP.

* Fix zeus teleport module for non-local units

BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
2017-05-26 16:07:33 +01:00
PabstMirror
114f402c58 Merge branch 'master' into medical-rewrite 2017-05-23 13:44:57 -05:00
PabstMirror
d4a6caf2b1 Just warn for old compat pbos (#5177)
* Just warn for old compat pbos

* Use CBA_fnc_error big warning box

* fix caps
2017-05-22 13:19:43 -05:00
PabstMirror
b192be0b70 Fix merge, cbaEvents, macros, cleanup 2017-05-18 12:42:02 -05:00
PabstMirror
46c041e6bc Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply
Conflicts:
	addons/attach/functions/fnc_getChildrenAttachActions.sqf
	addons/common/functions/fnc_dumpArray.sqf
	addons/common/functions/fnc_removeAllEventHandlers.sqf
	addons/common/functions/fnc_removeEventHandler.sqf
	addons/common/functions/fnc_serverEvent.sqf
	addons/common/functions/fnc_waitUntilAndExecute.sqf
	addons/explosives/functions/fnc_scriptedExplosive.sqf
	addons/finger/config.cpp
	addons/frag/config.cpp
	addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
	addons/laser/functions/fnc_laserOn.sqf
	addons/laser/functions/fnc_seekerFindLaserSpot.sqf
	addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
	addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
	addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
	addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
	addons/main/config.cpp
	addons/main/script_mod.hpp
	addons/map/functions/fnc_flashlightGlow.sqf
	addons/maptools/functions/fnc_addLineMarker.sqf
	addons/maptools/functions/fnc_canDraw.sqf
	addons/maptools/functions/fnc_cancelDrawing.sqf
	addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
	addons/maptools/functions/fnc_copyMapRemoteSend.sqf
	addons/maptools/functions/fnc_copyMapStart.sqf
	addons/maptools/functions/fnc_handleKeyDown.sqf
	addons/maptools/functions/fnc_handleMouseZChanged.sqf
	addons/maptools/functions/fnc_removeLineMarker.sqf
	addons/maptools/functions/fnc_updateLineMarker.sqf
	addons/missileguidance/functions/fnc_checkLos.sqf
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
	addons/overheating/CfgWeapons.hpp
	addons/overheating/functions/fnc_swapBarrelCallback.sqf
	addons/rearm/XEH_postInit.sqf
	addons/rearm/XEH_respawn.sqf
	addons/rearm/functions/fnc_canRearm.sqf
	addons/rearm/functions/fnc_dropAmmo.sqf
	addons/rearm/functions/fnc_getMaxMagazines.sqf
	addons/rearm/functions/fnc_grabAmmo.sqf
	addons/rearm/functions/fnc_pickUpAmmo.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
	addons/rearm/functions/fnc_rearmSuccess.sqf
	addons/rearm/functions/fnc_rearmSuccessLocal.sqf
	addons/rearm/functions/fnc_storeAmmo.sqf
	addons/repair/functions/fnc_useItem.sqf
	addons/tagging/CfgVehicles.hpp
	addons/ui/ACE_UI.hpp
	optionals/tracers/config.cpp
2017-05-17 18:21:11 -05:00
PabstMirror
1aebae32c5 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
2017-05-14 14:50:36 -05:00
PabstMirror
bfd3695868 SQF Lint Cleanup Pass (#5157)
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
2017-05-14 14:48:05 -05:00
Laid3acK
457461efbe AB: Lythium latitude (#5109)
* Update fnc_getMapData.sqf

* bump1

* bump2
2017-05-10 19:28:05 +02:00
PabstMirror
31a81c4407 Merge branch 'master' into medical-rewrite 2017-05-06 12:01:58 -05:00
classic
777d0e6fb0 Improve Japanese translation (#5133)
* Add the Japanese translation for cargo

Add the Japanese translation for cargo, fix to html tag and few improvement

* fix the Japanese transltion

Fix the Japanese translation for attach. it was used wrong html tag.

* changed The Japanese translation

Changed the Japanese translation of azimuth angle

* fix The Japanese translation

Fix the Japanese translation for chemlights. it was used wrong html tag.

* fix The Japanese translation

Fix the Japanese translation for laserpointer. it was used wrong html tag.

* Fix the Japanese translation

Fix the Japanese translation for medical_blood. it was used wrong translation.

* Fix the Japanese translation

Fix the Japanese translation for rearm. it was used wrong translation.

* add The Japanese translation

add The Japanese translation to new words

* Improve The Japanese translation

Improve, fix and change The Japanese translation

* minor fix to Japanese translation

minor fix to Japanese translation. see b1b07c5
2017-05-06 12:01:31 -05:00
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
PabstMirror
d93269304d Merge branch 'master' into medical-rewrite 2017-04-15 10:09:50 -05:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988)
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
2017-04-11 10:06:29 -05:00
PabstMirror
fb73286242 Tweak overheating (#4969)
* Tweak overheating

* Add define for constant magic num
2017-04-11 10:04:57 -05:00
jonpas
fd139abb42 Use setShotParents in Advanced Throwing (#5052)
* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)
2017-04-11 16:59:32 +02:00
Zakant
466bdce9e4 Removing point 2017-03-23 18:45:46 +01:00
Zakant
89cf679af3 Replaces return by 2017-03-23 17:26:16 +01:00
PabstMirror
672be73bae Merge branch 'master' into medical-rewrite
Conflicts:
    addons/medical/XEH_preInit.sqf
2017-03-18 09:09:45 -05:00
jonpas
b31abee4fd Sandbags surfaces update (#4971)
* Use private keyword, move surface blacklist to script_component.hpp

* Check height above terrain

* Add Tanoa surfaces, Check if in water

* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)

* Re-enable compile cache

* Revert to surface blacklist with dust as fallback

* Move surface blacklist to script_component because SQF validator complains
2017-03-15 10:11:37 -05:00
PabstMirror
0841c05a6d Cleanup use of ACE_HashLocation (#4975) 2017-03-08 10:15:15 +01:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
J3aLeiNe
6ce9ede1b5 Update maps' latitude (#4961)
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
2017-03-02 14:00:18 -06:00
PabstMirror
02ea214ade Fix setVariablePublic reseting to old values (#4938)
* Fix setVariablePublic reseting to old values

* Don't drop delay time
2017-02-24 19:19:39 -06:00
PabstMirror
c7b60d1777 Merge branch 'master' into medical-rewrite 2017-02-18 18:17:37 -06:00
PabstMirror
159e762576 Handle changes to CBA_fnc_addPlayerEventHandler (#4878)
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
2017-02-10 13:03:12 -06:00
ViperMaul
ad2e3719b4 Adding Normal to Common stringtable 2017-01-19 17:31:29 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
J3aLeiNe
2dcd79fd1d Update MapData (#4786)
* Update Map data

 - Add IFA3LITE maps
 - Add CSA38 map
 - Add Beketov map
 - Add Winter Panthera map
 - Add Nam and Mogadishu maps
 - Add Uhao island map

* Update fnc_getMapData.sqf

 - Add X-Cam-Taunus map
 - Add Unsung 3.1 Delta maps
2017-01-02 21:32:58 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794)
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
2017-01-02 17:52:01 -06:00
PabstMirror
c22fce273f Overpressure changes (#4770)
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
2016-12-22 13:29:05 -06:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
b4315b6a65 Javelin overhaul (#4580)
* Javelin overhaul

* header spelling fix
2016-11-15 12:15:25 -06:00
PabstMirror
aeb0614e7e Cleanup map gesture sync / color mapping (#4486)
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
2016-10-27 19:54:58 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
0f43829b63 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-10 14:29:50 +02:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308)
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
853c7db1dc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-10-06 10:20:10 +02:00
PabstMirror
dfa09d3161 Functions to perform arithmetic ops on sets (#4514)
* Functions to perform arithmetic ops on a set

* fix spelling
2016-10-06 10:18:14 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
2e147b37f0 fix formating of CBA version check (#4511) 2016-10-05 13:06:21 -05:00
PabstMirror
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
a54aec72bc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-30 21:19:16 +02:00
PabstMirror
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -05:00
jonpas
8458cb2339 Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222)
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's

* Use QFUNC

* Bump required CBA version

* Change remove version to 3.110.0
2016-09-30 15:51:03 +02:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
jonpas
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
5453b15dd8 translate common 2016-09-28 01:11:27 +09:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
commy2
c1ead851cb Add 3den attribute to disable bft (#4452)
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
PabstMirror
58bd6467b2 Debugging tool to watch variables on main display (#4408)
* Debugging tool to watch variables on main display

* Fix error when called from scheduled code

* Remove demo code
2016-09-20 12:18:44 -05:00
classicarma
e767d65cfb translate common 2016-09-17 00:57:27 +09:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
commy2
f76457f48f convert log macros to cba versions 2016-08-22 21:06:52 +02:00
Glowbal
1f8f463f32 Merge pull request #4267 from acemod/fix-object-event
fix FUNC(objectEvent)
2016-08-20 11:49:53 +02:00
commy2
1c6825bcab skip DLL check on non-windows machines, close #4253 2016-08-19 16:01:59 +02:00
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
Lukas
84a370d0f2 Czech translation (#4241) 2016-08-13 15:44:48 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
commy2
36e78e0722 Merge pull request #4171 from acemod/cleanup-hash
deprecate ACE hash functions in favor of CBA versions
2016-08-09 18:25:01 +02:00
commy2
83f32ebc29 Merge pull request #4170 from acemod/cleanup-missionSQM
remove some broken functions
2016-08-09 18:24:52 +02:00
commy2
439a85924c Merge pull request #4188 from acemod/cba-hash-synchedEvent
Convert common to CBA hashes
2016-08-09 18:24:27 +02:00
jonpas
91128729ba Improve stringRemoveWhitespace function header 2016-08-08 23:08:39 +02:00
commy2
b059217f4d fix-inverted-logic 2016-07-30 12:35:10 +02:00
commy2
5a1b33a5da convert common to cba hashes 2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3 remove deprecated functions 2016-07-30 11:16:19 +02:00
commy2
c9a8e0a892 deprecate ACE hash functions in favor of CBA versions 2016-07-30 10:54:01 +02:00
Glowbal
d9112fb07e Merge pull request #4175 from acemod/remove-obsolete-pickup-fix
reenable pickup action, because related bug has been fixed
2016-07-28 23:47:07 +02:00
commy2
5711a863c6 reenable pickup action, because related bug has been fixed 2016-07-26 19:07:31 +02:00
commy2
37d4a4a0c3 deprecate sort function 2016-07-25 20:00:41 +02:00
commy2
63b41843fc remove some broken functions 2016-07-25 19:43:42 +02:00
Glowbal
9d14121a9e Merge pull request #4096 from acemod/func-dogesture
use a function to do gestures
2016-07-14 01:38:18 +02:00
commy2
cc76ac482a add priority parameter to doGesture 2016-07-13 11:00:31 +02:00
commy2
404d5b49b4 add function to read vanilla keybinds 2016-07-13 10:40:28 +02:00
PabstMirror
a0aea441b4 Fix reload mutex with binocs or mounted
Fix #4088
2016-07-12 16:22:27 +02:00
commy2
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
jonpas
845dca9ea5 Add description and example to blur screen function 2016-07-12 16:13:53 +02:00
Glowbal
02f08939f2 Merge pull request #4052 from acemod/fix4049
Mine detector optimization and cleanup
2016-07-11 11:16:16 +02:00
commy2
c55c0d5666 only use one waitUntilAndExecute at any time for reload mutex 2016-07-08 15:12:47 +02:00
commy2
6569de5332 add event handler for reload mutex 2016-07-07 16:35:07 +02:00
commy2
2a84865302 add event handler for reload mutex 2016-07-07 15:47:37 +02:00
commy2
e39017e27a add reload mut ex as canInteractWith condition 2016-07-07 09:10:14 +02:00
esteldunedain
34654fffb7 Add function to allow using playSound3D on CfgSounds classes 2016-07-06 21:31:06 -03:00
Glowbal
1922cac79e fix spelling of arguments 2016-07-03 23:22:31 +02:00
PabstMirror
82f63b5935 Update showHud func for 1.62 (squad radar) 2016-07-03 12:17:42 -05:00
Glowbal
8f3907c03f Merge branch 'release' 2016-06-25 11:43:49 +02:00
J3aLeiNe
75396ce63e Update fnc_getMapData.sqf
No Gitexit for Lingor. Stay with us Lingor ! :p
2016-06-25 08:21:21 +02:00
J3aLeiNe
8e7282a46a Add OFP maps by CWR2 team
- Add OFP maps by CWR2 team included in the last CUP terrains update
 - Fix latitude according to the Bohemia Wiki
2016-06-24 19:47:44 +02:00
J3aLeiNe
6a92b43b1d Update fnc_getMapData.sqf
Add maps and fix latitude :
 - Kidal, latitude 18° (default latitude 0°)
 - Governor´s Island, latitude 41° (default latitude -34°)
 - Doung island (Unsung Mod), latitude 10° (default latitude -10°)
 - Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
 - Pecher map, latitude 43° (default latitude -34°)

Remove obsolete Arma2 Lingor map

and fix my illiterate mistakes ...
2016-06-22 16:36:53 +02:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2 Merge pull request #3973 from acemod/eventWrappers
Convert state checking to CBA playerEH
2016-06-22 10:53:47 +02:00
commy2
bd41260fa8 add a missing 'private' 2016-06-22 10:46:04 +02:00
PabstMirror
fad44e38a6 Convert state checking to CBA playerEH 2016-06-21 19:31:25 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
PabstMirror
fe5dd3fe76 Cleanup some undefined functions and strings 2016-06-20 13:58:37 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name
add 'name' to components
2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480'
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
2016-06-18 16:26:46 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
bux578
950cdb1ee3 fix missing values
was using an incomplete regex
2016-06-11 22:05:44 +02:00
PabstMirror
d57754a7cd Private/Formatting 2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c Fix alt/lat for maps not defined in getMapData 2016-06-11 14:32:36 -05:00
bux578
c268572649 add Tanoa mapData 2016-06-11 21:14:05 +02:00
bux578
18d864e950 split mapData into separate function 2016-06-11 21:13:51 +02:00
jonpas
f1ae73967d Normalize leftovers 2016-06-09 14:28:31 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
GitHawk
8e004741b9 Cleanup 2016-06-07 11:13:42 +02:00
Githawk
9cfa2f11d9 Stuff
Arguments, Return Value, (optional)
2016-06-06 20:42:20 +02:00
Githawk
ef4e232664 Merge remote-tracking branch 'master' into rearm_supply 2016-06-06 20:28:27 +02:00