Commit Graph

14653 Commits

Author SHA1 Message Date
Filip Maciejewski
cb40de6d37
Arsenal - GM Compat - Add uniform details support (#9169)
* Arsenal - GM Compat - Add uniform details support

* Use macro for variable

* Fix typo

* Update optionals/compat_gm/XEH_preinit.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2023-03-15 21:02:02 +01:00
Psycool
d87e16e87e
Korean Translation Improved (#9164)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3
2023-03-10 19:17:36 -06:00
BrettMayson
e252ef67d6
Medical Treatment - Suture (#9020)
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com>
2023-03-06 14:17:01 -06:00
TACHarsis
0a2e7d1202
Rearm - Improve framework documentation (#9114)
* Added scripted way of creating a rearm source to framework documentation

* Fixed indentation level

* More verbosity

* Updated phrasing

* * Fixed bad copy paste job
* Changed introduction version to more likely candidate
* Reordered `makeSource` under `Functions` and applied hopefully more sensible order of "create source > ammo specifics"

* Wording fix and further reorder

* Fixed wording to be in line with rest of document
* Further updated order

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update docs/wiki/framework/rearm-framework.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Added execution hint to makeSource

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-05 18:12:58 -06:00
TACHarsis
27a2a7c131
Refuel - Improve framework documentation (#9122)
* Refuel framework doc update

* Fixed one explanation
* Unified terminology
* Changed order to mirror that of rearm-doc update in PR #9114

* Added execution hints for makeSource and makeJerryCan
2023-03-05 18:12:38 -06:00
TACHarsis
eef506b7eb
Update repair framework docs (#9123)
* Hopefully improved usability and appeal
2023-03-05 18:12:23 -06:00
Zman6258
56348e70fa
Added missing vanilla casing types (#9162)
Super minor change, but I noticed not every vanilla casing had a corresponding ace3 casing defined. Most noticeable with 7.62x39, where they swap from steel to brass casings on landing.
2023-03-01 12:42:46 -06:00
Psycool
434820d8dd
Added Korean Translation (#9160)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel
2023-02-27 14:42:10 -06:00
BaerMitUmlaut
60cc8fbe88
Fix respawn when letting AI take over playable units (#9145) 2023-02-23 23:28:06 -06:00
PabstMirror
4de8487db0
Update fnc_makeJerryCan.sqf (#9153) 2023-02-17 22:19:31 -06:00
TACHarsis
1693e6834d
Added ace_rearm_sourceInitialized event (#9134) 2023-02-17 20:59:23 -06:00
TACHarsis
28e8e7d4ca
Refuel - Add events for fuel source and jerry can creation (#9133)
* Refuel - Added events

* Added ´ace_refuel_fuelSourceInitialized´ and `ace_refuel_jerryCanInitalized´ events
* Updated documentation

* Cleaner implementation && more coherent with analog rearm event

* Rebase merging is weird
2023-02-17 20:49:57 -06:00
Samuel Deutsch
edf4a70ed6
Refuel - Added ability to refuel fuel sources (#8981)
* Simplify main fuel loop

* Remove unecessary action macro

* Add container refueling

* Fuel counter behaviour is now consistent for both limited and unlimited fuel sources

* Update maxFuel and refuelContainer whenever fueling begins

* Update maxFuel and refuelContainer whenever fueling begins

* Prevent loading of fuel sources into cargo when they have a nozzle connected to them

* Added action to check how much fuel is left in a jerry can

* Prevent jerry cans from being picked up if they have a nozzle connected to them

* Added function to check if a nozzle can be connected to an object

* Prevent fuel sources which have their nozzle deployed from being loaded

* Compute both tank volumes inside of refuel instead of durring turn on

* Didn't mean to delete these

* Allow for user defined fuel capacities

* Handle more edge cases with infinite fuel sources

* Refuel - Prevent fuel sources from being dragged while they're refueling other things

* Refuel - Added flow rate multiplier for refueling fuel sources

* Refuel - Use FUNC instead of DFUNC for nozzle actions

* Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source

* Refuel - Correctly reset fuel counter when fueling a new target

* Refuel - Implemented all suggested changes

* Refuel - Added newlines to end of files

* Refuel - Added missing newline at end of XEH_PREP

* Only setFuel once per jerry can creation

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Calling getFuel will initialize the fuel source

* Refuel - Add newline to end of file

---------

Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-16 20:06:11 -06:00
mharis001
67ebb15e07
Dragging - Improve weapon reselect behaviour (#9052)
* Dragging - Improve weapon reselect behaviour

* Add and use func to getFiremodeIndex

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-13 22:01:51 -06:00
JonBons
86d79b2fc1
Common - Fixed CBA keybinds not working with progress bar (#9139)
* Fixed CBA keybinds not working on the progress bar after cursor hiding change

* Removed fallback value for uiNamespace lookup

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-02-13 21:57:32 -06:00
PabstMirror
06ae622dda
Weapon Select - Remove vehicle smoke selection key (#9144) 2023-02-09 13:17:24 -06:00
PabstMirror
cac223c6ec
Common - Use hashmap variable for canDig surfaces (#9147)
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf
2023-02-09 13:16:42 -06:00
Psycool
f67957cdde
Translations: Korean (#9142)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml
2023-02-03 16:26:15 -06:00
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility (#9105)
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-02-01 23:28:55 -06:00
BrettMayson
f83a2df4b5
Medical Blood - Add source of blooddrop to events (#9102)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-01 05:03:44 -06:00
mharis001
b4005bca43
Common - Fix disableUserInput blocking respawn (#9053) 2023-01-31 17:14:50 -06:00
letus
8d2d49202d
Quickmount - Fix teleport bug in UAV through change seat (#9065)
* fix bug with changeseat in uavs

* isnull to isNull

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-01-31 17:12:19 -06:00
PabstMirror
952375c676
Tools - Add dummy rtms to make ace buildable by current mikro tools (#9135) 2023-01-28 14:13:45 -06:00
JonBons
6b3aa3e0a2
Common - Hide cursor during progress bar (#9128)
* Common - Hide cursor during progress bar (w/ CBA setting)

* Fix base class define

* Removed CBA setting for disabling hiding of the cursor for the ACE progress bar

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-01-24 13:57:10 -06:00
GhostIsSpooky
5d759e7b5f
Zeus - Don't disembark group players on Garrison (#9130) 2023-01-23 19:23:49 -06:00
DanielH
25a508e3ae
Changed CBA files location (#9124) 2023-01-23 12:14:00 -06:00
ace3mod
a997ae60bf [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2023-01-06 22:32:11 +01:00
Mike-MF
6860b557fb
Western Sahara Compatibility (#9082) 2023-01-06 22:31:36 +01:00
TACHarsis
e21ffc4c32
Arsenal - Fix non-local loop variable use in fnc_fillRightPanel.sqf (#9115)
* Fixed use of loop variable from outside of function and using local variable instead

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-01-05 20:45:13 -06:00
GhostIsSpooky
c241f2e2a2
fix config lookup (#9106) 2022-12-10 14:15:28 -06:00
KJW
1315cb77e6
Update fnc_showAltimeter.sqf (#9108)
Bug fix
CBA_fnc_removePerFrameEventHandler was used to remove the calculations for the altimeter, but does not exist. Replaced with CBA_fnc_removePerFrameHandler to rectify this issue.
2022-12-08 15:37:33 -06:00
Smith
dc9a3eb064
Translations - Russian (#9095)
* Add missed & fix existed

* Fix russian translation when renaming
2022-12-03 13:57:43 -06:00
Cyruz
7f5a8e4099
Safety - Add optional flag to hide hint (#9086)
* Add optional flag to hide hint

* Update addons/safemode/functions/fnc_setWeaponSafety.sqf

* Update addons/safemode/functions/fnc_unlockSafety.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/safemode/functions/fnc_lockSafety.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-12-03 13:57:16 -06:00
Mike-MF
5693edc96d
Update fortify wiki (#9092) 2022-12-02 19:08:00 -06:00
PabstMirror
0169373b7b
Sog Compat - Cleanup class inheritance formatting (#9107) 2022-12-02 18:53:13 -06:00
Björn Dahlgren
553dabe60e
Refuel - Fix warnings when building with latest pboProject (#9099)
* Fix inconsistent trailing semicolon for macro MACRO_NOZZLE_ACTIONS

* Remove usage of access from refuel hose class
2022-12-02 16:25:09 -06:00
BrettMayson
e202765f91
Grenades - Change names of IR flares for consistency (#9098)
Didn't update Chinese, but all the others should be fine based on the other colors
2022-11-20 16:14:49 +00:00
BrettMayson
09dce6f937
Explosives - Fix invalid m57 specularPower (#9094) 2022-11-07 14:00:42 +00:00
diwako
b0df20c3e9
Viewports - Add viewports for RHS BMP3 (#9062) 2022-10-21 19:30:40 -05:00
mharis001
0e868dc26f
Interact Menu - Add doNotCheckLOS option for config actions (#9054) 2022-10-21 19:28:51 -05:00
TACHarsis
95a5fb040a
Arsenal - Add init/remove local events to Arsenal creation/destruction (#9064)
* Added two local events to arsenal

* onInitArsenal fired when Arsenal got initiated
* onRemoveArsenal fired when Arsenal got removed

* added them to the arsenal event listing in the docs

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Update addons/arsenal/functions/fnc_removeBox.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Renamed events in accordance with event naming patterns sans "on"

* Apply suggestions from code review

Co-authored-by: BrettMayson <brett@mayson.io>

* Improved Docs

Co-authored-by: BrettMayson <brett@mayson.io>
2022-10-21 19:28:10 -05:00
mharis001
1208f7a2ce
Fastroping - Disable destruction for helper object (#9051) 2022-10-19 21:38:16 -05:00
Mike-MF
cabca961c1
Cargo - Update VTOL Cargo sizes (#9066) 2022-10-16 00:44:31 +02:00
Mike-MF
c2bbe482b5
Add images and icon to concertina wire. (#9071) 2022-10-13 12:13:20 -05:00
Krzyciu
8d61488e0e
Fortify - Polish translation update (#9056)
**When merged this pull request will:**
- Add missing Polish fortify translations
2022-10-09 15:05:27 -05:00
Psycool
28cdee6885
Korean Translation Update (#9067)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation
2022-10-09 15:04:47 -05:00
Filip Maciejewski
97f211ecc5
Trenches - Polish translation update (#9049) 2022-10-02 23:45:30 +02:00
Filip Maciejewski
e632467fe2
Marker flags - Polish translation update (#9048) 2022-10-02 23:45:23 +02:00
Filip Maciejewski
928b1c5615
Towing - Polish translation update (#9050) 2022-10-02 23:45:17 +02:00
Filip Maciejewski
4837243b9a
Viewports - Polish translation update (#9047) 2022-10-02 23:41:40 +02:00