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
Dedmen Miller
51dfc081ac
Fix M84 lods ( #6854 )
2019-03-09 20:19:58 -06: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
