Commit Graph

930 Commits

Author SHA1 Message Date
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
PabstMirror
1e2b88f170
Minor RPT cleanup (#7658) 2020-04-22 10:05:22 -05:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit (#7529) 2020-02-22 21:24:47 +01:00
Whigital
8c2f53ac14 Revert quotation on string args 2020-02-12 22:07:19 +01:00
Whigital
80352519e1 conform isnil checking: common 2020-02-12 17:28:18 +01:00
PabstMirror
dd7ae389f9 Common - Fix canDig returning non-bool (#7516) 2020-02-08 19:43:42 -06:00
M3ales
71da4360b8 Changed version to versionStr as fix for #7478 (#7479)
Ensures return value of string is preserved.
2020-01-18 11:15:49 -06:00
PabstMirror
8e3fd45500
Artillery rangletables (universal) (#6853)
* Initial

* Update artillerytables.cpp

* Pass by value, remove c17 features

* Tweak accuracy

* SQF work

- improve compat with a3 mlrs with remote cam (animationSourcePhase)
- handle non [0] turrets (rhs prp)
- add config entries
- use vectorCos to fix fp error (thanks commy)

* Support per mag air friction

* tweak friction

* Integrate with mk6

* more acos fixes

* Handle invalid memPointGunOptic (CUP_BM21_Base)

* Cleanup

* cleanup/tweaks

* Update checkConfigs.sqf

* Finish cleanup of ace_mk6mortar

* Update stringtable.xml

* fix bwc for ACE_RangeTable_82mm

* Update fnc_rangeTableCanUse.sqf

* build 32dll, fix some headers

* strncpy and move testing to seperate file

* Move to sub-category

* Update for ACE_Extensions changes and add warning to ace_common

* Update stringtable.xml

* Update addons/common/functions/fnc_checkFiles.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Update stringtable.xml

* Update stringtable.xml

* test extension.yml update logical operator

* Revert "test extension.yml update logical operator"

This reverts commit b1871724ad.

* more guess and test
2019-12-17 10:14:45 -06:00
PabstMirror
29a0732b0c
Common - Network safe claim (#7258)
* Common - Network safe claim

* Update fnc_claimSafeServer.sqf
2019-12-07 15:18:50 -06:00
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

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

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224)
* Add item replacement framework

* Correctance of English

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

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
2019-10-11 15:00:25 -05:00
mharis001
13ffc07f27 Common - Optimize arithmeticGetResult function (#7232)
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-10-07 19:41:46 -05:00
PabstMirror
99db6802bb
Inventory - Adjust for changes to medical (#7112)
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
2019-10-06 11:10:56 -05:00
PabstMirror
c426103f23 Extension changes for Medical Rewrite and Linux compilation (#6909)
* Fix Medical HandleDamageWounds memory leak (#6809)

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

* Tweaks for Linux extensions (#5762)
* Tweak CMakeLists for Linux compilation
* Conform SQF extensions check for Linux server extensions support
* Add *.so to tools
* Split extension check into Windows and Linux
* Disable Medical extension loading for now
* Add client/server separation to extension loading
* Add Arma config documentation on extension creation
2019-09-28 23:03:55 +02:00
PabstMirror
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
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
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
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
PabstMirror
c6609cbdb9
Common - Fix script error with uniqueItems in scheduled (#6998) 2019-05-13 17:20:01 -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
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
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
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
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
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
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
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
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
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
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03: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
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
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
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString (#6007)
* Deprecate common function numberToDigitsString
2018-01-02 17:00:01 +00: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
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
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
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
Dedmen Miller
18d4b9660d Add endRadioTransmissions Event (#5873)
* Add endRadioTransmissions Event

* Update fnc_endRadioTransmission.sqf
2017-12-08 10:44:24 -06: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
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
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
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
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
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
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
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