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
12,436 Commits 73 Branches 88 Tags 752 MiB
830536504d
Commit Graph

10098 Commits

Author SHA1 Message Date
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