commy2
fba39bebd0
+= for magwells
2019-05-03 13:07:04 +02:00
commy2
2cffe92848
don't disable remove mag if disposable replacement is disabled
2019-04-28 10:04:42 +02:00
commy2
9b57ef2111
adjustments for disposable enabled setting
2019-04-28 09:56:42 +02:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications ( #6910 )
...
* 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>
* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
PabstMirror
2cfe7ebd0c
FCS - Skip adding firedEH until needed ( #6965 )
2019-04-27 14:04:47 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS ( #6966 )
...
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS
* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
Dedmen Miller
50e3d8b3fe
Fix macro argument counts ( #6962 )
2019-04-27 06:05:29 -07:00
PabstMirror
5265e8bd84
Merge branch 'cbaDisposable' of https://github.com/acemod/ACE3 into cbaDisposable
2019-04-26 16:41:45 -05:00
PabstMirror
6250cd6505
Arsenal - Don't unload disposables
2019-04-26 16:41:42 -05:00
commy2
534abdede1
nlaw disposable realistic weight
2019-04-26 23:31:56 +02:00
commy2
6af3628e6f
fix baseWeapon
2019-04-26 19:19:34 +02:00
commy2
20853d2b20
let cba replace mags
2019-04-26 09:48:31 +02:00
Filip Maciejewski
cc22e95012
Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries ( #6932 )
...
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion
* Prevent FRIES from clipping into Ghost Hawk right door
* UNequipFRIES
* Remove fastroping checkVehicleThread
* Document FRIES equip and unequip functions
2019-04-25 13:31:36 -05: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
15401468b9
Refuel - Drop nozzle at unit's feet if no valid pos found ( #6957 )
...
* Refuel - Drop nozzle at unit's feet if no valid pos found
Fix #6944
* Update fnc_dropNozzle.sqf
* Update addons/refuel/functions/fnc_dropNozzle.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:28:11 -05:00
PabstMirror
1f1d950588
Map - Don't enable map light for parachutes ( #6961 )
2019-04-25 13:27:53 -05:00
commy2
cfe40ccd3f
fix launchers in cargo
2019-04-25 18:30:35 +02:00
commy2
d3f9280e5d
fix some copy paste leftovers
2019-04-21 19:03:42 +02:00
commy2
74229224d6
switch NLAW to CBA disposable system
2019-04-21 18:58:20 +02:00
Josuan Albin
28ac653635
Merge pull request #6953 from acemod/cba-disposable-compat
...
compatibility with CBA disposable framework
2019-04-19 14:36:08 +02:00
commy2
07ee2c1d3d
compatibility with CBA disposable framework
2019-04-19 14:33:57 +02:00
Dedmen Miller
48480c97f5
Add ShadowLod to thrown variant
2019-04-19 00:19:06 +02:00
Dedmen Miller
f1e3a91308
Translation
2019-04-19 00:17:43 +02:00
Dedmen Miller
5ccf44293f
Merge branch 'master' into cts-7290
2019-04-19 00:14:03 +02:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func ( #6937 )
2019-04-16 16:47:13 -05:00
Josuan Albin
17f4af37fa
Merge pull request #6936 from alganthe/fixArsenalNVGBlacklist
...
[ACE Arsenal] Fix NVGs not being subject to blacklisting in loadouts
2019-04-12 17:29:34 +02:00
Josuan Albin
8fe02a455f
Fix #6935
2019-04-12 14:39:28 +02:00
PabstMirror
69dc73ee45
Medical Feedback - fix heart rate effect ( #6927 )
...
* Medical Fedback - fix heart rate effect
and limit setVar for acre/tfar
* Apply suggestions from code review
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update XEH_postInit.sqf
* use "task_force_radio"
2019-04-09 10:51:59 -07:00
PabstMirror
0926d8508c
Ballistics - Remove ace mags from incompatible weapons ( #6930 )
...
Close #6924
Co-Authored-By: drofseh <drofseh@users.noreply.github.com>
2019-04-09 10:44:20 -07:00
Rutger "RedBery" Meijering
c392236843
Medical activity to non local units is not logged ( #6925 )
...
* Fixes medical events not appearing in MP (when unit is non local)
Adds name to AUTHORS.txt (forgot to do this in other PRs)
* Fixes missing oef line
* Update addons/medical_treatment/XEH_postInit.sqf
Co-Authored-By: redbery <rutger@meijering.me>
* delete rogue character
2019-04-07 17:41:28 -05:00
PabstMirror
641dee39bd
Fix trivial bugs ( #6922 )
2019-04-07 14:22:25 +02:00
commy2
c63310be95
compatibility with CBA scripted 2d optics framework
2019-04-03 20:41:15 +02:00
commy2
039ca9a053
compatibility with CBA scripted 2d optics framework
2019-04-03 20:39:11 +02:00
PabstMirror
6d50667359
Fastroping - Add user setting to confirm cutting ropes ( #6876 )
...
* Fastroping - Add user setting to confirm cutting ropes
* always confirm
* fix
* Update stringtable.xml
2019-04-03 12:18:55 -05:00
PabstMirror
ece1031c4d
RHS Compat - Add 2 round hellfire to pylon options ( #6893 )
...
* RHS Compat - Add 2 rnd hellfire pylon
Close #5957
* change magwell name
* gvar->addon
2019-04-03 11:40:14 -05:00
PabstMirror
9588b13942
Zeus/Medical - Fix modules for rewrite ( #6914 )
...
* Zeus/Medical - Fix modules for rewrite
* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
Katalam
55a7d53437
Medical - Add condition for surgicial kit ( #6916 )
...
* Added condition canStitch
* Update XEH_PREP.hpp
* Update addons/medical_treatment/functions/fnc_canStitch.sqf
Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com>
* Added example, removed arguments information and changed > to isEqualTo
* Added example in canBandage too
2019-04-03 04:36:37 -07:00
Magnetar
24a533b968
Prevent opening the medical menu if the player is unconscious ( #6915 )
2019-04-02 08:57:28 -05:00
PabstMirror
b907c9d547
Medical - Add self interaction when needed ( #6912 )
...
* Medical - Add self interaction when needed
* Update addons/medical_gui/XEH_postInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/medical_gui/XEH_postInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-01 09:40:02 -05:00
brainslush
978049eab1
Add keep engine of vehicles running after getting out ( #6885 )
...
Adds a feature which leaves the vehicle engine running after getting out. So, it requires the driver to switch off the engine of the vehicle.
2019-04-01 11:17:18 +02:00
PabstMirror
3769679237
Add tool to verify stringtable entries exist ( #6889 )
...
* Add tool to verify stringtable entries exist
* Update circle.yml
* test
* Allow running from root directory as well as from inside the tools directory
2019-03-31 15:27:51 -05:00
PabstMirror
c7e6549eb2
Cookoff - Reword settings and move to cba ( #6892 )
...
* Cookoff - Reword settings and move to cba
* Update stringtable.xml
2019-03-30 21:54:12 -05:00
PabstMirror
0052dd3af2
Interaction - Pass Magazine fixes ( #6894 )
...
Use CBA_fnc_compatibleMagazines
Fix nil return if no mags
Ensure target canAdd
2019-03-30 20:49:59 -05:00
mharis001
30b99fa20a
Medical Rewrite - Remove dropDownTriageCard function ( #6907 )
...
* Remove dropDownTriageCard function
* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
SilentSpike
ac1651c6db
Prevent bandaging when not bleeding ( #6532 )
2019-03-30 15:44:58 -05:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
...
Medical rewrite
2019-03-30 15:20:15 -05:00
PabstMirror
f2b9bf3a17
Update headers
2019-03-30 11:07:54 -05:00
PabstMirror
7f2ac32180
Fix event for items conversion
2019-03-30 09:56:21 -05:00
Rutger "RedBery" Meijering
f0fb267501
Include medical_feedback settings.sqf file ( #6903 )
2019-03-30 14:19:41 +00:00
Laid3acK
37daf3429d
Fix .300NM Berger Hybrid airFriction ( #6901 )
2019-03-29 21:40:38 +01:00
PabstMirror
047583ce1d
rectify localUnits func #4836
2019-03-25 22:49:53 -05:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings ( #6890 )
...
* Handle old public funcs, fix strings
* Update addons/medical/XEH_preInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
mharis001
8d2bba4b35
Rewrite Medical GUI ( #6831 )
...
* Add a macro for the bloodloss scaling factor
* Adjust bloodloss threshold for red icon
* Remove bloodloss color scaling factor
The issue is actually the other way round, the factor of 20 would
instantly make bodyparts red on taking a wound.
* Implemet 10 color steps provided by ShackTac
This replaces the old method of colouring the interaction menu icons
and body image selections with a new method that has 10 distinct color
steps (matching across the icons and the body image).
* Use macros for constants
* Implement blue damage colouring
This re-adds visualisation for colouring based on damage. The case where
a limb has a tourniquet will hopefully be handled by an overlayed icon.
* Tidy up file structure
* Move patient information display to medical_ui
* Make common colour conversion code into functions
* Add tourniquet icon overlay to body image
* Fix mispelling I forgot to commit
* Update icon paths to new white cross icon
* Clean mess after rebase
* Add new medical menu gui
* Add updating injury list and body image
* Add updating treatment category buttons
* Update onMenuClose function
* Delete unused functions
* Add action buttons and triage card to menu
* Move medical menu PFH to separate function
* Move setTriageStatus to treatment
* Add triage select dropdown
* Add toggle button action
* Fix mouse moving randomly when opening
* Add logs list update and remove unused functions
* Hide tourniquet icons by default
* Remove CfgInGameUI (already in feedback)
* Update patient info display
* Update triage card display
* Add settings to control interact menu actions
* Cleanup files/paths
* Move triage status update to common function
* Add icons for interact menu actions
* Modify icon color for interact menu actions
* Update canOpenMenu for new setting
* Hide pain information for unconscious
* Stringtable cleanup
* Use switch for pain text
* Change minor triage status to minimal
* Fix injury list to use new stringtable entry names
* Fix medical actions check when disabled
* Skip distance check in same vehicle
* More cleanup
* Fix CI error
* Requested changes
* Fix INJURIES string
* Fix include after comment block
* Fix missing ;
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-03-24 18:17:48 -04:00
commy2
b4d2eaae6e
Use needsRestart flag
2019-03-24 10:15:56 +01:00
commy2
5277bc083b
fix a macro
2019-03-24 09:41:36 +01:00
commy2
6cff8deba8
cleanup dragging
2019-03-24 09:28:58 +01:00
commy2
6ac2906aba
setMass method to disable collisions
2019-03-24 09:26:00 +01:00
PabstMirror
f23927d84a
Fix some strings
2019-03-24 00:50:36 -05:00
PabstMirror
2d0090422c
move settings to sqf
2019-03-24 00:37:39 -05:00
PabstMirror
c492f184b4
move dev funcs to folder
2019-03-23 19:55:04 -05:00
commy2
cea1599112
manual merge
2019-03-23 23:46:30 +01:00
PabstMirror
2ea029c219
Quickmount - optimize subActions ( #6883 )
2019-03-21 21:29:51 -05:00
Unknown
a8d28ebedc
Merge remote-tracking branch 'upstream/master' into medical-rewrite
2019-03-21 17:51:19 -04:00
Rutger "RedBery" Meijering
15036d7fd8
Fixes to unconsciousness and damageTypes systems ( #6589 )
...
* Fixes BleedingCoef having impact on bloodloss KO
Fixes incorrect var in setUnconscious
* Changes method for checking if typeOfDamage is valid
Adds check for if typeOfDamage is valid to extension version of woundsHandler
* Changes collision wound location select to a weighted system to make it more lethal at faster collisions
Adds collision and drowning damage types to config (drowning has no related wounds to prevent wounds being added while drowning).
* Fixes unneeded space
* Fixes minor mistake (body damage chance should go from 1 to 0 without ever becoming negative)
2019-03-21 19:33:51 +01:00
PabstMirror
e8970ab8ad
ACE_settings captiliaztion
2019-03-21 09:46:23 -05:00
PabstMirror
711e9073a8
Explosives - Allow setting custom timer limits ( #6882 )
2019-03-21 09:01:50 -05: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
cc11ad051d
Formatting. Lazy eval
2019-03-21 14:34:51 +01:00
Dystopian
d804d3afe6
Cleanup some functions headers and macro using ( #6866 )
...
* Cleanup frisking
* Cleanup header format
* Cleanup FUNC macro using
2019-03-20 15:18:43 -05:00
Magnetar
89927a8b94
Missing privates. Lazy evaluation.
2019-03-17 21:26:15 +01:00
Magnetar
934339d1df
Fix missing INJURY string
2019-03-17 18:38:31 +01:00
Magnetar
99f5d2ea0a
Rewrite rectify convert option ( #6825 )
...
* Rewrite Rectify - Adding option to convert vanilla medical gear
* Oops
2019-03-17 17:59:49 +01:00
Magnetar
54208a1a78
Rewrite rectify - Skip distance check if in same vehicle ( #6823 )
2019-03-17 17:58:43 +01:00
Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious ( #6822 )
...
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious
* Fix copy paste
2019-03-17 17:54:50 +01: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
79786bb9d6
Less rusty dirt
2019-03-16 13:16:54 +01:00
Dedmen Miller
2bc37b71bc
Remove rust
2019-03-16 13:06:22 +01:00
Dedmen Miller
36393ef4ee
Fix peen
2019-03-16 12:58:47 +01:00
Dedmen Miller
d795029f3c
Fix stringtable
2019-03-16 12:51:49 +01:00
Dedmen Miller
b2f20cb2d5
Rotate 20deg
2019-03-16 12:51:44 +01:00
Dedmen Miller
72427b2ece
Move banana and replace with text
2019-03-16 12:51:40 +01:00
Dedmen Miller
08dab417d0
Merge branch 'master' into cts-7290
2019-03-16 12:07:31 +01:00
commy2
df8b23b9ba
version check handle minor versions below 10
2019-03-16 11:05:01 +01:00
commy2
f248e81c65
version check handle minor versions below 10
2019-03-16 11:00:20 +01:00
commy2
e4391a8060
Merge pull request #6869 from veteran29/hideEjectSetting-polishTranslation
...
hideEjectAction - Polish translation
2019-03-15 08:23:59 +01:00
Filip Maciejewski
69b9f1e338
hideEjectAction - Polish translation
2019-03-15 00:58:12 +01:00
commy2
aef3073ee8
hide by default
2019-03-15 00:56:09 +01:00
commy2
2dbc4993d8
add setting to hide Eject action from action menu
2019-03-15 00:37:04 +01:00
PabstMirror
fb4f05e276
Prep 3.12.6 Build 43
2019-03-14 09:22:08 -05:00
PabstMirror
732368584a
Merge branch 'master' into release-3.12.6
2019-03-14 09:21:14 -05:00
PabstMirror
57db905f7c
Zeus Actions - Fix config code breaking during build ( #6864 )
...
* Zeus Actions - Fix config code breaking during build
* Update addons/rearm/XEH_preInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* formating, add note
2019-03-14 09:17:34 -05:00
markooff
b4639ed758
tlumaczenie_12_03_2019 ( #6865 )
...
Translations - Polish
2019-03-13 00:18:33 -05:00
PabstMirror
373f11338d
Prep 3.12.6 Build 42
2019-03-12 13:35:51 -05:00
PabstMirror
88d4e32f48
Merge branch 'master' into release-3.12.6
2019-03-12 13:34:41 -05:00
mharis001
695416dfe7
Arsenal - Improvements to 3DEN attribute ( #6849 )
...
* Improvements to arsenal 3DEN attribute
* Better alignment of button
* Remove magazineGroups copy
2019-03-12 11:26:40 -05:00
Dystopian
2ff614c3a2
Safe Mode - Fix disabled laser on safety switch ( #6639 )
...
* Fix disabled laser on safety switch
* Add workaround for switching to primary weapon
* Add UGL check
2019-03-12 11:26:20 -05:00
Matsuo Yutani
842f9e5d3b
Update stringtable.xml ( #6860 )
...
Updated <Portuguese> values for the Saline quantity.
2019-03-11 10:12:14 -05:00
Dedmen Miller
564fc8aa99
Trivial code fixes ( #6858 )
2019-03-10 21:42:08 -05:00
Dystopian
24d2aa647e
Repair - Fix Typhoon rear wheel change ( #6207 )
2019-03-10 21:41:06 -05:00
Dystopian
56f9d76d0f
UI - Fix selective UI in cargo ( #6585 )
...
* UI - Fix selective UI in cargo
* Add FFV not in cargo check
2019-03-10 21:40:28 -05:00
Oliver Blanthorn
262272cfba
Add proper 9bang configuration
...
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-03-10 10:03:19 +01:00
Dedmen Miller
51dfc081ac
Fix M84 lods ( #6854 )
2019-03-09 20:19:58 -06:00
Dedmen Miller
82f8095b5e
Add ui icon
2019-03-09 19:42:23 +01:00
Dedmen Miller
7ac58737f4
Add CTS 7290 9-bang flashbang grenade
2019-03-09 19:36:54 +01:00
PabstMirror
28620d86d1
fix to weaponMuzzleVelocity ( #6850 )
...
* Fix incorrect muzzle velocity displayed on magazine
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Remove garbage file
* Script header updates
* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Add Pabst' fix to weaponMuzzleVelocity
2019-03-08 09:12:07 -06:00
Dedmen Miller
5ad8b3c6bc
Arsenal - Fix incorrect muzzle velocity stat displayed on magazine ( #6844 )
...
* Fix incorrect muzzle velocity displayed on magazine
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Remove garbage file
* Script header updates
* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-03-05 10:42:04 -06:00
C0kkie
ca71375259
Captives - Use the doApplyHandcuffs function for keybind ( #6843 )
...
* Use the doApplyHandcuffs function that cabletie
* Update XEH_postInit.sqf
2019-03-05 09:40:10 -06:00
classic
c37b7644af
Update Japanese translation ( #6838 )
...
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update stringtable.xml
2019-02-28 13:36:34 -06:00
jonpas
6a5811a9b2
Increase required Arma 3 version to 1.88 ( #6836 )
...
No Uniform Restrictions got updated for 1.88
2019-02-27 17:44:39 -06:00
PabstMirror
4f1ce4a36f
Prep 3.12.6 Build 41
2019-02-27 12:59:01 -06: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
Josuan Albin
4792e74b2b
Explosives - Change SLAM magnetic to detonate upon defusal ( #6827 )
...
* Change SLAM magnetic to detonate upon defusal
* Disable explodeOnDefuseChance on SLAM timer mode
2019-02-24 14:18:01 -06:00
PabstMirror
c423e2167c
Zeus - fix script error ( #6833 )
2019-02-24 14:03:54 -06:00
Dedmen Miller
48f45ae27a
Move SelfActions from postInit to config ( #6791 )
...
* Move zeus SelfActions to config
* Port CBA PR #1048
* Move Land_Camping_Light_off_F TurnOn action to config
* Move createModule function to script func
* Update addons/zeus/functions/fnc_canCreateModule.sqf
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Teaching it a lesson about spacing
* Update CBA: script_macros_common.hpp
* Just change admin in cba macro
2019-02-24 13:36:50 -06:00
PiZZAD0X
9e609b3394
Arsenal - Add Ability to Transfer a Loadout from Saved to Default ( #6793 )
...
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable
- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements
* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`
* Tab Replacement
- remove \t
* Reverted UAV check, Params formatting, Lazy Eval
* Update addons/dragging/functions/fnc_startCarry.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
* Update fnc_startDrag.sqf
* Remove beta suggestion extra line additions
* Update addons/dragging/functions/fnc_startDrag.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
* Added ability to export loadout to defaultloadouts
Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand.
* Update fnc_buttonLoadoutsSave.sqf
* Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
* Add usage info to tooltip
2019-02-23 19:35:13 -06:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload ( #6821 )
2019-02-22 18:54:55 -06:00
PabstMirror
860fa0fcfa
Repair - Add condition check to progressBar ( #6830 )
2019-02-22 18:54:25 -06:00
PabstMirror
3ee3c5de5a
Interact Menu - Cache config actions for CAManBase ( #6818 )
...
* Interact Menu - Cache config actions for CaManBase
* Update addons/interact_menu/functions/fnc_compileMenu.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/interact_menu/XEH_preInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Apply suggestions from code review
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-02-22 18:54:07 -06:00
PabstMirror
191c4fb694
Disable debug on ace_common_fnc_readSettingsFromParamsArray ( #6820 )
2019-02-17 12:58:07 -06:00
Dedmen Miller
0c8c924487
Minedetector - Cache detectableClasses ( #6805 )
...
* Cache minedetector detectableClasses
* use compileFinal
2019-02-17 12:31:34 -06:00
Dedmen Miller
21fd4e5d16
Inventory - Cache inventory postInit config lookups ( #6803 )
...
* Cache inventory postInit config lookups
* Safety
* fix
* More better
* ugh
* add parenthesii (not trolling)
these are actually needed
```
Error in expression <_inventory_Grenades_ItemList", []];
if (!ace_inventory_Grenades_ItemList isEqual>
Error position: <!ace_inventory_Grenades_ItemList isEqual>
Error !: Type Array, expected Bool
```
* Add space
2019-02-17 11:41:48 -06:00
Dedmen Miller
7cce148513
Tagging - Cache tagging static models ( #6804 )
...
* Cache tagging static models
* Fix bugs, use compileFinal
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Use toLower
2019-02-17 11:41:25 -06:00
Dedmen Miller
af1cf2c7f6
Cargo - Cache cargo vehicle classes ( #6806 )
...
* Cache cargo vehicle classes to init
* fix
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Fix initEH being added twice for static weapons
2019-02-17 11:41:05 -06:00
Dedmen Miller
25d847ef12
Refuel - Cache refuel classes ( #6807 )
...
* Cache refuel classes
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
* Fix script errors from inner _x
2019-02-16 17:05:24 -06:00
commy2
deb7177171
Merge pull request #6815 from acemod/callCompileCleanup
...
Cleanup spacing on call COMPILE_FILE
2019-02-14 21:22:29 +01:00
Dedmen Miller
598738c22f
Common - Use CBA addons instead of activatedAddons ( #6802 )
...
* Use CBA addons instead of activatedAddons
* Better checks
* Betterest checks
* Delay call to toLower until needed
* Apply suggestions from code review
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-02-14 12:49:56 -06:00
PabstMirror
01eabdb1df
Cleanup spacing on call COMPILE_FILE
2019-02-14 12:43:02 -06:00
PabstMirror
afd957f1e7
HuntIR - Move magwell compat to huntIR config ( #6813 )
2019-02-13 12:39:10 -06:00
PabstMirror
1abe622e28
Pylons - Remove ace_zeus from requiredAddons ( #6808 )
2019-02-11 14:19:19 -06:00
commy2
30ecfb0a71
Merge pull request #6800 from acemod/cbaAddons
...
Common - checkfiles use cba's list of CfgPatches
2019-02-09 14:10:10 +01:00
commy2
435ad69835
Merge pull request #6801 from acemod/100Rnd-mags-for-MXSW
...
add 100Rnd mags magwell to all MX variants
2019-02-09 14:09:47 +01:00
commy2
b9b45cd609
add 100Rnd mags magwell to all MX variants
2019-02-09 11:41:05 +01:00
PabstMirror
af3b8ec7fc
Common - checkfiles use cba's list of CfgPatches
2019-02-08 16:39:57 -06:00
commy2
dc45072010
Merge pull request #6799 from dedmen/minedetectorPreStart
...
Compile minedetector scripts at preStart
2019-02-08 18:02:37 +01:00
Dedmen Miller
c9dc84d170
Compile minedetector scripts at preStart
2019-02-08 14:55:06 +01:00
mharis001
fa101d859a
Pylons - Update configure pylons action ( #6381 )
2019-02-07 17:12:48 -06:00
PabstMirror
ff5eb34e10
Interaction Menu - Only compile self actions when needed ( #6792 )
...
* Interaction Menu - Only compile self actions when needed
* Update XEH_clientInit.sqf
* fix spellling
* format/comments
* Don't compile actions on headless servers
* Update addons/zeus/XEH_postInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-31 19:25:16 -06:00
Brandon Danyluk
639d3fdfa1
cfgSkeletons indentation formatting fixes ( #6796 )
...
* abc
* Revert "abc"
This reverts commit bcb4214bd9
2019-01-31 19:22:33 -06:00
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key ( #6732 )
...
* MissileGuidance - Allow using vanilla fire mode key
Fix #6595
* Javelin - Backwards compatiblity with CUP
* Add support to RHS compat
* comment
2019-01-30 22:11:01 -06:00
PabstMirror
05d1c62c1f
Rearm - Fix locality issues with setMagazineTurretAmmo ( #6787 )
2019-01-30 18:48:40 -06:00
PabstMirror
6bee6d5cd8
Rearm - Use non-ambigious magazine names ( #6761 )
...
* Rearm - Use non-ambigious magazine names
Close #6414
Also fix missing caliber for B_20mm_AP
* Update fnc_getMagazineName.sqf
2019-01-30 18:31:01 -06:00
PabstMirror
32ffe3243c
Zeus - Paradrop Cargo ( #6743 )
...
* Zeus - Paradrop Cargo Waypoint
* move script component
* cfgpatches, localize, fix getModuleDestination call
* cleanup debug
2019-01-30 18:30:42 -06:00
Josuan Albin
8450555f0c
Arsenal - Fix arsenal not working reliably on remote AI units. ( #6784 )
...
* Fix 6701
* Update addons/arsenal/functions/fnc_onArsenalClose.sqf
Co-Authored-By: alganthe <alganthe@live.fr>
2019-01-26 14:13:38 -06:00
PabstMirror
3df805306b
Arsenal - Fix script stat script errors for odd weapons ( #6794 )
2019-01-26 14:13:19 -06:00
commy2
547dfff683
Common - optimize toHex ( #6788 )
...
* optimize toHex
* Use predefined hex array in preInit
2019-01-26 11:01:41 -06:00
chaot3ch
5f4dd9de5e
Fixed Typo from change to chance ( #6789 )
...
Change to change change into chance
2019-01-24 20:20:49 +01:00
PiZZAD0X
13193d3e6d
Dragging - Additional weight override parameter for setCarryable/setDraggable ( #6780 )
...
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable
- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements
* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`
* Tab Replacement
- remove \t
* Reverted UAV check, Params formatting, Lazy Eval
* Update addons/dragging/functions/fnc_startCarry.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
* Update fnc_startDrag.sqf
* Remove beta suggestion extra line additions
* Update addons/dragging/functions/fnc_startDrag.sqf
Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
2019-01-20 10:23:24 -06:00
mharis001
c4655148e0
Add apex goggles entries ( #6778 )
2019-01-16 09:40:46 -06:00
madpat3
f6c4ec5f09
Wirecutters - Add compatibility with more fences from CUP ( #6777 )
...
and another one
2019-01-15 20:16:12 -06:00
PabstMirror
2f3fd06fcf
Medical - Fix stringtable ( #6774 )
2019-01-14 11:41:29 -06:00
pokertour
4a5b5113cd
FastRoping - Add rope items which deploy at lengths ( #6498 )
...
* Update stringtable.xml
* Update config.cpp
* New CFGWeapon
* Update CfgVehicles.hpp
* Update fnc_deployRopes.sqf
* Update CfgVehicles.hpp
* Update CfgWeapons.hpp
* Update CfgVehicles.hpp
cheapest check before others
* Update fnc_deployRopes.sqf
Corrected the double remove.
* Cleanup PR
Add setting, move rope len to config, simplify strings, add rope image, fix rope unwind length
* Add setting name to stringtable
* Update stringtable.xml
French translation for settings
2019-01-11 21:05:25 -06:00
PabstMirror
188aabe699
Medical - Add new setting to hide self-interaction actions ( #6756 )
...
* Medical - Hide self interaction menu if disabled
* Add new setting
2019-01-11 20:58:13 -06:00
PabstMirror
59aa38185a
Dragging - Fix player getting locked with isCarrying ( #6770 )
2019-01-07 09:45:48 -06:00
Jo David
73386c5391
remove the only entry of "Original" and replace it by "English" ( #6766 )
2019-01-04 08:42:46 +01:00
Cyruz143
a18f4180ac
Medical - Adding option to convert vanilla medical gear ( #6680 )
...
* Adding option to convert vanilla medical gear
* Better wording on setting description
* Shortern var names
* Shorter settings title
* 3 options (enabled, just remove, disabled)
2019-01-03 14:26:22 -06:00
McDiod
fcfe278f7f
markers - add setting allowing only marker creator to move ( #6734 )
...
* markers - add setting allowing only marker creator to move
* shorten setting display names
* delete some whitespace, superfluous command
* single arg needs no array
* delete some whitespace
* don't save directPlayID default value
* Save array of user placed markers
2019-01-03 13:31:21 -06:00
PabstMirror
f57d5ac180
Medical - Skip distance check if in same vehicle ( #6757 )
...
* Medical - Skip distance check if in same vehicle
* Update addons/medical/functions/fnc_displayPatientInformation.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-02 09:56:26 -06:00
PabstMirror
da0ab4617a
WeaponSelect - Fix putWeaponAway animation ( #6758 )
2019-01-02 09:56:07 -06:00
PabstMirror
f4f67e262d
Medical - Add vehicle hint when loading unconc ( #6759 )
2019-01-02 09:55:25 -06:00
PabstMirror
6d8cdd9b1d
Interaction - Disable open door action on houses with no user actions ( #6760 )
...
Fix #6544
2019-01-02 09:55:03 -06:00
PabstMirror
e32bcb1f9a
Arsenal - Adjust macros for newest pboProject
2019-01-01 12:04:43 -06:00
NeilZar
9eb7d0d75d
Change PBO check error messages ( #6751 )
...
**When merged this pull request will:**
- Change the error messages for PBO version checking
They were a bit confusing. `Missing server addon(s)` was most of the time interpreted as `You're missing server addon(s)`.
2018-12-30 05:11:19 +01:00
Jo David
4ba5a3954e
Remove Redundancy in flashbangExplosionEh ( #6749 )
2018-12-29 11:29:29 -06:00
madpat3
0fe6a92bf5
Wirecutters - Add compatibility with more fences from CUP ( #6750 )
...
another one ;)
2018-12-29 14:29:11 +01:00
Jo David
cf1910eb79
Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) ( #6746 )
...
* Remove ear ringing from flashbangs when wearing protective gear, reduce strength by damageCoefficent
2018-12-28 14:46:13 +01:00
alef
de83f2c2b7
Italian translation updates ( #6738 )
...
* 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
* Italian translation update
Remove BOM. Colors uppercase for consistency.
Revert "Remove BOM. Colors uppercase for consistency."
This reverts commit 0fa9c35f9e46437438a384cee37cb8d3e5322433.
Revert "Italian translation update"
This reverts commit d53e56ce70a606e773aa6fe2a53485aeb5419974.
Re-add Italy
* fix polish
2018-12-17 12:10:06 -06:00
PabstMirror
dd94666c63
Disposable - Ignore secondary muzzles ( #6737 )
...
Don't wipe weapon when firing spotting rifle muzzle
Close #6736
2018-12-16 13:23:14 -06:00
Dystopian
31fa8cbdd4
Fix remote control menu ( #6733 )
2018-12-15 15:29:18 -06:00
Dystopian
cea5b8c6f2
Fix zeus creating after 1.86 ( #6726 )
2018-12-15 15:28:32 -06:00
Jakub Ochalski
91182482db
Polish Translation ( #6730 )
...
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
PabstMirror
f81f5830c5
Illumination Flares ( #4506 )
...
* Illumination Flares
* add M992 IR flare
* update debug script
* comments
2018-12-06 20:28:13 -06:00
Brandon Danyluk
1511ecc1c0
SACLOS and HOT Missiles ( #6708 )
...
* abc
* Revert "abc"
This reverts commit bcb4214bd9
2018-12-06 20:27:30 -06:00
Josuan Albin
de828a2997
Parachute - Fix "hide altimeter" setting ( #6721 )
...
* Fix hide altimeter setting not working
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Clean up altimeter PFH
* Put ! back inside
2018-12-06 16:36:35 -06:00
diwako
88eb743485
Medical - Show tourniquets in Medical and Patient information ( #6681 )
...
* Show tourniquets in Medical and Patient information
* Ace styling
* Move tourniquet update function to medical
2018-12-06 13:41:23 -06:00
PabstMirror
c9ee0995c3
mk6mortar - Tweak charge UI for 1.86 ( #6718 )
2018-12-06 13:37:44 -06:00
PabstMirror
9162055161
Prep 3.12.5 Build 40
2018-12-03 21:03:58 -06:00
Jo David
26786f93a9
add bwc class name for orange chemlight ( #6717 )
2018-12-03 12:04:22 -06:00
PabstMirror
25c10e8cf6
Ballistics/Realistic Names - Integrate P90 Compat ( #6667 )
...
* Ballistics/Realistic Names - Integrate P90 Compat
* Update CfgWeapons.hpp
* Remove old compat addon
* Update addons/realisticnames/stringtable.xml
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/realisticnames/CfgWeapons.hpp
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/ballistics/CfgWeapons.hpp
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/ballistics/CfgWeapons.hpp
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2018-12-03 12:03:49 -06:00
commy2
438e34ac90
change an ERROR to WARNING in Markers component
2018-12-02 11:50:02 +01:00
Dedmen Miller
ba18d5f748
Custom Materials for tagging ( #6704 )
...
* Allow custom materials for tags
* Fix quickTag
* More betterer
2018-11-29 10:38:42 -06:00
Dedmen Miller
b3e0135e32
Fix Armake problems ( #6697 )
...
* Armake model.cfg fix
* Spaces!
* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
PabstMirror
cba6f72c9f
Prep 3.12.4 Build 39
2018-11-27 09:48:36 -06:00
PabstMirror
9dfa6f0511
Merge branch 'master' into release-3.12.4
2018-11-27 09:46:24 -06:00
PabstMirror
79b77bc0da
Javelin - Can disable thermal requirement via code ( #6706 )
2018-11-27 00:09:45 +01:00
classic
31a645997f
Update Japanese translations ( #6705 )
...
**When merged this pull request will:**
- Update translations for Japanese
- fix the miss translations
2018-11-27 00:09:32 +01:00
PabstMirror
1c2e23052b
Prep 3.12.4 Build 38
2018-11-25 10:53:15 -06:00
PabstMirror
bd5b360d7e
Merge branch 'master' into release-3.12.4
2018-11-25 10:51:31 -06:00
commy2
d0bbc111bc
disable debug mode
2018-11-25 15:05:05 +01:00
commy2
7b8fbe10b2
fix moved markers not synched
2018-11-25 15:02:27 +01:00
PabstMirror
a357675ad3
MicroDagr - Fix waypoint scrolling ( #6700 )
...
Fix #6521
2018-11-19 17:57:02 -06:00
PabstMirror
03e01f02df
Arsenal - Fix script error from hide changes ( #6699 )
...
https://github.com/acemod/ACE3/pull/6694/files#r234542372
2018-11-19 13:05:44 -06:00
PabstMirror
cce5d804c4
Prep 3.12.4 Build 37
2018-11-18 23:57:54 -06:00
PabstMirror
e3421cbf8f
Arsenal - Add config to force show (mortars) ( #6694 )
...
* Arsenal - Add config to force show (mortars)
* Update CfgMagazines.hpp
* Update arsenal-framework.md
2018-11-18 23:04:50 -06:00
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
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
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
Jo David
db93a42891
add muffling to new LOW headsets ( #6106 )
2018-01-31 16:19:28 -06:00
PabstMirror
1b6dc5ae2d
HuntIR - Fix connecting when ammo is null ( #6099 )
...
Fix #6093
`[_nearestHuntIRs select 0] call FUNC(cam);` would pass nill
Also delay opening GUI for a frame to prevent issue with interaction menu
2018-01-30 21:50:24 -06:00
PabstMirror
4857294510
Advanced Throwing - Disable when controlling UAV ( #6092 )
...
Close #6069
2018-01-30 10:54:34 -06:00
mharis001
b30e188d1a
Change ace_map settings to use CBA init directly ( #5984 )
...
* Make default channel setting a list
* Convert more map settings to CBA
* Give BFT settings own category
* Remove '?' from end of setting display names
* Fix mistake of ACE_Settings removal (movedToSQF = 1)
* Move settings to initSettings.sqf
2018-01-28 15:50:28 -06:00
sbng-PAPA
6ce8b8473a
korean translate 3.12.x ( #6071 )
2018-01-28 15:42:32 -06:00
Josuan Albin
29a0b2ef09
Misc arsenal fixes ( #6083 )
...
* Change backpack and scope checks in scanConfig and addVirtualItems
Reason: was not a good implementation
Might cause issue of people compalining about tents.
* Give IDC to menuBar controls, disable import button in MP
Reason: copyFromClipboard is disabled in MP
* Add tooltip strings for the loadouts, export, import menu buttons
* Remove double space in onArsenalOpen
2018-01-28 15:39:46 -06:00
Brunius
cc503e041b
Add pylon whitelist option ( #6080 )
...
* Adding pylon whitelist option
* Changing tabs to spaces :(
* Changing to use QGVAR
* Changing name in QGVAR to more clearly reflect function of variable
* Docs for the magazine whitelist function in pylons
* Changes to match style guide
* More docs
* More tabs
* Update pylons-framework.md
* Update pylons-framework.md
2018-01-28 15:38:48 -06:00
BaerMitUmlaut
3c04d61a0d
Fix medical AI activation ( #6077 )
2018-01-24 19:08:39 +01:00
Mark Ruffner
f46082a1fe
fix (another) missing call ( #6079 )
2018-01-24 08:18:42 +01:00
Mark Ruffner
8ba81c53a3
Add spectator handling of grenades ( #6012 )
...
* Handle non-local vanilla grenade tosses
* handle advanced throwing grenades
* Track through events
* Add missing calls
2018-01-23 00:31:44 +01:00
PabstMirror
46a31e1f9c
Add ace hellfire support to rhs apaches ( #6056 )
...
Close #5956
2018-01-22 23:15:23 +01:00
Christian Klemm
7ba394c711
Enabled cancel button when exiting arsenal
2018-01-19 18:21:01 +01:00
classic
00af6844cd
Update jpn translations ( #6031 )
...
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
2018-01-18 20:16:24 -06:00
jonpas
88963cdae8
Prepare release 3.12.1 (build 2)
2018-01-15 21:35:34 +01:00
jonpas
7c97e5fab6
Merge branch 'master' into release-3.12.1
2018-01-15 21:34:21 +01:00
Dystopian
70ca4d01a7
Fix house-type object carrying in building ( #6049 )
2018-01-15 19:02:06 +01:00
Josuan Albin
b7606800a1
Match case for magazines in fillRightPanel (ACE Arsenal) ( #6044 )
...
* Match case for magazines in fillRightPanel
Apparently you can have different case between the entry in the weapon magazines array and its actual configname...
* Add possible fix for the mission end bug
* Add ded's proposed fix, remove closeOnMissionEnd
CloseOnMissionEnd is bugged in 3DEN and force close the display after it's opened
2018-01-15 18:21:38 +01:00
ulteq
a5523bc0c7
ATagMX - Allow one decimal place for the bullet mass (in grams) ( #6041 )
...
Closes : #6040
2018-01-10 19:44:53 +01:00
jonpas
2303f345af
Prepare release 3.12.1
2018-01-07 02:49:17 +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
Dystopian
e24ed0fa92
Fix back blast if damage not allowed ( #6030 )
2018-01-06 18:24:44 -06:00
commy2
3eddd5ef72
fix make error ( #6028 )
2018-01-06 16:57:44 +01:00
PabstMirror
2ced42ae3a
Cleanup markers
2018-01-06 00:52:57 -06:00
Josuan Albin
3839f2f5fc
Minor arsenal fixes ( #6025 )
...
* Change "ok" to "apply" while in 3DEN
* Move execNextFrame from initBox's action to openBox
This was done in order to avoid crashes on custom actions
2018-01-06 01:30:33 +01:00
SilentSpike
dbe6a04e8a
Optimise spectator loops ( #6021 )
...
* Optimise spectator loops
`count` is only quicker than `forEach` when the final command returns a
boolean or nil. `forEach` is quicker if the final command returns any
other data type.
* Use `forEach` instead of `count`
2018-01-06 01:30:15 +01:00
PabstMirror
4eb7868f1a
NVG - Fix grain and color effects ( #6018 )
2018-01-05 18:23:56 -06:00
SilentSpike
fd815c5ed8
Serialize spectator help control variable ( #6023 )
...
Could result in an on-screen error if the spectator API was used in a scheduled environment.
2018-01-05 20:41:43 +00:00
Josuan Albin
0acbde1489
Various ACE Arsenal fixes (see description) ( #5996 )
...
* Copy the array properly when using preStart cache in openBox
* Fix add and removeVirtualItems erroring out when passing false as arg
* Disable face, voice, and insignia tabs in 3DEN
* Move grenadeList and putList outside of foreach in scanConfig
* Fix grenadeList and putList indentation
* Change the camera handling in onArsenalClose
Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN.
Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed.
* Fix message control overflowing, move width defines to defines.hpp
* Add ability to exit arsenal and not apply a loadout in 3DEN
* Add ACE3 logo to common, fix config pathing to a non existing file
2018-01-05 18:56:21 +01:00
PabstMirror
4379346b2f
Medical - Increase revive max time to 60 min ( #5992 )
2018-01-05 18:55:27 +01:00
commy2
3c41d37417
overhaul movable markers ( #5922 )
...
* overhaul movable markers
* moving markers setting
* disable debug
* fix conflict with map gestures
2018-01-05 18:55:00 +01:00
SilentSpike
fb3fc09997
Center spectator map correctly in FPP ( #6010 )
...
Instead of centering on the camera object use `positionCameraToWorld` to get the actual viewpoint
2018-01-04 18:03:38 +00:00
Dystopian
71909a9be3
Add custom repair positions to all quadbikes ( #6011 )
2018-01-03 11:01:17 +00:00
commy2
b7dd5c5692
add sandbag preview image, proper editor category ( #6008 )
2018-01-02 11:01:25 -06:00
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString ( #6007 )
...
* Deprecate common function numberToDigitsString
2018-01-02 17:00:01 +00:00
PabstMirror
966cf8d748
Cleanup maverick ( #6000 )
...
* Cleanup maverick config
* x
* Cleanup ACE_Comanche_Test
* fix formatting (and poke Travis)
2018-01-02 10:37:16 -06:00
SilentSpike
1f818981ed
Fix unconscious hidden status not being reset on respawn ( #6006 )
2018-01-02 16:18:44 +00:00
SilentSpike
4bb16c043c
Optimise cellphone IED function slightly ( #6005 )
...
* Optimise cellphone IED function slightly
* Fix distribution and use CBA function
2018-01-02 16:18:12 +00:00
commy2
183fc93c5a
Merge pull request #6001 from acemod/fishykins-master
...
add allowFadeMusic setting
2018-01-02 17:12:47 +01:00
commy2
306c449986
implement pr #5385
2018-01-02 16:36:17 +01:00
commy2
6520fdb624
implement pr #5385
2018-01-02 16:34:13 +01:00
commy2
ef77bb077e
Merge pull request #5987 from acemod/setHidden-forgetTarget
...
make setHidden use forgetTarget
2018-01-02 16:28:10 +01:00
commy2
32755e4e91
forget only different side
2018-01-02 16:26:13 +01:00
commy2
bcf834d2c7
Merge pull request #5894 from acemod/ownerEvent-instead-of-local-logic
...
use ownerEvent instead of game logics
2018-01-02 16:16:58 +01:00
commy2
b0d0029c7a
disable debug mode
2018-01-02 16:13:57 +01:00
commy2
8ecd44b9f2
fix a bug in place after anim adjustment
2018-01-02 16:04:21 +01:00
commy2
be56c991ed
Update stringtable.xml
2018-01-02 16:00:35 +01:00
commy2
3e2ef7ba36
editor icon, editor category, delete on death
2018-01-02 15:56:15 +01:00
commy2
3b02e5e90e
Merge branch 'master' of https://github.com/acemod/ACE3 into tripd-updates
2018-01-02 15:14:04 +01:00
commy2
1f2b187ee3
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2018-01-02 15:11:49 +01:00
commy2
f8ff279c6b
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2018-01-02 15:11:14 +01:00
commy2
5c9d1ada84
Merge pull request #5191 from Arcanum417/medical-rewrite-kill-ai
...
[Medical Rewrite] Options to enable insta-death for AI
2018-01-02 15:09:47 +01:00
commy2
b9d792ebcd
merge
2018-01-02 15:08:10 +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
7e3f36e23d
Merge branch 'master' of https://github.com/acemod/ACE3 into fishykins-master
2018-01-02 14:37:54 +01:00
commy2
6dec4c8259
Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master
2018-01-02 14:37:13 +01:00
xrufix
d3e93c9dc1
Add Kh25ML Laser Guided AGMs ( #5912 )
2017-12-31 18:01:09 -06:00
commy2
7d7d37409e
Merge pull request #5971 from JoramD0/incenTweak
...
Tweaked effective area of incendiary grenades
2017-12-31 13:40:37 +01:00
commy2
66fc592dbe
destruction vs effect
2017-12-31 13:36:55 +01:00
commy2
ed97be0e06
radius vs area
2017-12-31 13:33:42 +01:00
commy2
20ea56100f
Merge pull request #5908 from xrufix/realisticnames
...
Updates to realisticnames
2017-12-31 13:31:31 +01:00
commy2
89e1fc243a
Merge pull request #5995 from Dystopian/add_macro_brackets
...
Add parentheses to GETVAR macros
2017-12-30 19:15:00 +01:00
Dystopian
03ade05611
Add parentheses to GETVAR macros
2017-12-30 16:38:45 +03:00
PabstMirror
7d998acc71
Fix rearm entire vehicle argument order ( #5993 )
2017-12-30 12:46:11 +00:00
Ľuboš Lendáč
38e7913caf
Add HealTime modifiers to medical settings ( #5188 )
...
* Add modifiers of TreatmentTime of PAK and Medkit to settings
* Fix indents and stringtable tags
* Fix Healtime vars
* Absolute time for PAK to settings
* Add Medkit Healtime setting
2017-12-30 12:01:23 +00:00
commy2
f4e8972a37
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2017-12-30 10:08:39 +01:00
Josuan Albin
1b332129e6
Add QOL improvement for the ACE Arsenal loadouts screen ( #5973 )
...
* Add search bar in loadouts screen
* Add onKeyDown support for the loadouts display
* Add ctrl+key support to both editbox in the loadouts screen
* Fix syntax error
2017-12-30 01:13:06 -06:00
PabstMirror
65fe101aaf
Arsenal - Filter items with scopeArsenal = 0 ( #5988 )
...
* Arsenal - Filter items with scopeArsenal = 0
* change order
2017-12-29 12:39:24 -06:00
PabstMirror
6d2da10558
Arsenal - Add Missing semicolons ( #5990 )
2017-12-29 12:39:02 -06:00
SilentSpike
dfe803107a
Fix displayName of spectator respawn template ( #5989 )
2017-12-29 16:47:49 +00:00
commy2
13e52b4410
make setHidden use forgetTarget
2017-12-29 02:48:20 +01:00
SilentSpike
81722abeac
Use engine command to select weighted spall size ( #5985 )
...
* Use engine command to select weighted spall size
* Remove multi-line macro
2017-12-28 19:08:11 -06:00
commy2
542849cdf7
merge
2017-12-27 11:37:54 +01:00
commy2
8bca2ac73b
Merge branch 'master' into arsenal-main-menu
2017-12-27 11:36:32 +01:00
bux
747a3aa111
improve tooltip
2017-12-27 08:14:26 +01:00
PabstMirror
e66e9c2453
Show cba settings in debug button ( #5978 )
2017-12-26 17:43:42 -06:00
Josuan Albin
69f7484f12
Add a function to port BI VA loadouts to ACE Arsenal ( #5943 )
...
* Add a function to port BI VA loadouts to ACE Arsenal
* Fix typos in the header
* Remove override argument, add button in 3DEN
* Add null player exception
* Remove unused passed argument
* Add error messages to portVALoadouts
* Change error messages
* Add missing dot in string
2017-12-26 17:43:33 -06:00
Jo David
54320eb451
Fix(explosives): Selecting a cellphone as an IEDs trigger would throw an error ( #5963 )
...
* move code var to outer scope
* run closeDialog only for the player
2017-12-26 17:20:43 -06:00
PabstMirror
fe531d71f3
Scopes - Fix undefined enum types ( #5969 )
2017-12-26 17:09:03 -06:00
commy2
057cc8d6d5
rename 'close' to 'try' in arsenal
2017-12-24 20:41:13 +01:00
commy2
4fb556d7ac
make bots not talk
2017-12-24 20:27:33 +01:00
commy2
bb47249679
make bots not talk
2017-12-24 20:09:34 +01:00
commy2
2d2bf2acd4
save and restore last loadout
2017-12-24 20:07:33 +01:00
JoramD
fcba14ef71
Tweaked affected area for objects
2017-12-24 12:06:18 +01:00
JoramD
f0eb7dd479
Tweaked effect size of AN-M14
2017-12-24 11:30:02 +01:00
Josuan Albin
12208b4ebe
Fix some scaling issues in ACE Arsenal ( #5959 )
...
* Fix various text not resizing properly on lower resolutions
* fix spacing of arsenal the menu bar
* Increase weight control width to avoid cutoff
2017-12-23 10:17:39 -06:00
commy2
7797d9906b
fix a crash
2017-12-23 02:19:53 +01:00
commy2
4db844e596
merge
2017-12-23 01:47:43 +01:00
PabstMirror
8e6e2b3283
Ignore explosives placed without ace_explosives ( #5962 )
2017-12-22 18:34:35 -06:00
commy2
f31eb52b08
oops
2017-12-22 21:54:55 +01:00
commy2
96f3791855
final code conversions, esc to exit
2017-12-22 21:41:13 +01:00
commy2
e3c94821a2
ace version of createUnit
2017-12-22 20:26:25 +01:00
commy2
6865c95f16
redo arsenal scripting
2017-12-22 19:44:31 +01:00
bux
774aca4a1d
use pixel drawn ace logo instead of antialiased
2017-12-22 18:00:07 +01:00
commy2
33c2b96bb3
converting to ace standards
2017-12-22 15:09:06 +01:00
commy2
ac09c0f75a
enable the debug console
2017-12-22 11:26:29 +01:00
bux
57dc1de4ff
adjust icon width for main menu
2017-12-22 11:14:48 +01:00
commy2
f6d640b917
icon assets
2017-12-22 11:05:32 +01:00
commy2
0a4c464af8
logos, begin to acify, enable debug console
2017-12-22 10:19:30 +01:00
commy2
1c2ebd0452
add ace arsenal button to main menu
2017-12-22 09:39:01 +01:00
PabstMirror
4cfa64d73a
Laser - Reset hud when exiting UAV ( #5947 )
2017-12-21 16:49:48 -06: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
jonpas
2ac191dbf7
Prepare release 3.12.0 (build 3)
2017-12-20 16:44:32 +01:00
PabstMirror
c2d6fa53d4
Remove enum warnings ( #5931 )
2017-12-19 12:13:38 -06:00
classic
4e60847c95
Update jpn translation ( #5930 )
...
* Update Jpn translation
* Update Jpn translation
2017-12-19 18:35:49 +01:00
commy2
e2a863751f
Arsenal numpad enter for search ( #5928 )
2017-12-19 18:35:32 +01:00
jonpas
80165fb9c0
Prepare release 3.12.0 (build 2)
2017-12-18 17:43:15 +01:00
jonpas
c4637da6af
Merge branch 'master' into release-3.12.0
2017-12-18 17:40:27 +01:00
PabstMirror
c8b9483b44
Nightvision - Add setting for blur when ADS ( #5924 )
...
* Nightvision - Add setting for blur when ADS
* Allow blocking brightness control
2017-12-18 17:38:03 +01:00
SilentSpike
0a31a24fdf
Fix FRIES being applied when attribute unchecked ( #5926 )
2017-12-18 17:30:36 +01:00
Dystopian
1385f12542
Add brightness control when NV effects disabled ( #5913 )
...
* Add brightness control when NV effects disabled
* Add initial ajust and commit. Add comment to math
* Fix math comment
* Change initial level to -3
2017-12-17 13:09:41 -06:00
rufix
8f5ff1363f
Revert 3c6136bfaf
2017-12-17 12:55:30 +01:00
rufix
2c10265c26
Rename M200 back to "Tropisch"
2017-12-17 12:46:43 +01:00
Josuan Albin
af09fc652a
Add Ctrl+F search shortcut for ACE Arsenal ( #5910 )
...
* Add Ctrl+F search shortcut
* Add ctrl+A and ctrl+x support to search boxes
2017-12-16 12:33:41 -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
mharis001
5371fb9eef
Make attach/detach hint look uniform ( #5900 )
...
Add space at the bottom of hint to make it look nicer
2017-12-16 16:20:43 +01:00
commy2
0eccca6174
display carried weight in SI and imperial ( #5918 )
2017-12-16 04:50:17 +01:00
Josuan Albin
7bc396ba24
Update how weight is displayed in ACE arsenal ( #5909 )
2017-12-16 04:50:02 +01:00
Josuan Albin
a959ae69fd
Revert "Fix global behavior in add / remove virtual items funcs ( #5887 )" ( #5911 )
...
This reverts commit 5fa0179d06
2017-12-15 12:29:09 -06:00
ulteq
f9d729c874
Scopes - Fix 'boreHeight' and 'baseAngle' MP synchronization ( #5917 )
...
* Scopes - Unify 'getBaseAngle' & 'getBoreHeight' API
* Scopes - Fix boreHeight and baseAngle MP synchronization
* TODO: Cache the calculation or use publicVariables instead
* Cleanup unused GVARs
* Scopes - Cache getBaseAngle and getBoreHeight results
* Sync baseAngle/boreHeight
* Remove boreHeight/Angle caching
* Cleanup inv check
2017-12-15 10:22:31 -06:00
PabstMirror
a97dea896f
scopes - Fix base angle ( #5916 )
2017-12-15 10:25:00 +01:00
Andrea Verano
2ecc835438
Italian Translation Update ( #5914 )
...
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes
Fixed some strings in:
-Medical
-Scopes
2017-12-14 23:32:51 -06:00
commy2
2f3c43572b
dedmen's model fixes
2017-12-14 15:51:14 +01:00
rufix
3d1e9ac13e
"SIG 556 (Wüstentarn)" -> "SIG 556 (Tarnmuster)"
2017-12-14 13:56:48 +01:00
rufix
a4a9f63dfb
Removed international names for LSVs, added international names for JAS 39 Gripen
2017-12-14 13:49:06 +01:00
ulteq
b77c4d4667
Rangecard - Fixes broken bore height display ( #5907 )
...
* Reverts the getBoreHeight API change from:91425f8576
2017-12-14 13:43:32 +01:00
rufix
b9d8368b1a
Schreibe "sandfarben" klein.
2017-12-14 13:33:47 +01:00
rufix
2a61ab4bdf
Add missing realisticnames to Syndikat vehicles/aircraft.
2017-12-14 12:21:23 +01:00
rufix
b8e62af673
Add Gryphon/Gripen plane to realisticnames
2017-12-14 12:13:00 +01:00
rufix
497fd080ea
Add Tanoan Ifrit/Karatel to realisticnames
2017-12-14 12:06:10 +01:00
rufix
456f59fc2f
Add Tanoan Marid/Otokar ARMA to realisticnames
2017-12-14 12:04:37 +01:00
rufix
123c5fce37
Add LSVs to realisticnames.
2017-12-14 11:56:57 +01:00
rufix
d5b6b70267
Add ACE tag to Maverick L strings
2017-12-14 11:32:30 +01:00
rufix
22a478019b
Add count of rockets in missiles DAR.
2017-12-14 11:02:57 +01:00
rufix
5448795226
German translations of HK Rifles
2017-12-14 10:59:16 +01:00
rufix
3e1ac5e4ed
German translation of M200.
2017-12-14 10:58:10 +01:00
rufix
7184243251
Rename M249 to FN Minimi.
2017-12-14 10:57:20 +01:00
rufix
c50a1e5796
German translations of Marksman-DLC rifles and MGs
2017-12-14 10:54:14 +01:00
rufix
b0e93e10a8
Rename "TAR-21 EGLM" to "GTAR-21 EGLM".
2017-12-14 10:48:52 +01:00
rufix
9b7ece0ab1
Use "ß" in "Weiß" for M83.
2017-12-14 10:39:27 +01:00
rufix
3c6136bfaf
Rename Germam stromg "ZSU" to "SSU" ("З" is transcribed as "s" in German)
2017-12-14 10:34:15 +01:00
rufix
a9e7e31a4b
Rename "KamAZ" to "KamAS" in German strings (Russian "З" is transcribed as "s" in German).
2017-12-14 10:30:42 +01:00
rufix
023e189786
Rename "Punisher" to "Karatel" which seems to be the official name used.
2017-12-14 10:29:20 +01:00
rufix
838b4e9945
Use "sMG" instead of "SMG" for "schweres Maschinengewehr" (HMG)
2017-12-14 10:22:56 +01:00
PabstMirror
0a87bd134b
Add cookoff setting category ( #5903 )
...
Fix #5902
2017-12-13 16:04:05 -06:00
commy2
36626d26d8
Merge remote-tracking branch 'origin' into tripd-updates
2017-12-13 23:00:26 +01:00
jonpas
18d107508b
Merge branch 'master' into release-3.12.0
2017-12-12 18:06:24 +01:00
commy2
1a28d69b9e
remove obsolete mine jip synch ( #5895 )
2017-12-12 18:01:47 +01:00
Christian Klemm
d83ce62ee8
Adjusted dig surface whitelist for jungle maps ( #5897 )
...
* Added grasstall to dig surface whitelist
* Added forest to dig surface whitelist
2017-12-12 17:20:55 +01:00
classic
51f29b7b37
Update Japanese translation ( #5891 )
...
* Update Jpn translation
* Update Jpn translation
* Add Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn tranlastion
* Update Jpn tranlation
* Update Jpn translation
* Updatr Jpn translation
* Update Jpn translation
* Update Jpn translation
* Update Jpn translation
* fix for incorrect indentation
* re-fix incorrect indentation
2017-12-12 17:17:51 +01:00
Jo David
952af6fa64
Merge pull request #5896 from mharis001/master
...
Revert slideshow module to scope = 2
2017-12-12 17:12:28 +01:00
mharis001
b3c8a243cb
Revert slideshow module to scope = 2
...
Slideshow is mission utility not setting
2017-12-12 10:54:48 -05:00
jonpas
047591bc2b
Prepare release 3.12.0
2017-12-12 12:40:41 +01:00
commy2
4319b79b45
use ownerEvent instead of game logics
2017-12-11 20:11:21 +01:00
