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,579 Commits 73 Branches 88 Tags 752 MiB
6274d67edb
Commit Graph

12579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PabstMirror
75f8a35d3d
RHS Compat - Simplify HuntIR mag config (#6580) 
* RHS Compat - Simplify HuntIR mag config

* x
 2018-09-17 13:22:18 -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
Wakbub
64cc287408 RHS Compat - Fix GREF canoes refuel interaction (#6575) 
* Fix RHS GREF canoes refuel interaction

* Removed ace_refuel from requiredAddons

* fix inheritance
 2018-09-15 11:53:28 -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
PabstMirror
429ecb6171
RHS Compats - Update bases classes for RHS 4.6 (#6529) 
* RHS Compats - Update bases classes for 4.6

* Update CfgMagazines.hpp

* Update CfgWeapons.hpp
 2018-09-13 00:29:30 -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
Dystopian
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -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
9de11e066f
Merge pull request #6571 from acemod/stamina-bar-setting-fix 
don't hide stamina twice when changing the setting
 2018-09-10 20:51:15 +02: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
commy2
fe1737081c
Merge pull request #6556 from alganthe/arsenalMissionUnitInsignias 
Arsenal - Add support for mission defined unit insignias
 2018-09-03 09:51:11 +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
Drofseh
055c85d56d update shell tracer textures to appear smaller 
While in the gunner view, or generally when seeing the tracer from the
front or rear, the shell tracers look reasonalble.
However closer to a perpendicular angle the tracers appear substantially
larger than they ought to.
This texture update makes the tracer look a little smaller from those
angles.
 2018-08-29 13:16:06 -07:00
PabstMirror
16a3bd096a
RHS GREF Compat - MG42 (#6552) 
Close #6550
 2018-08-27 17:13:38 -05:00
commy2
0c18d5bcae
Merge pull request #6548 from Neviothr/CfgWeaponsReferenceSemicolonFix 
Fix missing semicolon in CfgWeaponsReference
 2018-08-23 19:14:33 +02:00
Neviothr
8d83800f37
Fix missing semicolon 2018-08-23 18:57:23 +03:00
Dystopian
d8b54a8ef0 Fix switching non-local portable light on (#6522) 2018-08-16 20:52:13 -05:00
jonpas
48b459240d Update No Uniform Restrictions for Arma 3 v1.84 (#6513) 2018-08-16 19:41:51 -05:00
Thomas Kooi
ced45b2a4d
Remove play with six launch method (#6528) 
PWS is no longer active.
 2018-08-13 12:29:22 +02:00
Drofseh
b3134d00dc remove comments from rvmat files 2018-08-11 08:58:50 -07:00
Cuel
d8f0de1a5d acex fortify deploy handler and event docs (#6282) 2018-08-09 11:01:35 -05:00
Josuan Albin
0696875175 Wiki - Add new Arsenal EHs and stat indexes to arsenal framework doc (#6497) 
* Add new EHs and stat tab index to wiki

* Add added-in collumn for new arsenal EHs
 2018-08-09 11:01:01 -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
PabstMirror
2767fddd92
Update goggles.md (#6479) 2018-07-29 13:53:16 -05:00