Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,205 Commits 73 Branches 88 Tags 752 MiB
1534f8cd8d
Commit Graph

13205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xrufix
129cc26438 Add magazines with different tracer colors for some vanilla weapons (#6658) 
* Add magazines for some vanilla weapons with different tracer colors

* Removed obsolete comment

* unified naming of tracer magazines

* Add CfgMagazineWells

* Add 5.8mm mags

* Add Minimi boxes

* Added 5.56 Drum mags

* Add Katiba and 7.62x51 mags

* Remove magazine macro to make config easier to read and edit.

* Add pictures available in arma files

* Add magazines to vanilla magazinWells

* Fix wrong base class for Katiba tracer mags

* Removed duplicate strings

* delete blank lines in stringtable
 2019-03-12 13:32:47 -05:00
ace3mod
28b96e3efd [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-03-12 17:32:11 +01:00
Dedmen Miller
187b2f38ce Add rksl pm II 5-25x56 compat (#6845) 
* Add rksl pm II 5-25x56 compat

* Combine into existing compat

* Update ace_ScopeAdjus values
 2019-03-12 11:26:56 -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
mharis001
d561fe09d6
Merge pull request #6855 from acemod/mharis-maintainer 
Add mharis001 to ACE3 maintainers list
 2019-03-09 11:04:02 -05:00
jonpas
792a3b42fb
Add mharis001 to ACE3 maintainers list 2019-03-09 16:44:29 +01:00
PabstMirror
28620d86d1
fix to weaponMuzzleVelocity (#6850) 
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

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

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

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

* Add Pabst' fix to weaponMuzzleVelocity
 2019-03-08 09:12:07 -06:00
Dedmen Miller
5ad8b3c6bc Arsenal - Fix incorrect muzzle velocity stat displayed on magazine (#6844) 
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

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

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
 2019-03-05 10:42:04 -06:00
C0kkie
ca71375259 Captives - Use the doApplyHandcuffs function for keybind (#6843) 
* Use the doApplyHandcuffs function that cabletie

* Update XEH_postInit.sqf
 2019-03-05 09:40:10 -06:00
classic
c37b7644af Update Japanese translation (#6838) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
 2019-02-28 13:36:34 -06:00
jonpas
6a5811a9b2 Increase required Arma 3 version to 1.88 (#6836) 
No Uniform Restrictions got updated for 1.88
 2019-02-27 17:44:39 -06:00
jonpas
66011d4b33 Update Jekyll documentation packages and fix lodash vulnerability (#6837) 2019-02-27 17:43:35 -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
jonpas
11f511d660
Update No Uniform Restrictions for Arma 3 v1.88 (#6829) 
**When merged this pull request will:**
- Title
 2019-02-22 23:24:59 +01: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
ace3mod
780e74e975 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-02-11 21:20:52 +01: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