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
14,626 Commits 73 Branches 88 Tags 752 MiB
6860b557fb
Commit Graph

164 Commits

Author SHA1 Message Date
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key (#6732) 
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
 2019-01-30 22:11:01 -06:00
PabstMirror
6f97a4ad39
RHS Compats - Update allowSwapBarrels for some guns (#6675) 
* RHS Compats - Update allowSwapBarrels for some guns

Close #6653

* Update comments
 2018-11-17 10:11:47 -06: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
PabstMirror
75f8a35d3d
RHS Compat - Simplify HuntIR mag config (#6580) 
* RHS Compat - Simplify HuntIR mag config

* x
 2018-09-17 13:22:18 -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
Dystopian
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -05:00
shukari
8a81e3b675 Geforce, RHS Geforce adjustments and MH6M can now fastrope (#6439) 2018-07-19 22:54:06 -05:00
PabstMirror
a828ebe591
Repair - Disable repair on ERA/Slat armor hitpoints (#6283) 
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
 2018-04-19 12:31:00 -05:00
PabstMirror
10a3a29ea0
Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
PabstMirror
4b42eb4385
ST Nightvision Effects (#4694) 
* Merge ST Nightvision

* Cleanup

* Header cleanup

* Add ace setting for fog

* Cleanup debug

* Manual merge refuel changes

* Add new setting for effect scaling

* Cleanup

* Use ace_common_fnc_getZoom

* Fix compat inheritance changes

* Fix stringtable

* Add category

* Tidy function headers

* Replace global event with remote event
 2017-12-06 13:15:33 -06:00
ulteq
d6164cbc50 Advanced Ballistics - Muzzle variation: Compatibility update 2017-11-23 14:36:36 +01:00
PabstMirror
70c25aacaf cargo - use getInteractionDistance to get better distance (#5697) 2017-11-10 15:28:12 +01:00
armyinf0703
f30727e566 fixes shemagh having overlay despite no goggles (#5665) 
RHS Compatibility - fixes shemagh having overlay despite no goggles
 2017-10-24 13:39:45 -05:00
Dedmen Miller
a614744e31 AB compat rail/scope height update (#5650) 
* Compat rail/scope height update

* fix
 2017-10-23 15:02:48 +02:00
Dystopian
f6fd0095f7 Add compat for RHS 0.4.3 new vehicles (#5619) 2017-10-14 11:56:12 -05:00
Dedmen Miller
b51adcec3e RHS 3.4 Goggles and AB Ammo compat update (#5607) 
* Oakley SI ballistic goggles

* Shemags and ess goggles

* 556x45 M855
 2017-10-11 14:05:17 -05:00
Whigital
39abfc78db [compat_rhs_usaf] Reload Launchers and Overpressure (#5589) 
* Add ace_reloadlaunchers capability and ace_overpressure config to Mk
153 SMAW launcher
* Add ace_reloadlaunchers capability and ace_overpressure config to M3
MWAAS launcher
 2017-10-10 10:27:49 -05:00
Willard
51b1cd6023 Missile guidance for RHS hellfire and DAGR (#5444) 
* rhs hellfire missileguidance

* tabs to spaces

* added support for -N and -M launcher, removed ir/radar locking

* added missing macro

* Switch to using pylon system
 2017-10-06 15:31:48 -05:00
PabstMirror
760665f65f Leave ACE_FCS off by default (#5580) 2017-10-03 11:57:07 -05:00
PabstMirror
ef25aaff02 Fix UBC for RHS 4.3 (#5574) 2017-10-01 12:31:01 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418) 
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
 2017-09-10 14:43:03 -05:00
PabstMirror
e7ebbd5750 Customized map lighting for vehicle interiors (#5401) 
* Customized map lighting for vehicle interiors

* Tabs for cases

* Add wiki for new configs

* V
 2017-08-22 13:13:03 -05:00
PabstMirror
ace3964655 compats - Fix config name for resupply vics (#5300) 2017-06-22 16:47:06 +02:00
PabstMirror
f35f80ee82 Rearm - Pylon Support and Dynamically Add Supply Actions (#5183) 
* Dynamic Add

* Support 1.70 Pylon Loadouts

* Properly handle old compat pbos - Update RHS Compat

* Re-add documentation

* cleanup headers (note from other pr)

* Cleanup

* Fix var spelling
 2017-06-08 11:47:52 -05:00
magicsh0tz
cd852477c8 CH53 Fastroping and other fixes (#4713) 
* CH53 Fastroping and Fixes

Added fastrope points for CH53.

The getOut EH is required to keep the doors open when a unit exits the
vehicle and it uses the vehicle animation "doorHandler_R" or
"doorHandler_L" as a placeholder to determine if the doors are
open(1)/close(0).
eg. In UH1Y (Unarmed), when the right door is opened using the
useraction, "doorRB" and "doorHandler_R" will be set to 1.

* Changed TAB to 4 spaces

* Moved bracket to follow guidelines
 2017-05-29 12:55:53 -05:00
PabstMirror
772ca1313e RHS CH-47 - use animationSourcePhase (#5201) 2017-05-26 08:54:12 -05:00
PabstMirror
9ba3b5aa6a Update helmet hearing protection for RHS-US (#5146) 
* Update helmet hearing protection for RHS-US

* Hearing - Add standardized helmet protection macros

* Tweak peltor vol
 2017-05-16 21:40:07 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
PabstMirror
4cdc323fdf Fix Javelin for AI for RHS (#5096) 2017-04-22 11:18:15 -05:00
PabstMirror
7bb3798217 Fix RHS mp7 UBC (#5085) 2017-04-16 09:09:50 -05:00
J3aLeiNe
9763defd10 AB : compats RHS 4.2 updated (#4879) 
* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp
 2017-02-11 14:24:54 -06:00
PabstMirror
ac0292d738 Fix RHS m113 compat (#4881) 2017-02-10 12:49:55 -06:00
PabstMirror
39181fdea5 Simplify huntIR configs using += (#4521) 
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
 2017-01-09 12:11:31 -06:00
bux578
f544d82472 add optionals meta.cpp files (#4763) 2016-12-15 10:55:44 -06:00
jonpas
1ecd674ac6 Exclude uniforms with inherited modelSides (#4720) 2016-12-12 19:36:53 +01:00
PabstMirror
962903f201 Unify javelin guidance for RHS ammo (#4737) 2016-12-01 11:01:24 -06:00
magicsh0tz
ed0fd5f6f6 Switched to CBA_fnc_waitAndExecute (#4709) 
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
 2016-11-25 19:18:04 +01:00
PabstMirror
e67c9512ba Remove unneeded functions 2016-11-16 17:53:04 -06:00
PabstMirror
da85fc1be5 Add RHS MELB fastrope, add 3d debuging of mem points 
Close #4683
Config from @Whigital
 2016-11-16 17:42:11 -06:00
PabstMirror
5bf8b642f7 Add cargo configs for some planes (#4650) 2016-11-10 12:05:08 -06:00
PabstMirror
97c02c306b Disable FCS on RHS helicopters (#4509) 
* Disable FCS on RHS helicopters - Close #4495

* Cleanup
 2016-10-05 13:03:52 -05:00
PabstMirror
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184) 
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
 2016-09-03 22:00:15 +02:00
Fadi
4080482c38 ACE rearm/refuel/repair actions for RHS vehicles (#4230) 
* Rearm/refuel/repair support for RHS USF vehicles
Particularily the HEMTT A4 family and M113 supply vehicle

* Rearm/refuel/repair support for RHS AFRF vehicles
Particularily the GAZ-66 and Ural family

* Fixing macro formatting, updating requiredAddons for #4230

* Fix inheritance for ace_actions
 2016-08-27 03:45:35 -05:00
PabstMirror
c117a79431 Add missing semi-colon (#4180) 2016-07-28 17:05:53 -05:00
J3aLeiNe
7e027ea3b5 Update compat_rhs_usf3 (Weapons/Ammo) (#4028) 2016-07-28 23:50:52 +02:00
Glowbal
35a6636ca3 Add ACE javelin as required addon dependency 2016-07-11 12:08:12 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Ken
f3de564c86 Path Fixes 2016-06-17 19:42:10 -05:00
Ken
44c5525c62 Glasses Tint Update 2016-06-17 19:05:41 -05:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
PabstMirror
709916c0f3 Fix UBC errors for RHS 4.1 (#3800) 2016-05-19 19:53:23 -05:00
BaerMitUmlaut
8c867e5e55 Standardised script_component inclusion 2016-03-07 20:15:55 +01:00
BaerMitUmlaut
45383a0c1d Fixed missing bracket 2016-03-07 18:55:51 +01:00
SzwedzikPL
46367c003c Fixed EH parameters, prevent wrong fastroping option due to inherition 2016-03-07 18:55:50 +01:00
BaerMitUmlaut
7344474658 Added RHS Fastroping compatibility 2016-03-07 18:55:49 +01:00
esteldunedain
19ccf52425 MRBS to mrbs 2016-01-20 12:05:35 -03:00
esteldunedain
6b4b8b707c Prefix new configs for consistency 2016-01-20 11:42:05 -03:00
PabstMirror
b731232719 Fix M69 Grenade UBC in RHS Compat 2016-01-07 00:59:31 -06:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
VKing
0fb2fa1b8f Fix style 2015-12-31 23:39:09 +01:00
VKing
f28e0920c4 Fix inheritance from #3040 2015-12-31 23:38:49 +01:00
PabstMirror
8ac3a09a3b Merge pull request #3045 from sargken/master 
RHS Compat Enhancement for Weapons and Grenades
 2015-12-31 14:58:29 -06:00
Ken
543f13c754 More Fixes 2015-12-20 14:37:14 -06:00
VKing
d36988852d Oops bollocks 2015-12-18 16:31:01 +01:00
Ken
e033c56cfc RHS weapons and Frag update 
The RHS M249 and M240 now have the overheating and change barrel, plus
the M4 and M16 branch should have overheating applied to them. The ammo
class should have all of the hand grenade fixes in there.
 2015-12-17 17:04:30 -06:00
PabstMirror
27d683f8e2 RHS Compat - Add reqAddons, Fix M113 
Adds requiredAddons for used units
Fixes class rhsusf_m113tank_base
 2015-12-17 16:27:04 -06:00
Fadi
d7fbd65687 Disabling ACE FCS in RHS USF Compat for M113 family 2015-12-15 18:58:57 -06:00
PabstMirror
ee0812ad15 RHS Compat - Combine all ERA Hitpoints 
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
 2015-12-10 20:57:23 -06:00
IngoKauffmann
f852eb5f4b Moved compatibility stuff 2015-08-18 23:48:25 +02:00
SzwedzikPL
bdb23301db rhs usf combat config fix 2015-07-27 01:42:02 +02:00
bux578
bd6cff2e37 fix conflict 2015-07-26 21:29:53 +02:00
SzwedzikPL
99e1b36712 AH6 gun fix, hearing protection change 2015-07-18 15:51:16 +02:00
SzwedzikPL
46e51f6788 rhs headgear compat 2015-07-01 22:25:19 +02:00
Fadi
9c2009217b Correcting RHS class inheritence for ace_isbelt 2015-07-01 00:34:49 -05:00
Fadi
d96a421717 Disabling ACE FCS on RHS vehicles to prevent conflict 
with their own hardcoded vehicle FCS
 2015-06-25 09:20:16 -05:00
Fadi
1234d8dd49 Setting ACE_isBelt for RHS magazine classes 2015-06-25 09:19:36 -05:00
TheBamse
d9ddb597a1 Tabs converted to four spaces 2015-06-23 19:55:10 +02:00
TheBamse
61b77332a1 Fixed spacings and alphabetical order. 2015-06-23 13:24:13 +02:00
TheBamse
874bd44749 Add HuntIR to all RHS AR15s that has M203 or M320 attached. 2015-06-22 21:34:40 +02:00
PabstMirror
13602262cf Update RHS compat for 0.3.8 2015-06-11 21:04:34 -05:00
PabstMirror
22fe30b5a0 #1321 - Add MGuidance to RHS Javelin Ammo 
We already set the weapon (rhs_weap_fgm148) to ace_javelin_enabled and
disable vanilla locking.
 2015-05-23 14:22:15 -05:00
ulteq
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
 2015-05-20 19:31:55 +02:00
ulteq
458daad5bb Elevation and windage can now have different adjustment increments: 
* ACE_ScopeAdjust_VerticalIncrement
* ACE_ScopeAdjust_HorizontalIncrement
 2015-05-19 20:13:31 +02:00
jaynus
bc9850dc08 Added class. 
(cherry picked from commit 021d277b12)
 2015-05-18 14:11:15 -07:00
PabstMirror
4bd34c64bf Fix RHS_Javelin Comp Path 2015-05-18 21:35:07 +02:00
jaynus
2af607c727 Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. 2015-05-18 20:59:45 +02:00
PabstMirror
72715dd34d Fix RHS_Javelin Comp Path 2015-05-13 17:04:27 -05:00
jaynus
021d277b12 Added class. 2015-05-13 12:19:00 -07:00
jaynus
a57ea7dc79 Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. 2015-05-13 12:18:40 -07:00
ulteq
0bae8471c5 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00