Commit Graph

10878 Commits

Author SHA1 Message Date
Dystopian
e8c3be8016 Quick Mount - Add Get In and Change seat action menu (#5745)
* Add quickmount GetIn menu

* Add compartment support

* Check engine, check pilot, check static turret driver

* Add doc, condition, translation

* Add hybrid config entries, fix MP issue

* Optimize condition

* Ignore Enabled setting in vehicle

* Work around SQF validator macro issue

* Fix config macro entries

* Add workaround for getting damage when seat changing while moving

* Add setting for Get In menu disabling

* Fix race when 2 players try to get the same seat

* Convert if-else to switch

* Decrease move-back timeout to 0.5s

* Check if vehicle is flipped

* Add getin statement for parent menu

* Improve canShowFreeSeats

* Apply latest trends

* Improve fnc_addFreeSeatsActions

* Change copilot and gunless turret icons

* Fix macro name

* Fix FFV icon

* Optimize turret icon code

* Extend setting to 4 values

* Fix menu is shown when vehicle is full

* Optimize UAV checking code

* Fix bug with disabled FFV turrets

* Remove bugged FFV, Add turret locality check, Add Failed message

* Replace some macros with function

* Fix validator

* Remove global variables, Add debug
2018-11-18 22:33:50 -06:00
jonpas
5bfd64f066 Merge branch 'master' into armake 2018-11-18 20:23:50 +01:00
commy2
9a064ec9c7
Merge pull request #6684 from Cyruz143/fence_update
Logi Wire Cutter - Adding primary fence used on Sarahni
2018-11-18 08:27:59 +01:00
Cyruz143
621cd77025 Adding primary fence used on Sarahni 2018-11-18 01:13:21 +00:00
zharf
e00723039b Nametags - Adjustable colors settings (#6641)
* Move hard coded nametag team colors to settings

Also made the default colors lighter to make them easier to read

* Added myself to contributors

* Fixed Nametag to Name Tag

* Optimized array copying

* Moved team color settings to color subcategory and used vanilla localization strings

* Split a long line into a more readable multiline solution
2018-11-16 21:30:46 -06:00
BaerMitUmlaut
8119e87aa0 Fix wind roughness on airports (#6631) 2018-11-15 10:49:43 -06:00
jonpas
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
madpat3
b35d5c8295 Update script_component.hpp (#6678) 2018-11-14 10:36:37 -06:00
Dedmen Miller
efb53ed181 Arsenal - Add Night Vision support stat for scopes (#6671)
* Add Night Vision support Arsenal stat for scopes

* contrive correct configClasses camel case compliance

* Change priority
2018-11-14 10:36:10 -06:00
madpat3
8201a6bd08 Update script_component.hpp (#6677)
Wirecutters - Add compatibility with more fences from CUP
2018-11-13 17:06:40 -06:00
PabstMirror
64a06ddb07
Merge pull request #6674 from acemod/pr/6424
Rearm - Fix for 3den PR
2018-11-11 15:25:39 -06:00
diwako
3e5995ee3d Updated treatment time (#6670) 2018-11-11 12:25:29 -06:00
Dystopian
40f371c063 Interaction - Add condition to zeus actions (#6665)
* Add conditions to zeus actions

* Add condition caching
2018-11-11 11:26:36 -06:00
Josuan Albin
69a67ff4e2 Arsenal - Fix NVG overlay appearing in ace arsenal (#6673)
* Fix NVG overlay appearing in ace arsenal

* Change center to ACE_Player in nvg check to avoid edge case
2018-11-11 11:22:53 -06:00
Dystopian
32fc6bb437 Add possibility to create zeus during mission (#6203)
* Add possibility to create zeus during mission

* Use LLSTRING

* Allow deleting when setting is disabled

* Delete canCreate function

* Delete workaround for missed vehicles

* Revert "Delete workaround for missed vehicles"

This reverts commit e33102ee3c.
2018-11-10 14:33:20 -06:00
nomisum
ada07758c5 Explosives - Add Event for tripflare triggering (#6663)
* Add Event for tripflare triggering

_flare might be useful to delete / replace flare
_position is already available, so why not send it too

* added documentation

also added missing wirecutter event
2018-11-09 12:27:43 -06:00
Dystopian
86b4f08101 Fix CBA_fnc_getActiveFeatureCamera call (#6660) 2018-11-04 00:32:37 +01:00
commy2
b84b83ec7a add empty geometry to earplugs model (#6659) 2018-11-03 11:19:35 -05:00
PabstMirror
d5b3696c02 Fix -1//disabled and JIP issues 2018-11-02 16:56:16 -05:00
PabstMirror
0104030666
Add param for settings that require restart (#6512) 2018-11-02 12:58:57 -05:00
Brett
50d9fa4230 Zeus - Group Side Module: preserve group id and assigned team (#6569)
* Group Side - preserve group id and assigned team

* use findIf instead of breakOut
2018-11-02 12:36:20 -05:00
Dystopian
601b4c1e7b Add Smash Windshield action (#6152) 2018-11-02 12:32:04 -05:00
commy2
8541716bee Medical - optimize handle damage caching (#6657)
* optimize handle damage caching

* delete some rogue code

* it was 2 all along

* add calls
2018-11-01 13:05:56 -05:00
Josuan Albin
25b6e73985 Chemlight and IR strobe improvements (#6645)
* Make IR chemlight brighter

* Improve IR strobe light visibility

* Make chemlights more realistic

* Tweak IR strobe light to make it brighter

* Increase chemlight TTL to realistic durations

* Add blue and green hi chemlights, replace orange hi by orange utlra-hi

* Add ACE chemlights to 3DEN chemlight module

* Add zeus chemlight modules for ACE chemlights

* Add time to live stat for hand smokes and chemlights

* Add hi blue and hi green pictures by @Drofseh
2018-11-01 12:49:46 -05:00
mharis001
4c047702c8 Improve mouse hint (#6652) 2018-11-01 12:46:46 -05:00
Josuan Albin
328853e36b Fix mk6 mortar being reloadable via rearm when ammoHandling is enabled (#6648)
Rearm - Fix mk6 mortar being reloadable when ammoHandling is enabled
2018-10-28 16:14:11 -05:00
BaerMitUmlaut
a90dd7210e Safemode - Fix indicator when switching units (#6612)
* Fix safe mode indicator when switching units

* Use DIK macro instead of magic number
2018-10-27 15:13:40 -05:00
Josuan Albin
4d5f2d0de2 French translation (#6644)
* Add french strings for advanced fatigue, finger and rearm

* Add french strings for rearm, fix some of the old ones

* Add missing strings for ACE Nightvision

* Add missing strings for ACE Pylons

* Add missing string for ACE mk6 mortar

* Add / Fix french strings in ACE CookOff

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/pylons/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>
2018-10-27 15:10:45 -05:00
Josuan Albin
83ce5345da Make small UAVs battery life more realistic (#6647) 2018-10-26 16:15:37 +02:00
commy2
10468c6156
Merge pull request #6654 from acemod/noLaserLight
Common - disable light from green weap lasers
2018-10-26 15:10:35 +02:00
PabstMirror
b97ec2c8c8 Common - disable light from green weap lasers 2018-10-25 11:40:27 -05:00
Dystopian
1fe7c5c29c Map - Improve flashlight support (#6608)
* Improve flashlight support

* Speed up items check loop

* Speed up more

* Remove useless var
2018-10-25 11:39:27 -05:00
Josuan Albin
8580cb250a AI - Fix units not being removed from the garrison unitMove list consistently (#6651)
* Fix units not being removed from the garrison unitMove list consistently

Not sure how I missed that.

* fix whitespace

* Fix typo in unGarrison check

dedmen saw nothing :D
2018-10-24 12:55:12 -05:00
Josuan Albin
25f36d9340 Improve ai garrison pathing (#6649)
AI - Fix garrison pathing
2018-10-23 13:28:30 -05:00
Dedmen Miller
b8d4f981b2 Fix major typo in a popular Radio mod's name (#6650) 2018-10-23 13:23:10 -05:00
Dystopian
fefba89f19 Repair - Make eden attributes use config values as default (#6480)
* Make eden attributes use config values as default

* Simplify config with inheritance
2018-10-21 17:07:19 -05:00
commy2
d842e0ad58 Map - Fix effects breaking mid mission (#6566)
* fix map effects breaking mid mission

* avoid magic numbers

* params a function

* XEH DisplayLoad instead of dummy display

* formatting, parentheses

* fix a thing

* skip effects in briefing
2018-10-21 17:01:18 -05:00
commy2
001942b2ed Vehicle Lock - Enable for planes (#6646)
* enable vehicle lock module for planes

* Add actions to planes

* improved lazy eval

* remove superfluous parent class check

* IS_KIND_OF_ANY macro

* Update addons/vehiclelock/functions/fnc_moduleSync.sqf

* Improve handleVehicleInitPost XEH
2018-10-21 16:37:16 -05:00
Josuan Albin
6f6b0d15f8 Add curator garrison path drawing, clean up garrison code (#6643) 2018-10-18 11:14:26 -05:00
Timi007
95fbdbce65 disable marker editing for polylines (#6596) 2018-10-16 18:08:10 -05:00
PabstMirror
52abed1d07
Fastroping - Fix 3den default value (#6642)
Close #5550
2018-10-16 12:24:41 -05:00
mharis001
50e233c22c Add key handling to 3DEN attribute (#6622) 2018-10-14 08:54:51 -05:00
Dedmen Miller
9b6aa4c8c2 Add MagazineWells support (#6604)
* Add MagazineWells to ballistics

* Add HuntIR wells

* Add Vanilla wells

* New CBA magwells

* indent

* test

* Revert "test"

This reverts commit 00f689f681.

* Fix huntIR configs

* Use CBA_65x39_Mk200 well
2018-10-13 13:11:57 -05:00
Dystopian
4ff8fc13ff Fix turrets without weapon treated as gunner (#6636) 2018-10-13 12:07:51 -05:00
Dystopian
d7c7ead574 Zeus - Add Repair and Rearm interactions (#6632)
* Add Repair and Rearm interaction to zeus

* Optimize remoteControl statement
2018-10-13 12:07:32 -05:00
PabstMirror
6ad28439b0
Cargo - Revert Load Times Normalize (#6638) 2018-10-13 11:59:16 -05:00
Laid3acK
6363f73fb8 AMS and KHS realistic name (#6605)
Realisticnames - Update AMS and KHS's name
2018-10-12 23:00:20 -05:00
Laid3acK
468ab249a2 Scopes - Update AMS, KHS and LRPS "ACE_ScopeAdjust" (#6606)
* ams_khs_scopeadjust

* Update CfgWeapons.hpp
2018-10-12 22:58:35 -05:00
mharis001
c95877d823 Cargo - Add load time coefficient setting (#6618)
* Add loadTimeCoefficient setting

* Call settingChanged function

* Normalize load coefficient
2018-10-12 22:37:05 -05:00
jonpas
9972f5374f Default enable Quick mount (empty keybind) and Move to CBA Settings (#6613)
Quickmount - Default enable quick mount (empty keybind) and Move to CBA Settings
2018-10-12 22:14:03 -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
Dedmen Miller
0633b807fa Some Refactoring (#6607)
* SwitchUnits

* tacticalLadder

* vehiclelock

* vector

* Typo, thanks circleCI

* Fix stuff

* Fix animate loop
2018-10-09 20:21:46 -05: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
BaerMitUmlaut
86a243d3cc Fix ENVG II overlay (#6630) 2018-10-08 15:24:44 -05:00
PabstMirror
9eba55be21
Cargo - CanLoadItem ignores vehicle height on scripted load (#6629) 2018-10-08 15:23:59 -05:00
mharis001
e54e8d0f8c Fix blacklist not working in multiplayer (#6598) 2018-10-07 22:49:29 -05:00
mharis001
9aa34ab462 Cache dogtag actions (#6625) 2018-10-07 22:23:49 -05:00
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
commy2
dfde6e2aae
fix engine start delay turning viv laoded vehicle when starting the engine 2018-10-06 13:41:26 +02:00
BaerMitUmlaut
97e3766ed3
Fix slow motion falling of SLAM mines (#2770) (#6619) 2018-10-06 12:07:08 +02:00
Josuan Albin
7aa59ecbc4 Fix duplicate japanese strings (#6611) 2018-10-02 15:16:44 +02:00
Blutze
43c5258585 Realistic Names - Rename RGN to V40 Mini-Grenade, fix some trailing spaces (#6590)
* Add new strings, fix Czech M67

Czech string for M67 had a trailing space.

* Apply new strings

* Remove placeholder translations

* Fix more trailing spaces
2018-09-27 09:18:54 +02:00
jonpas
db5e9eaad7
Fix rope redeploying without FRIES - fix #5686 (#6599) 2018-09-26 13:56:50 +02:00
mharis001
0fd1a4c39e Convert CBA_fnc_uniqueUnitItems to common fnc_uniqueItems (#6593) 2018-09-22 21:59:16 -05:00
mharis001
8648ccaba5 Explosives - Optimize creating explosive place actions (#6413)
* Optimize explosive actions

* Optimize hasExplosives function

* Readability parentheses

* bump

* testing...

* last try

* for science

* fix for sqf_validator
2018-09-21 22:54:24 -05:00
Mezilsa
ab52ff8ddb add microdagrwaypoint precision as an option (#6437)
* Make the precision of the mircoDagr less perfekt

* Add strings of precision Option to stringtabel

* Update stringtable.xml

* Create initSettings.sqf

* Update ACE_Settings.hpp

* Finally

* Cleaning

* Update initSettings.sqf

* Move other settings to sqf, simplify waypointPrecision
2018-09-21 22:32:09 -05:00
mharis001
61000df120 Tagging - Cache required items check and use uniqueItems (#6582)
* Cache required items check and use uniqueItems

* Use config-case for required items
2018-09-21 15:11:02 -05:00
Dedmen Miller
0a2f5cf238 Fixed #6581 (#6586) 2018-09-19 08:31:08 -05:00
Ozan Eğitmen
a6d40549dc Fix findIf typo, Don't deep copy arrays (#6587) 2018-09-19 08:24:57 -05:00
commy2
550acf6a2b
Merge pull request #6208 from Max255PL/laserbeam
Add IR beam to visible laser mode
2018-09-18 20:54:42 +02:00
commy2
5aa8c1dca0 make setUnconscious not reset firing mode (#6519) 2018-09-18 11:35:40 -05: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
Timi007
7988622635 Add the ability to edit user placed markers (#6564)
* add the ability to edit user placed markers

* remove direct channel from valid channels

* add author

* optimize get map display

replace old method of getting the map display with displayParent

* optimize code by adding isEqualTo

* correct some spelling mistakes
2018-09-17 13:52:24 -05:00
Ozan Eğitmen
db6a40f91d Arsenal - Add Default Loadouts API (#6558)
* Add addDefaultLoadout function

* Initialize defaultLoadoutsList by default

* Close params bracket

* Revert "Initialize defaultLoadoutsList by default"

This reverts commit a53d21046e.

* Add isNil check

* Remove tab

* Overwrite loadout if it exists

* Fix file name typo

* Use findIf and copy array

* Add override note to header

* Make btnImport use new function instead of duplicating code

* Use GVAR

* Use findIf

* Fix spacing

* Add documentation

* Improve documentation
2018-09-17 13:22:04 -05:00
PabstMirror
ae6a2709f3
Arsenal - Don't warn when calling removeUnitTrackProjectiles (#6574) 2018-09-14 23:58:28 -05:00
Blutze
3ee94d3aca [Arsenal] Filter firemodes for precision display by showToPlayer (#6572) 2018-09-14 15:01:50 -05:00
mharis001
d6976f63ac Zeus - UI improvements and additional objects setting for Editable Objects module (#6391)
* Add additional objects setting to Editable Objects

* Fix Teleport Players UI height and remove unnecessary strings

* Improve Garrison UI

* Config based combo for Toggle NVG and Toggle Flashlights UI

* Capitalize garrison module names
2018-09-13 08:40:55 -05:00
commy2
66da48fcdb
Merge pull request #6402 from mharis001/explosives-timer
Explosives - New Timer UI
2018-09-13 06:39:50 +02:00
PabstMirror
f2a57797da Make sure explosive is still valid when updating timer 2018-09-12 23:07:39 -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
Josuan Albin
eab84e0d09 Arsenal - Fix sort by value not sorting properly (#6570)
* Fix sort by value not sorting properly

* Change single to double quotes

* Remove uneeded space
2018-09-12 14:59:36 -05:00
commy2
05ad146ba3
restore 2018-09-10 19:31:26 +02:00
commy2
b651cc8093
delete duplicated code 2018-09-10 19:30:30 +02:00
commy2
e592717c30
make hide stamina setting make bar reappear when changed mid mission 2018-09-10 15:15:59 +02:00
commy2
8cd0b496ac
Merge pull request #6561 from acemod/repairFacility
Repair - Fix isInRepairFacility for buildings at height
2018-09-03 18:02:01 +02:00
PabstMirror
628878d074 Repair - Fix isInRepairFacility for buildings at height
Fix #6560
2018-09-02 21:59:32 -05:00
alganthe
d13641d670 Add author support for mission defined unitInsignias 2018-08-31 18:35:12 +02:00
alganthe
04aeaa0912 Add support for mission defined unitInsignias 2018-08-31 18:20:55 +02:00
SilentSpike
24846e6f74
Make state change status updates consistent (#6538)
State transitions call respective functions in the status component where unit variables and status are actually handled.
2018-08-25 16:40:22 +01:00
Dystopian
d8b54a8ef0 Fix switching non-local portable light on (#6522) 2018-08-16 20:52:13 -05:00
SilentSpike
11547d7ff8
Fix environmental damage sources (#6515)
* Tidy handle damage code
* Fix environmental damage conditions

- Vehicle damage would never occur because it doesn't fire all the
hitpoints
- Missing sanity check on fall damage to check that unit isn't in a
vehicle
- Getting hit by a vehicle while on foot can be detected by checking for
a shooter

* Improve collision handling

- All collisions have a `_shooter` so we simply first check for that because burning doesn't and it could happen at any velocity
- We don't actually care what caused the collision because they should all cause the same type of wounding
- The exception is fall damage because we want to prioritise wounding the legs, we assume if the `_unit` had downward velocity and `_shooter == _unit` that it was fall damage (not necessarily always true, but almost always is and there doesn't look to be a more specific way to check).
2018-08-15 07:57:11 +01:00
Rutger "RedBery" Meijering
5fbaf426a8 Fix various bugs (#6523)
* Fix medical menu not reopening regardless of setting
* Ensure no heartrate or bloodpressure on death
* Fix status variables not being reset on respawn
* Fix JIP resetting status variables for all units
* Fix heart rate adjustment overflow and
2018-08-14 21:34:35 +01:00
SilentSpike
0e8ed5315e
Remove patient treatment animations (#6524)
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
SilentSpike
a182336880
Ignore playable logic hitpoints (#6517) 2018-08-12 12:21:06 +01:00
SilentSpike
923c25163f Fix missing boolean return in CPR 2018-08-12 11:50:47 +01:00
SilentSpike
7fcd12c792
Reset default state on respawn (#6518)
* Reset default state on respawn
* Remove old getUnitState function
* Add locality check
2018-08-12 10:14:48 +01:00
Zakant
14d52ee77e Remove CPR alive check (#6492) 2018-08-12 08:57:23 +01:00
Dedmen Miller
c1c5d6d63c Remove collision of bandage litter (#6495)
* Remove littergeneric collision
* Remove collision/shadow from non-litter items
* Remove quik clot litter shadow
* Add empty shadowLOD to litter
2018-08-11 17:52:26 +01:00
Rutger "RedBery" Meijering
0a97ef3cc8 Fix event name overlap and macros (#6514) 2018-08-11 11:40:06 +01:00
PabstMirror
cd980dc28d 3.12.3 - Build 36 2018-08-09 09:42:36 -05:00
PabstMirror
21de7138a7 Merge branch 'master' into release-3.12.3 2018-08-08 09:49:17 -05:00
jonpas
48c3900507 Fix Japanese stringtable (#6511) 2018-08-08 07:17:22 -05:00
jonpas
f6737f0c6e Bump required Arma 3 version to 1.84 and CBA to 3.8.0 (#6508) 2018-08-08 09:56:33 +01:00
Zakant
88238dd0b5 Fix wrong macro (#6509) 2018-08-08 09:54:17 +01:00
PabstMirror
9d24cebb9b Build 35 2018-08-06 11:49:21 -05:00
PabstMirror
dd519f1bed Merge branch 'master' into release-3.12.3 2018-08-06 11:34:00 -05:00
Dystopian
2d5892f285 Fix facility is like vehicle (#6478) 2018-08-06 11:27:14 -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
SilentSpike
9e5c4a7ed9
Move medical settings into their respective components (#6493)
* Transfer medical AI to CBA setting
* Neuter the old settings module

I've left the entry in CfgVehicles so that it doesn't cause errors on
older missions, but it's just a dumb logic now and does nothing.

* Remove medic setting
* Move increaseTraining setting
* Move fnc_adjustPainlevel to medical_status
* Move pain and bleed coefficients to medical_status
* Move advanced bandages to medical_treatment
* Move advanced medication to medical_treatment
* Move advanced diagnose to medical_treatment
* Move wound reopening and screams settings
* Move damage threshold settings
* Move showPain setting
* Move statemachine settings
* Move pain visualisation setting
* Move all treatment usage settings
* Move self IV setting
* Move remaining settings
* Sort treatment setting string categories
2018-08-06 17:08:43 +01:00
Josuan Albin
29d11bc752 Fix terminals not being properly added to currentItems (#6504) 2018-08-05 23:15:49 -05:00
Josuan Albin
bac4156d1a Arsenal - Fix weapon without mag showing weird velocity (#6500)
* Fix weapon without mag showing weird velocity

* Update stringtable.xml

* Change string to str_empty
2018-08-05 22:22:39 -05:00
Thomas Kooi
21eb5e3df6
Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00
PabstMirror
d48e336915 v3.12.3 2018-08-02 14:48:41 -05:00
PabstMirror
240046ceee
Medical Menu - Check cursorObject if cursorTarget is invalid (#6496)
Should fix #6488
2018-08-02 14:42:44 -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
Zakant
60a8158246 Fix GUI bodypart string names (#6490)
* Fixed new names in stringtable
* Removed duplicated entries from stringtable
* Fixed comma
2018-08-02 09:43:30 +01:00
PabstMirror
6ae7c28025
Dragging - Add compatibilty for 1.84 static weapons and radars (#6494)
* Dragging - Add compatibilty for 1.84 static weapons and radars

* Reload - Disable check ammo keybind when in UAV
2018-08-01 15:29:54 -05:00
Josuan Albin
9f85a53711 Fix error in setupExplosive with CBA 3.8.0 (#6476)
* Fix error in setupExplosive with CBA 3.8.0

getFov has a param check now, this function was passing args to it and causing an error.

* Fix getFov call in attach and viewDistance modules
2018-07-31 17:36:22 -05:00
Zakant
7cf483d598 Removed icon from legacy modules (#6486) 2018-07-30 14:11:18 -05:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging (#6482) 2018-07-30 00:07:30 +02:00
Thomas Kooi
36f2c5fcc9 Minor code clean up (#6474)
* Minor code clean up
* refactor(medical): shorten some code
* refactor(medical): use macros for tourniquets
* refactor(medical): pull cache expiry values into script_macros_medical
2018-07-29 22:43:14 +01:00
Thomas Kooi
9e26833b94
fix(medical): make sure vitals handling works properly again (#6481) 2018-07-29 23:16:06 +02:00
SilentSpike
2ea7c349ca
Add possibility for lethal organ damage (#6277)
* Change fatal injury to emulate lethal organ damage
2018-07-29 21:19:04 +01:00
Dystopian
a44411c666 Wire cutter - Allow use when unit has RHS Engineer UMBTS backpack (#6462)
* Allow wirecutter use when unit has RHS Engineer UMBTS backpack

* Move flag from code to config
2018-07-27 12:26:26 -05:00
Dystopian
4e0df9b90e Minor fixes (#6465)
* Fix example in ace_map_fnc_simulateMapLight

* Make fnc_addActionToObject public

* Repair - Delete unnecessary condition
2018-07-27 12:24:56 -05:00
Thomas Kooi
e22f35da37 Remove medkit (#6473)
Due to be replaced by an alternative treatment option such as a split
2018-07-26 17:14:11 +01:00
SilentSpike
9349179213
Fix and use hemorrhage stringtable descriptions (#6472)
* Fix hemorrhage stringtable descriptions
* Use hemorrhage descriptions always
2018-07-25 18:42:53 +01:00
SilentSpike
873ed90cc1
Introduce bleedout condition and fix IV hemorrhage (#6470)
* Introduce bleedout condition and fix IV hemorrhage
* Update patient info display hemorrhage values
* Update UI info hemorrhage values
2018-07-25 11:40:37 +01:00
SilentSpike
39b1d144e1
Vary time taken to bandage based on circumstances (#6467) 2018-07-25 09:35:04 +01:00
Tim Beswick
10a988836d Ignore interaction distance with zeus cargo load module (#6396) 2018-07-21 18:07:16 -05: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
commy2
78ee7d4677
simplify animations config 2018-07-21 09:16:05 +02:00
SilentSpike
3b5747423a
Improve unconscious volume handling (#6455)
* Lower player hearing upon entering unconscious
* Fix potential for unconscious units to use radio
* Evaluate player's volume upon changing unit
* Reset player volume on death
* Remove unnecessary public variable
2018-07-20 22:23:48 +01:00
Josuan Albin
8a37b6093d Arsenal - Fix locality issue for adding weapons/backpacks and remove unnecessary check in scanConfig (#6456)
* Remove unnecessary itemInfo check in scanConfig

I got the best tests folks, believe me, the best.
I made sure this didn't break anything by making sure the array had the same number of elements before and after removing those, best tests folks.

* Change onSelChangedLeft to use global variant of addWeapon and addBackpack

Fix a possible locality issue when opening ace arsenal on other players.
2018-07-20 15:54:04 -05:00
TheMagnetar
b8cd85135e Changes unit vitals rw (#6449)
* Some changes to UnitVitals

* increase to 40% chance

* Added bloodpressure L above limits cardiac arrest
2018-07-20 22:49:55 +02:00
SilentSpike
cde22a675a Fix ladder dismount animation bug (#6454)
Not sure of the original reason we interpolate to this ACE unconscious
animation, but removing it seemingly has no effect and fixes all the
other animations that were broken by it.
2018-07-20 22:48:48 +02:00
mharis001
0b19a8d527 Arsenal - 3DEN Attribute (#6257)
* Initial commit

* Add/remove items and switching between categories

* Add ability to change mode

* Save attribute and clear button

* Search bar and double click to toggle

* Add export button

* Add attribute init function

* Fix multiple selection with different items

* Correct bad code and remove unneeded include

* Update stringtable.xml

From common pbo whitelist (modified) and a3 stringtables

* Disable attribute on humans

* Move includes to top

ref #6407
2018-07-20 12:35:44 -05:00
shukari
8a81e3b675 Geforce, RHS Geforce adjustments and MH6M can now fastrope (#6439) 2018-07-19 22:54:06 -05:00
Dmitry-Yuri
c33fc6106d Fix Rearming Pylon Magazines (#6378)
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf

* Update fnc_rearmSuccessLocal.sqf

* Update fnc_rearmSuccessLocal.sqf
2018-07-19 18:40:04 -05:00
Thomas Kooi
f7f89725fe
Fix respawn not resetting variables (#6453) 2018-07-20 00:09:08 +02:00
shukari
bf2cbaab79 added new fences to wirecutter (#6423)
* added apex and tacops fences

informations from #6420

* added new p3d fences

infos by #6420

* tabs fix

* tabs fix2

* fix tabs3

* Remove comments from macro

* Fix merge

* Update script_component.hpp
2018-07-19 16:59:46 -05:00
SilentSpike
ac5fedff44 Fix cardiac arrest timeout death (#6451) 2018-07-19 19:12:59 +02:00
Glowbal
13cdb76dce Fix some more stringtable usage 2018-07-18 23:20:31 +02:00
Thomas Kooi
245a18599e Fix stringtable references 2018-07-18 23:19:27 +02:00
Thomas Kooi
604fa0e4cb
Fix some script errors on medical rewrite (#6450) 2018-07-18 22:50:03 +02:00
SilentSpike
6497f6c9d4 Fix missing include 2018-07-18 21:17:44 +01:00
TheMagnetar
5c768f7784 Fix duplicate entry (#6448) 2018-07-18 21:53:54 +02:00
TheMagnetar
3054803e44 Improvements to vitals and display (#6444)
- Improvements to vitals and display
- Fixes some undeclared variables
- Adds advanced diagnose: hemorrhage classes.
- Original idea for displaying hemorrhage classes belongs to @Arcanum417
2018-07-18 21:38:00 +02:00
Glowbal
e8f00fbe7c
Merge remote-tracking branch 'origin/master' into medical-rewrite 2018-07-18 20:42:41 +02:00
SilentSpike
0e50aca9d8
Add support to toggle allowDamage (#6266) 2018-07-18 19:31:29 +01:00
SilentSpike
34eb5553ea
Move scream and moan sounds to medical feedback (#6438)
* Move scream and moan sounds to medical feedback
* Move vanilla feedback overrides to medical feedback
* Update all function calls
* Use events to avoid a dependency
2018-07-18 19:21:27 +01:00
SilentSpike
ec7a9a133e
Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +01:00
SilentSpike
4466f9e785
Strip medical component (#6442)
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
2018-07-18 19:13:25 +01:00
SilentSpike
68ff7575eb
Move medical facility, vehicle and unit functions (#6440) 2018-07-18 11:09:48 +01:00
Thomas Kooi
c9c8d25017 Move vitals loop statemachine events into switch statement (#6443)
- Induce cardiac arrest if unit blood volume drops below half
2018-07-18 11:09:09 +01:00
TheMagnetar
bf4f54bce6 Fix settings in medical rewrite (#6436)
* Fix settings in medical rewrite
* Raise spontaneousWakeUpChance to 0.05
2018-07-17 15:49:14 +01:00
Bismarck
e566cbf35a Fixes damage redirection issues (#6231)
Units accumulate damage in the local variables
"ACE_Medical_Engine_$HitXXXX", but these are never reset. The way these
vars are used is as a single-damage-event tracker, and the end result of
not resetting their value when they're done being used is that a
specific $HitXXXX can accumulate enough damage to cause the "select
wound with highest damage" code to always select _it_ for the next wound
event, even if it wasn't the primary target of the last wound event.

I.E. I get shot in the right leg badly. If I then get winged in the left
arm, that wound will end up on my right leg, because when the code runs,
it finds QGVAR($HitRightLeg) > QGVAR($HitLeftArm), and so it applies the
wound to the right leg.
2018-07-16 23:49:06 +02:00
TheMagnetar
3bf3629047 Fixes state machine (#6435) 2018-07-16 23:25:54 +02:00
Magnetar
9b5c5bc866 Fix QGVAR medical variables 2018-07-16 15:35:34 +02:00
Glowbal
2faa3379ae Fix getBloodloss 2018-07-15 18:29:18 +02:00
Glowbal
6576e5d014 Fix linting error 2018-07-15 16:28:39 +02:00
Glowbal
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
Thomas Kooi
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +02:00
Thomas Kooi
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
Thomas Kooi
2a721cb8c8 Fix medical item icons not found error 2018-07-15 13:59:21 +02:00
Thomas Kooi
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
Thomas Kooi
5e1c3c6da1 Fix duplicate class declarations during start up 2018-07-15 12:33:34 +02:00
PabstMirror
f4a0747493
Explosives - Increase defuse range for underwater mines (#6429)
Fix #6427
2018-07-13 12:36:21 -05: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
mharis001
a84daca959 Explosives - Optimize interactEH function (#6406)
* Optimize explosives interactEH

* Use local player variable and distanceSqr
2018-07-13 12:04:55 -05:00
mharis001
def05b9cf1 Wire cutter - Various improvements and cleanup (#6389)
* Optimize and cleanup interactEH function

* Add missing fences and improve formatting

* Improve cutDownFence function

* Remove unused sound files and cleanup

* Multi-line condition and fix examples

* Increase PFH delay and use distanceSqr
2018-07-13 11:30:13 -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
Will
4b1672eaa0 its now possible to set rearm vehicles in the editor && pylons now look also for non-config rearm vehicles 2018-07-09 19:20:55 +02:00
PabstMirror
29726946f6
Disposable - Fix nlaw picture popup error (#6419)
Fix #6410
2018-07-06 00:13:23 -05:00
Tim Beswick
80e648938a Speed limit scroll (#6384)
Vehicles - Set speed limited with mouse scroll wheel
2018-07-05 11:32:40 -05:00
PabstMirror
5495bd5a1f
Pylons - Add ACE prefix to settings category (#6388) 2018-07-05 11:29:51 -05:00
PabstMirror
a8c1846a37
Logistics - Move to CBA settings and organize in subcategories (#6284) 2018-07-05 11:29:32 -05:00
Josuan Albin
09855f133a Fix typo in med and issue related to unconsciousness (#6411)
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
2018-06-28 00:06:12 -05:00
Dissyu
e5a15d200f Traditional Chinese update (#6408)
Traditional Chinese update
2018-06-27 14:16:11 -05:00
commy2
613c088124
bump 2018-06-25 08:42:43 +02:00
commy2
b7e3646697 don't make Explosives close one display at death 2018-06-25 00:08:15 +02:00
maike1860
e3c5396593 Add Chinese translation Modify grammar (#6400)
Translations-  Chinese: Modify grammar
2018-06-22 19:14:11 -05:00
Unknown
bbbfabec03 Add new explosive timer UI 2018-06-22 15:41:43 -04:00
xrufix
b2be3d683f Fix typo (#6399) 2018-06-21 10:44:56 -05:00
PabstMirror
205abec286
Fastroping - Disable ACRE features from helper objects (#6387) 2018-06-20 22:17:27 -05:00
mharis001
fdf6100fb6 Add ACE Flags (#6394) 2018-06-18 15:01:32 -05:00
Tim Beswick
c0b9a31deb Cargo load ignore interaction distance parameter (#6395)
* Added force parameter to cargo load

* Specifically ignore interaction distance

* Fixed old brackets

* Removed old trace
2018-06-18 15:01:09 -05:00
Josuan Albin
0a313ce41f Fix right tab listNbox not showing last item on first load (#6390)
Go figure why that happens tho :/
2018-06-10 22:29:07 -05:00
Josuan Albin
3917092540 Fix possible issue with weapons without firemodes (#6386)
Apparently that's a thing
2018-06-10 00:14:14 -05:00
Josuan Albin
11df315ce4 Arsenal - Fix Rate Of Fire stat (#6385)
* Fix the ROF stat in ace arsenal

Previous one was wrong when the ROF set as default was different than the one in firemodes

* Add missing )
2018-06-09 12:43:53 -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
xrufix
a4e0e83972 Realistic names for new assets from Tanks DLC (#6252)
* LSV AT variants

* Angara > Armata, Nyx > Wiesel 2

* Fix some errors in last to commits

* Zamak MRL -> KamAZ MRL

* Vorona -> Metis-M

* Vehicle Vorona -> Metis-M

* Wiesel vehicle weapons

* Fix wrong inheritance

* Rooikat GT12 cannon

* Armata weaponry

* MB 4WD -> Jeep Wrangler

* Optics Attachments

* Fixed Type "Grenn" -> "Green"

* Rooikat SPMG -> MG4

* New Marid v2 -> Otokar ARMA

* Removed unnecessary inheritance.

* Simplify ace_vehicles config
2018-05-31 22:12:24 -05:00
xrufix
dc3a9fccca Fix Mavericks and KH25ML diving into the ground. (#6315)
* Fix issue with missiles diving into the ground before reaching the target

* More modest steering deflection for Maverick and Kh25ML
2018-05-31 21:18:47 -05:00
mharis001
d4767eba73 Zeus - Add ability to unload cargo (#6226)
* Add ability to unload cargo

* Handle array index being out of bounds
2018-05-31 21:17:30 -05:00
xrufix
93e187e3ec Added hearing config for CSAT, Stealth and Racing Helmets (#6300)
Hearing - Added config for CSAT, Stealth and Racing Helmets
2018-05-31 20:52:45 -05:00
Dedmen Miller
f5cd682ce3 Arsenal - Add magazineWell support (#6355)
* ACE Arsenal magazineWell support

* Fix case sensitivity problems
as
2018-05-31 20:46:48 -05:00
BaerMitUmlaut
0ae93aa2e7 Hide "Activate Mine" action (#6353) 2018-05-31 18:13:17 -05:00
mharis001
e90ea95ce7 Change repair to use icon color not multiple files (#6318) 2018-05-31 18:11:16 -05:00
mharis001
77b4ce7585 Dogtags - Allow dogtags display to be repositioned (#6351)
* Allow dogtags display to be repositioned

* Update IGUI preview image

* Use common grid macros
2018-05-31 18:05:35 -05:00
Josuan Albin
9618c2de95 Various ACE Arsenal additions and fixes (#6347)
Arsenal - Various additions and fixes
2018-05-31 18:00:29 -05:00
Tim Beswick
0db28f89b7 Hellfire submunition (#6299)
Hellfire - Update to use 1.82 submunition
2018-05-31 17:57:40 -05:00
BaerMitUmlaut
7781c721a8 Fix NVG adjustable brightness (#6291)
Nightvision - Fix adjustable brightness
2018-05-31 11:07:31 -05:00
mharis001
3d31b6395c Interaction Menu - Ability to modify icon color (#6290)
* Add ability to modify icon color

* Add config support for icon color
2018-05-31 10:57:46 -05:00
mharis001
ac3642d074 Attach - Optimize creating children actions (#6345)
* Optimize attach get children actions

* Store CfgMagazines and CfgWeapons config lookups
2018-05-31 10:49:38 -05:00
Ozan Eğitmen
a917d586cb Pylons - Separate settings for in-game and zeus (#6365)
* Modernize pylons

* Revert docs/wiki/featurex/fortify.md

* Bring back ACE settings with movedToSQF

* 🤦

* Move settings to separate file, Fix postInit logic problems

* Tabs -> spaces
2018-05-31 10:43:02 -05:00
EtoileRei
a5a8c68831 Japanese Translation Tweak (#6375)
- fixed typo
- improved readability
- standardized expression
2018-05-31 10:34:19 -05:00
BaerMitUmlaut
9aba78b320 Fix AF sway factor (#6360)
* Fix sway factor, switch to CBA settings in AF

* Add movedToSQF
2018-05-30 18:05:55 -05:00
mharis001
232f986048 Pass by reference for BI EHs (#6368) 2018-05-30 17:39:28 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
shukari
bdc58441f4 Fixed mortar double loading (#6240)
* block double loading

* prevent double loading

* block double loading

* use nil

* use nil

* fix some wrong variables

* not needed here

* unload only one person

* prevent duping

* wrong makro

* wrong makro

* wrong macros

* wrong macros
2018-05-30 16:45:31 -05:00
Dmitry-Yuri
9c60ec06e4 Fix Pointing Problems with Static Weapons (#6377)
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf
2018-05-29 22:04:32 +02:00
EtoileRei
0199ba9b4c Japanese Translation Tweak (#6374)
# fixed typo
# improved readability
# standardized expression
2018-05-28 07:15:28 +02:00
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
52dbef84ab Fix incorrect macro variable 2018-05-23 10:27:12 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
Thomas Kooi
58f4ca4581
Merge branch 'master' into armake 2018-05-20 11:08:58 +02:00
commy2
e289acbb4e
Merge branch 'master' into adv_fatigue_sway_factor 2018-05-19 02:43:11 +02: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
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
2018-05-11 15:28:25 +01: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
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
4715a75351 Include all UI files 2018-05-10 16:47:11 +01:00
SilentSpike
65a3c32f9f Fix patient information display 2018-05-10 16:42:33 +01:00
SilentSpike
267c0b5c3c Fix some moved function calls 2018-05-09 16:52:26 +01:00
PabstMirror
4df3cfe8a0
Clean up ace_main requiredAddons list (#6332)
Close #6331
2018-05-09 10:32:44 -05:00
Dystopian
a4b803e2c1 Interaction - Allow RHIB push (#6302) 2018-05-09 10:09:34 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad (#6322)
- Fix #5614
- Don't run tracking siumlation on small calibre ammo that won't ever spall
2018-05-09 10:08:26 -05:00
SilentSpike
dbb538dc56 Fix GVARs moved out of medical 2018-05-09 13:37:07 +01:00
SilentSpike
b81bee2d46 Fix bandage and injector icon paths 2018-05-08 14:55:13 +01:00
SilentSpike
33a5fb46f5 Fix patient information display 2018-05-08 14:51:32 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
e97e1ed670 Fix more icon paths 2018-05-08 13:57:32 +01:00
SilentSpike
6cb43d61eb Fix icon paths 2018-05-08 13:46:30 +01:00
SilentSpike
a16721a1ea Fix medical statemachine function calls 2018-05-08 11:12:01 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
6eb9c7e940 Fix medical vitals function calls 2018-05-08 09:17:47 +01:00
SilentSpike
352d8cad31 Fix missing postInit error 2018-05-08 09:09:44 +01:00
SilentSpike
1373e62cd0 Fix stringtable names 2018-05-08 08:52:59 +01:00
SilentSpike
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
SilentSpike
909ae27721 Fix function prep typos 2018-05-08 08:38:00 +01:00
mharis001
fa98316424 Correct arsenal openBox center check (#6329) 2018-05-07 22:44:15 +01:00
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
PabstMirror
d68f67a1ef
Arsenal - Fix weight stat for NVGs (#6325)
Fix #6320
2018-05-04 16:13:42 -05:00
Vdauphin
2668bdc665 Check if suicide bomber isAwake (#6324)
Zeus - Don't trigger suicide bomber if unconsicous
2018-05-04 11:57:38 -05:00
Vdauphin
5f67e81355 Fix suicide bomber explosion position (#6323) 2018-05-04 16:36:08 +01:00
commy2
898c01587a Optimize suicide bomber zeus module (#6314)
- decrease check frequency from each frame to 1 per second
- simplify some math
- remove some very redundant parenthesis
- re-formated if control structure for readability
- use more appropriate skillFinal
- macro to change check delay, set to 0 in debug mode for debug line drawing
2018-05-04 16:35:28 +01:00
PabstMirror
ab23f4e4dc
Map - Fix ambient light effect flicking (#6313)
* Map - Fix ambient light effect flicking

* Remove format

* formating
2018-04-28 17:23:59 -05:00
mharis001
e9af086454 Interaction Menu - Add ability to change selector color (#6292)
* Add selector color changing

* Setup colors once at init
2018-04-28 17:23:44 -05:00
Dystopian
2454ade07b Quick Mount - Fix mount from water (#6310) 2018-04-28 14:34:52 -05:00
Cuel
265bc62259 (repair) - isRepairVehicle handling values according to wiki (#6278)
* handle boolean and integer

* check if value is 1 or true
2018-04-27 10:30:03 -05:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
SilentSpike
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +01:00
SilentSpike
5bc57cd793 Remove missing function PREPs 2018-04-27 15:32:11 +01:00
SilentSpike
d08cf4bdb7 Fix preprocessor includes 2018-04-27 15:21:49 +01:00
commy2
fbacf1a3e4
Merge pull request #6183 from DeliciousJaffa/patch-1
Allow goggle effects to be set locally per client
2018-04-27 01:14:51 +02:00
SilentSpike
5bd4cfcf59 Fix status macros 2018-04-24 20:19:47 +01:00
SilentSpike
e065ee239e Merge branch 'medical-rewrite' into medical-rewrite-restructure 2018-04-24 20:07:05 +01:00
mharis001
87c3a7a334 Zeus - Improve Editable Objects module and Cleanup (#6294)
* Improve Update Editable Objects ui and add icon

* Cleanup and remove broken attribute position

* Use QQGVAR
2018-04-24 18:46:59 +01:00
Josuan Albin
e7710d719b Add ace hearing support to the tank DLC helmet (#6296) 2018-04-23 17:47:41 +01:00
SilentSpike
5206b63d5a Fix medical interaction menu bleeding colours
This makes the bloodloss calculation used for the interaction menu icons
match the calculation used for the body image.
2018-04-20 12:28:18 +01:00
mharis001
ec8115d2a4 Zeus - Toggle NVGs and Flashlights improvements (#6219)
* New Toggle NVG ui and improve function

* Add Toggle Flashlights icon

* New Toggle Flashlights ui and improve function

* Stringtable changes and ace_ai postInit clean up

* TRACE fix and stringtable capitalization
2018-04-19 14:01:26 -05:00
PabstMirror
a828ebe591
Repair - Disable repair on ERA/Slat armor hitpoints (#6283)
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
2018-04-19 12:31:00 -05:00
PabstMirror
f4473ccfd3
Tactical Ladder - Fix args to cancleTLdeploy (#6280)
Fix #6232

cancelTLdeploy expects `[unit, mouse button key]`
2018-04-19 12:20:18 -05:00
SilentSpike
535e285c2c
Fix cardiac arrest time scale (#6244)
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
2018-04-18 23:25:44 +01:00
PabstMirror
3ca1bd77b8 Build Number for RC2 2018-04-16 23:38:58 -05:00
PabstMirror
6dace8f380 Merge branch 'master' into release-3.12.2 2018-04-16 23:37:17 -05:00
PabstMirror
336b8973c4
Rearm - Increase rearm distance check (#6276)
Fix #6177
2018-04-16 23:35:50 -05:00
mharis001
7239ad561f Change ACE Hint preview (#6271) 2018-04-15 13:14:31 -05:00
mharis001
bd754b6415 Rename ambiance sounds module (#6272) 2018-04-15 13:14:10 -05:00
PabstMirror
451d50f4a2 Fix titan on blufor LSV (#6270) 2018-04-15 16:58:00 +01:00
commy2
ede072cd5c
getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
PabstMirror
99299f285e
NLAW - Fix "no shape for" rpt warning (#6269)
```
No shape for ammo type ACE_NLAW_Explosion
No shape for ammo type ACE_NLAW_ShapedCharge
```
2018-04-14 16:05:30 -05:00
PabstMirror
f829180283 Fix realistic name for maverik pylon (#6263)
Fix #6260
2018-04-14 09:24:41 +01:00
PabstMirror
5d039b72d6
Cookoff- Damage handling disabled by default (#6264) 2018-04-13 23:09:16 -05:00
PabstMirror
6a4f2b1fda
Hellfire - Fix hellfires not showing after 1.82 (#6259)
Inherit from RocketPods instead of scalpel which has changed
2018-04-13 23:08:56 -05:00
PabstMirror
10a3a29ea0
Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
Dystopian
350711a86c Fix repair at dead vehicle (#6262) 2018-04-13 18:37:08 -05:00
PabstMirror
fa39e97203 Merge branch 'master' into release-3.12.2 2018-04-12 10:59:46 -05:00
Josuan Albin
1994e301fd More various ace arsenal fixes (#6192)
* Compile stats on preInit

* Remove uneeded check in add/removeStat

* Remove perf profiler vars

They aren't required anymore

* Fix case issue in verifyLoadout, remove uneeded line

* Fix ace arsenal cam not working porperly underwater

By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D

* Fix gunbag behavior in ace arsenal

Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon.

* Fix text scaling in the searchbars and loadout name edit boxes

Also made the text bigger by default
2018-04-12 10:44:23 -05:00
shukari
468da8b79b Fix fastropes being blocked after rope breaking (#6239)
* add broken state

* add broke state

* add broken state

* add broken state

* add broken state
2018-04-12 10:23:18 -05:00
Kex
b7942fdb83 Remove arsenal when already present (#6246) 2018-04-12 09:25:57 -05:00
PabstMirror
e7b7219bd9
Repair - Handle changes to getAllHitPointsDamage (#6250)
Since 1.82 `getAllHitPointsDamage` returns lower case
Fix track repair and hit point groups being case sensitive
Part of #6248
2018-04-12 09:15:57 -05:00
jonpas
1217d912ef Prepare release 3.12.2 2018-04-11 22:20:47 +02:00
PabstMirror
731ac2a268
Cleanup ace_vehicles for 1.82 (#6247)
Close #6220
2018-04-11 15:18:21 -05:00
PabstMirror
5ea2069b76
Arma 1.82 compat (#6201)
* Arma 1.82 compat

* Add tank to required addons
2018-04-11 15:18:05 -05:00
SilentSpike
895f08a215
Reset triage card on full heal (#6243) 2018-04-11 20:34:32 +01:00
Dedmen Miller
3ca8105e9e Improve Reload TakeEH (#6242)
* Improve Reload TakeEH

* Simplify explosives take EH
2018-04-11 08:53:23 -05:00
blaffer
7634f4657b Fix #6234 (#6235) 2018-04-09 22:50:57 -05:00
shukari
181d2ef5e1 fix #6237 (#6238) 2018-04-09 22:48:58 -05: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
PabstMirror
d41779dc74
Fix getAllRearmTurrets (#6224) 2018-04-07 20:23:10 -05:00
PabstMirror
ba9cff211a
Refuel - Fix hint string not being localized (#6214) 2018-04-07 20:22:46 -05:00
PabstMirror
743fbd4875
Cleanup old classnames (#6206)
Fix #6205
2018-04-07 20:22:14 -05:00
PabstMirror
85cf4424f9
Fix german medical translation (#6223) 2018-04-02 00:59:47 -05:00
lugubrioushatchling
e1241da4a9 Fixes for portuguese translation of ACE medical (#6222)
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
2018-04-02 00:35:27 -05:00
xnooztvFR
fc6f4418d3 Fix french translation (#6180)
* Fix french translation

Fix french translation

* Changes from alganthe/Vdauphin
2018-04-02 00:34:20 -05:00
Max
ffeadbfe43 Add IR beam to visible laser mode
* Adds an IR beam to a visible laser mode for vanilla laser pointers
2018-03-22 13:24:11 +01:00
jonpas
8548ff7eb8
Add support for Razor Wire on Prei Khmaoch Luong (#6199)
* Add support for Razor Wire on Prei Khmaoch Luong

* line for each model
2018-03-18 12:49:48 +01:00
vabene1111
b5eb4ac834 Fixed Slideshow action numbering (#6198)
Slideshow Action names would not be named on clients because counting was only done on the server, this would result in all actions on one object showing up in the same slideshow set
2018-03-17 18:12:33 +01:00
Jaffa
b6a2315525
Allow local goggle effects to be set per client
From what I can see goggles are all handled locally and do not need to be globally enabled/disabled. If a group wants to force the setting, CBA provides optional force functionality.
2018-03-05 21:20:32 +00:00
Josuan Albin
859b6a16f6 Fix error in ACE Arsenal stats (#6175)
* Fix the camera on remote units ending after ace arsenal closes

* Shorten handleStats, fix error with face, voice, insignia tabs

* Remove uneccessary code

You saw nothiiiiing.
2018-03-03 18:34:24 +01:00
mharis001
8ee7c1b132 Shorten handleStats window resize (#6176) 2018-03-03 18:33:29 +01:00
ulteq
21ae61e551 Fix allowSwapBarrel condition (#6170) 2018-02-27 17:35:03 -06:00
Dystopian
3feafc449f Interaction - Add Flip and Push actions to Quad Bike, Kart and Static Weapons (#6019)
* Add Flip and Push actions to Quad Bike

* Add actions to karts and static weapons

* Move magic number to macro

* Ditch here is

* Move condition to function
2018-02-26 12:23:47 -06:00
Dystopian
a2804f6097 Add Camping Light interaction (#6078)
* Add camping light interaction

* Add dragging

* Add cargo loading

* Handle Camping_Light_off objects

* Fix work in MP

* Replace action with command
2018-02-26 12:12:21 -06:00
Dystopian
ee7a1f6acb Improve class initialization (#6085) 2018-02-24 12:39:03 -06:00
mharis001
bca8b01860 Various additions to ace_zeus (#6036)
* Add search to teleport players UI

* Change group side icons to look better

* Improve teleport UI and add stringtable entries

* Add Assign Repair Vehicle module

* Add Assign Repair Facility module

* Add Assign Engineer module

* Add Full Heal module

* Add Suicide Bomber module

* Make heal module work without ace_medical

* Add suicide bomber module translations

* Improve attribute cargo to use displayName

* Improve set engineer ui

* ACE_Curator for repair modules + author array

* Add angle param to getModuleDestination

* Prevent multiple suicide bomber modules on same target

* Heal module: support BI scripted revive system

* Requested changes
2018-02-24 11:44:57 -06:00
mharis001
e813af667f BFT settings subcategory (#6165) 2018-02-23 23:40:47 -06:00
PabstMirror
04bb3d981c
InteractionMenu - Always compile before adding main action (#6156) 2018-02-23 23:30:33 -06:00
PabstMirror
f70dfaf160
Arsenal - Compile stats on first use (#6159)
* Arsenal - Compile stats on first use

* fix )
2018-02-23 23:30:15 -06:00
Josuan Albin
123c19c1c0 Scope stats and ballistic stats improvement (#6164)
* Hide some of the ballistic stats if config value not defined

ACE_magMuzzleVelocity
ACE_bulletMass
ACE_ballisticCoef

* Add vertical and horizontal scope limits stats
2018-02-23 23:29:41 -06:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait (#6160) 2018-02-21 11:05:17 +01:00
John Lillis
d64a0c6728 Remove SwayFactor ACE setting and module addition 2018-02-18 11:09:49 -05:00
PabstMirror
741407f6e1 Arsenal - Add stat for scope magnification (#6150) 2018-02-18 02:32:19 +01:00
Orbis2358
5bb27a28a7 Korean translations fix (#6151)
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
2018-02-18 02:31:34 +01:00
PabstMirror
4ec1039490
Add missing semicolons (#6148) 2018-02-15 10:31:14 -06:00
Josuan Albin
1d6e07d18f Add ACE Arsenal stats (#6110)
* Add test class

* Add stats mockup

* Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalStats

* Finish mockup, add basic hide/show logic

* Add base for stats

* Use CBA EHs for stats to allow 3rd party mods of it

* Add handleStats and most of the UI behaviors for stats

* Continue work on stats

* Add container stats

* Add page support for stats

* Add text for the ROF stat

* Add accuracy in MOA for the accuracy stat

* Change accuracy shown number to 1 decimal instead of 2

* Add MIL in the dispersion stat text

* Change stats layout, remove dummy text strings

* Add some AB stats

* Remove last test string

* Replace configExtremes by normal lookup where it's relevant

* Add "undefined value" string when AB stat isn't present

Mostly for laucnhers

* Fix typo in preInit

* Change drag model stat to ballistic coef

* Fix issue with unused stats, change text to white when bar is present

* Rewrite some part of handleStats

Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me

* Re-add _hideUnusedFnc, handle empty stats arrays

* Pass args to stat conditions, add test condition stat

* Add hearing related stats

* Remove the padding between stats and the stat bar / text

* Add strings for stats

* Change stats window to fit baer's suggestion

* Algin the close stats button, add missing strings

* Finish code review

* Add missing newline

* Remove duplicate strings

* Add explosive range stat

* Use proper string for the explo range stat

* Fix capitalization for ctrlParent

* Fix conditional stats blocking other stats

* Add better integration for ballistics, hearing and explosive stats

* Replace the private array in handleStat by params

* Add backblast stats

* Add backblast stat strings

* Add flashlight map color and g-force reduction stats

* Shorten preInit

* Change stats close button to fit arsenal design

* Improve stats page indicator look

* Rework how stats are stored and retrieved

* Remove args config entry, add priority entry, add vanilla weapon stats

* Add vanilla container stats

* Remove some lines in preInit

* Add ballistics stats

* Add hearing stats

* Remove uneeded config entries

* Add explosive range stat

* Add backblast stats

* Add spaces after semicolons in statements

To make JJ happy because I don't care.

* Add flashlights map color stat

* Add gforce reduction stat

FINALLY FUCKING DONE

* Fix headers for the new stats funcs

* Add add / remove stat API

* Fix typo in removeStat header

* Remove uneeded inline func

* Clean up add / remove stat

* Move all CfgACEArsenalStats entries to their own file

* Replace STR_ACE_Ballistics_statAmmo by a BI string

* Add script profiler related macro and code

* Use the highest ballistic coef instead of first one defined

* Add support for future ammo displayname

* Add ACE_standardAtmosphere for ballistic coef

* Add mag muzzle velocity stat

* Add weapon muzzle velocity stat

* Add comment explaining the ENABLE_PERF_PROFILING macro

* Change cfgACEArsenalStats to ACE_Arsenal_Stats

* Make JJ less pissy about spaces around =

* Fix indentation in weaponMuzzleVelocity, use param

* Use GVAR and EGVAR when appropriate

* Prefix all stats except the base class

* Fix Merge

* Fix aspect ratio scaling of stats panel

* Minor fixes
2018-02-15 10:03:22 -06:00
Whigital
f214b884a2 Settings strings (#6136)
* [hearing] Update strings

* [medical] Update strings

* [medical_ai] Update strings

* [medical_menu] Update strings

* [nametags] Update strings

* [nametags] Use existing DisplayName entries

* [medical_menu] Correct spelling

* [medical] Disable unreferenced setting

* [medical] Overdosing strings

* [medical_menu] Correct key IDs

* [repair] Update strings

* [medical] Correct spelling
2018-02-13 13:30:38 -06:00
Dystopian
e683c524d7 Map - Add Camping Light support (#6087)
* Add Camping Light support

* Add intensity check
2018-02-13 13:27:57 -06:00
Josuan Albin
04191e3c99 Fix ACE Arsenal interaction condition (#6140)
* Fix ACE Arsenal interaction condition

* Remove empty array
2018-02-10 13:13:59 -06:00
PabstMirror
1c6c7914dc
Interaction - Fix div0 error in getVehiclePos (#6139)
* Interaction - Fix div0 error in getVehiclePos

* Formating
2018-02-09 21:45:21 -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
PabstMirror
e73a2ddec0 NightVision - Add setting for shutter effects (#6134)
Also convert to cba settings
Close #6119
2018-02-10 03:31:22 +01:00
PabstMirror
4cabaa48b7
Pylons - Fix old weapons not being removed (#6100)
* Pylons - Fix old weapons not being removed

Fix  #6088
- Use removeWeaponTurret instead of removeWeaponGlobal
- Fix "Too Far" warning showing on completion

* Fix _x

* Fix var name

Co-Authored-By: Ozan Eğitmen <ozanegitmen@gmail.com>
2018-02-09 19:17:57 -06:00
Dystopian
59783a2e7a Small changes to persistent laserpointer (#6101) 2018-02-09 15:31:05 -06:00
Josuan Albin
8b9480de40 Add various misc improvements for ACE Arsenal (#6111)
* Disable anim previews when center isn't the player

* Abuse configs to change the edit loadout 3DEN entry

* Remove inheriting as it's not needed

* Remove uneeded condition

* Add zeus modules for ACE Arsenal, revert old arsenal modules

* Add 3 new arsenal EHs

* Add a setting to disable the identity tabs in ace arsenal

* Pass loadoutName in the onloadoutLoad EH

* Change foreach to forEach and ctrlcommit to ctrlCommit

* Resize the right window when the load bar isn't there

* Add a tooltip for the "clear container" button

* Improve onKeyDown, add classname copying using ctrl+c
2018-02-09 14:30:37 -06:00
commy2
eedb9fe614 weaponSelect CBA Setting (#5581)
* weaponSelectCBASetting

* Update to movedToSQF

* Add category
2018-02-09 14:28:34 -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
PabstMirror
e8da3e6435
Arsenal - Pass arsenal dispay to displayOpened event (#6109) 2018-02-08 13:42:07 -06:00
PabstMirror
5bef98d4ff
Decrease direct hit damage done by AGM-114N (#6121)
Fix #6114
2018-02-08 12:32:01 -06:00
PabstMirror
73e7ad5c79
Scopes - Use real zero for non-adjustable scopes (#6128) 2018-02-08 12:01:41 -06:00
God of Monkeys
3c697ca80b Chinese Language Update (#6130)
Chinese Language Update
2018-02-07 15:15:15 -06:00
BaerMitUmlaut
7b50d4a7a6 Add seperate setting for noise intensity (#6059) 2018-02-06 13:38:23 -06:00
jonpas
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00
Dystopian
f0a2b68f3d Aircraft - Disable scripted eject if vehicle is locked (#6096)
* Add lock check

* Delete seat lock check
2018-02-04 12:47:54 +01:00
mharis001
27504468e4 Change cargo menu to look better (#6112) 2018-02-01 16:41:56 -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