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
.
* Fix huntIR configs
* Use CBA_65x39_Mk200 well
2018-10-13 13:11:57 -05:00
Dystopian
4ff8fc13ff
Fix turrets without weapon treated as gunner ( #6636 )
2018-10-13 12:07:51 -05:00
Dystopian
d7c7ead574
Zeus - Add Repair and Rearm interactions ( #6632 )
...
* Add Repair and Rearm interaction to zeus
* Optimize remoteControl statement
2018-10-13 12:07:32 -05:00
PabstMirror
6ad28439b0
Cargo - Revert Load Times Normalize ( #6638 )
2018-10-13 11:59:16 -05:00
Laid3acK
6363f73fb8
AMS and KHS realistic name ( #6605 )
...
Realisticnames - Update AMS and KHS's name
2018-10-12 23:00:20 -05:00
Laid3acK
468ab249a2
Scopes - Update AMS, KHS and LRPS "ACE_ScopeAdjust" ( #6606 )
...
* ams_khs_scopeadjust
* Update CfgWeapons.hpp
2018-10-12 22:58:35 -05:00
mharis001
c95877d823
Cargo - Add load time coefficient setting ( #6618 )
...
* Add loadTimeCoefficient setting
* Call settingChanged function
* Normalize load coefficient
2018-10-12 22:37:05 -05:00
jonpas
9972f5374f
Default enable Quick mount (empty keybind) and Move to CBA Settings ( #6613 )
...
Quickmount - Default enable quick mount (empty keybind) and Move to CBA Settings
2018-10-12 22:14:03 -05:00
jonpas
4ff01967b6
Add Feature Camera Player EH and Handling ( #6573 )
...
* Switch to CBA Feature Camera handling
* Register ACE3's Feature Cameras
* Backwards compatiblity for old ace event
* Require CBA 3.9
2018-10-12 14:59:40 +02:00
Dedmen Miller
0633b807fa
Some Refactoring ( #6607 )
...
* SwitchUnits
* tacticalLadder
* vehiclelock
* vector
* Typo, thanks circleCI
* Fix stuff
* Fix animate loop
2018-10-09 20:21:46 -05:00
Andrea Verano
5594b9cef1
Italian Translation Update ( #6621 )
...
Added new strings in:
-Advanced fatigue
-Arsenal
-Ballistics
-Common
-Concertina wire
-Dogtags
-Explosives
-Maverick
-MicroDAGR
-Night vision
-Overpressure
-Realistic names
-Scopes
-Zeus
Fixed some strings in:
-Common
-Concertina wire
-Hitreactions
-HuntIR
-Inventory
-Laser
-Maverick
-Medical ai
-Missile guidance
-Realistic Names
-Spotting scope
-Switch Units
-Tactical ladder
-Tripod
2018-10-08 20:49:37 -05:00
BaerMitUmlaut
86a243d3cc
Fix ENVG II overlay ( #6630 )
2018-10-08 15:24:44 -05:00
PabstMirror
9eba55be21
Cargo - CanLoadItem ignores vehicle height on scripted load ( #6629 )
2018-10-08 15:23:59 -05:00
mharis001
e54e8d0f8c
Fix blacklist not working in multiplayer ( #6598 )
2018-10-07 22:49:29 -05:00
mharis001
9aa34ab462
Cache dogtag actions ( #6625 )
2018-10-07 22:23:49 -05:00
Filip Maciejewski
5e07d894f8
Remove BOM from stringtables
2018-10-07 11:30:15 +02:00
commy2
dfde6e2aae
fix engine start delay turning viv laoded vehicle when starting the engine
2018-10-06 13:41:26 +02:00
BaerMitUmlaut
97e3766ed3
Fix slow motion falling of SLAM mines ( #2770 ) ( #6619 )
2018-10-06 12:07:08 +02:00
Josuan Albin
7aa59ecbc4
Fix duplicate japanese strings ( #6611 )
2018-10-02 15:16:44 +02:00
Blutze
43c5258585
Realistic Names - Rename RGN to V40 Mini-Grenade, fix some trailing spaces ( #6590 )
...
* Add new strings, fix Czech M67
Czech string for M67 had a trailing space.
* Apply new strings
* Remove placeholder translations
* Fix more trailing spaces
2018-09-27 09:18:54 +02:00
jonpas
db5e9eaad7
Fix rope redeploying without FRIES - fix #5686 ( #6599 )
2018-09-26 13:56:50 +02:00
mharis001
0fd1a4c39e
Convert CBA_fnc_uniqueUnitItems to common fnc_uniqueItems ( #6593 )
2018-09-22 21:59:16 -05:00
mharis001
8648ccaba5
Explosives - Optimize creating explosive place actions ( #6413 )
...
* Optimize explosive actions
* Optimize hasExplosives function
* Readability parentheses
* bump
* testing...
* last try
* for science
* fix for sqf_validator
2018-09-21 22:54:24 -05:00
Mezilsa
ab52ff8ddb
add microdagrwaypoint precision as an option ( #6437 )
...
* Make the precision of the mircoDagr less perfekt
* Add strings of precision Option to stringtabel
* Update stringtable.xml
* Create initSettings.sqf
* Update ACE_Settings.hpp
* Finally
* Cleaning
* Update initSettings.sqf
* Move other settings to sqf, simplify waypointPrecision
2018-09-21 22:32:09 -05:00
mharis001
61000df120
Tagging - Cache required items check and use uniqueItems ( #6582 )
...
* Cache required items check and use uniqueItems
* Use config-case for required items
2018-09-21 15:11:02 -05:00
Dedmen Miller
0a2f5cf238
Fixed #6581 ( #6586 )
2018-09-19 08:31:08 -05:00
Ozan Eğitmen
a6d40549dc
Fix findIf typo, Don't deep copy arrays ( #6587 )
2018-09-19 08:24:57 -05:00
commy2
550acf6a2b
Merge pull request #6208 from Max255PL/laserbeam
...
Add IR beam to visible laser mode
2018-09-18 20:54:42 +02:00
commy2
5aa8c1dca0
make setUnconscious not reset firing mode ( #6519 )
2018-09-18 11:35:40 -05:00
Dedmen Miller
e2ac18a05d
[WIP] Fix script errors reporting wrong line numbers ( #6407 )
...
* advanced_ballistics
* advanced_fatigue
* advanced_throwing
* ai
* aircraft
* arsenal
* atragmx
* attach
* backpacks
* ballistics
* captives
* cargo
* chemlights
* common
* concertina_wire
* cookoff
* dagr
* disarming
* disposable
* dogtags
* dragging
* explosives
* fastroping
* fcs
* finger
* frag
* gestures
* gforces
* goggles
* grenades
* gunbag
* hearing
* hitreactions
* huntir
* interact_menu
* interaction
* inventory
* kestrel4500
* laser
* laserpointer
* logistics_uavbattery
* logistics_wirecutter
* magazinerepack
* map
* map_gestures
* maptools
* markers
* medical
* medical_ai
* medical_blood
* medical_menu
* microdagr
* minedetector
* missileguidance
* missionmodules
* mk6mortar
* modules
* movement
* nametags
* nightvision
* nlaw
* optics
* optionsmenu
* overheating
* overpressure
* parachute
* pylons
* quickmount
* rangecard
* rearm
* recoil
* refuel
* reload
* reloadlaunchers
* repair
* respawn
* safemode
* sandbag
* scopes
* slideshow
* spectator
* spottingscope
* switchunits
* tacticalladder
* tagging
* trenches
* tripod
* ui
* vector
* vehiclelock
* vehicles
* viewdistance
* weaponselect
* weather
* winddeflection
* yardage450
* zeus
* arsenal defines.hpp
* optionals
* DEBUG_MODE_FULL 1
* DEBUG_MODE_FULL 2
* Manual fixes
* Add SQF Validator check for #include after block comment
* explosives fnc_openTimerUI
* fix uniqueItems
2018-09-17 14:19:29 -05:00
mharis001
803d497d8a
Improve checking of unit items ( #6350 )
...
* Add uniqueItems function
* Optimize dogtag children actions function
* Optimize getDetonators item search
* Store CfgWeapons lookup in getDetonators
* Update items to use new function
* Update items to use new function 2
* More optimization of uniqueItems function
* Update items to use new function 3
2018-09-17 14:03:28 -05:00
Timi007
7988622635
Add the ability to edit user placed markers ( #6564 )
...
* add the ability to edit user placed markers
* remove direct channel from valid channels
* add author
* optimize get map display
replace old method of getting the map display with displayParent
* optimize code by adding isEqualTo
* correct some spelling mistakes
2018-09-17 13:52:24 -05:00
Ozan Eğitmen
db6a40f91d
Arsenal - Add Default Loadouts API ( #6558 )
...
* Add addDefaultLoadout function
* Initialize defaultLoadoutsList by default
* Close params bracket
* Revert "Initialize defaultLoadoutsList by default"
This reverts commit a53d21046e
.
* Add isNil check
* Remove tab
* Overwrite loadout if it exists
* Fix file name typo
* Use findIf and copy array
* Add override note to header
* Make btnImport use new function instead of duplicating code
* Use GVAR
* Use findIf
* Fix spacing
* Add documentation
* Improve documentation
2018-09-17 13:22:04 -05:00
PabstMirror
ae6a2709f3
Arsenal - Don't warn when calling removeUnitTrackProjectiles ( #6574 )
2018-09-14 23:58:28 -05:00
Blutze
3ee94d3aca
[Arsenal] Filter firemodes for precision display by showToPlayer ( #6572 )
2018-09-14 15:01:50 -05:00
mharis001
d6976f63ac
Zeus - UI improvements and additional objects setting for Editable Objects module ( #6391 )
...
* Add additional objects setting to Editable Objects
* Fix Teleport Players UI height and remove unnecessary strings
* Improve Garrison UI
* Config based combo for Toggle NVG and Toggle Flashlights UI
* Capitalize garrison module names
2018-09-13 08:40:55 -05:00
commy2
66da48fcdb
Merge pull request #6402 from mharis001/explosives-timer
...
Explosives - New Timer UI
2018-09-13 06:39:50 +02:00
PabstMirror
f2a57797da
Make sure explosive is still valid when updating timer
2018-09-12 23:07:39 -05:00
Dystopian
0e980907fe
Fix some item type magic numbers ( #6487 )
...
* Fix item type magic numbers
* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
Josuan Albin
eab84e0d09
Arsenal - Fix sort by value not sorting properly ( #6570 )
...
* Fix sort by value not sorting properly
* Change single to double quotes
* Remove uneeded space
2018-09-12 14:59:36 -05:00
commy2
05ad146ba3
restore
2018-09-10 19:31:26 +02:00
commy2
b651cc8093
delete duplicated code
2018-09-10 19:30:30 +02:00
commy2
e592717c30
make hide stamina setting make bar reappear when changed mid mission
2018-09-10 15:15:59 +02:00
commy2
8cd0b496ac
Merge pull request #6561 from acemod/repairFacility
...
Repair - Fix isInRepairFacility for buildings at height
2018-09-03 18:02:01 +02:00
PabstMirror
628878d074
Repair - Fix isInRepairFacility for buildings at height
...
Fix #6560
2018-09-02 21:59:32 -05:00
alganthe
d13641d670
Add author support for mission defined unitInsignias
2018-08-31 18:35:12 +02:00
alganthe
04aeaa0912
Add support for mission defined unitInsignias
2018-08-31 18:20:55 +02:00
Dystopian
d8b54a8ef0
Fix switching non-local portable light on ( #6522 )
2018-08-16 20:52:13 -05: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
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
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
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
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
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
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
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
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
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