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,060 Commits 73 Branches 88 Tags 752 MiB
5e71030301
Commit Graph

266 Commits

Author SHA1 Message Date
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
Ozan Eğitmen
fd1888be36 Add 'uniforms' Component (#4435) 2016-10-27 19:34:25 +02: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
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
PabstMirror
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
52bf52d4aa translate compat_adr_97 2016-09-28 01:27:17 +09:00
PabstMirror
a7c75a3bf6 Handle RHS impact grenades (RGN/RGO) (#4447) 2016-09-23 16:38:24 -05:00
commy2
6cc960aacc fix nocrosshair being in addons and optionals 2016-09-18 15:19:17 +02:00
commy2
0ff4c20861 Merge pull request #4168 from acemod/nocross 
optional pbo to disable cross hair
 2016-09-18 15:08:43 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02: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
Glowbal
b134c06f5e Remove FFAA Compatability (#4301) 
Compatability mod gives to many build errors and contains references to external files. Should not be part of ACE3.
 2016-08-31 22:14:35 +02:00
Glowbal
4abfd210cd fix ffaa compat build error 2016-08-27 17:37:19 +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
FFAAMOD
f4ace648e3 Added ffaamod compat pbo (#3727) 2016-08-27 10:39:21 +02:00
commy2
3aee2d9e40 RHS ZSU-23-4 compat with FCS 
- close #4189
 2016-07-30 12:50:52 +02: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
commy2
6507acdbab optional pbo to disable cross hair 2016-07-25 21:00:27 +02:00
PabstMirror
da9defba3b Update RHS compat for 0.4.1.1 (#4142) 2016-07-21 20:07:45 -05:00
Glowbal
35a6636ca3 Add ACE javelin as required addon dependency 2016-07-11 12:08:12 +02:00
commy2
66abb0b103 add russian ranks to more factions 2016-06-26 00:29:17 +02:00
commy2
5047d95086 add some authors 2016-06-26 00:23:43 +02:00
commy2
9eba2fe940 add russian rank icons 2016-06-26 00:02:19 +02:00
Glowbal
ec6f3879c0 Merge pull request #3978 from J3aLeiNe/patch-2 
Update compat_r3f config.cpp
 2016-06-25 11:37:50 +02:00
J3aLeiNe
7d74331328 Update CfgAmmo.hpp 
Fix correct "ACE_barrelLengths" for "R3F_127x99_Ball" and "R3F_127x99_PEI" according to the R3F_PGM_Hecate_II barrel length (700mm)
 2016-06-22 17:24:09 +02:00
J3aLeiNe
08aa518e68 Update config.cpp 
Add correct requiredAddons entries since the last @R3F_ARMES update
 2016-06-22 16:55:19 +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
nic547
37068a5247 compat for adr-97 (#3728) 
* Added compat_adr_97 and realisticnames

p90 cyka blyat

* typo

* Added Balistics stuff for p90 compat

* 2 spaces to 4 spaces

* styled my shit

* Name for Hex variants, firemodes for the civilian variant

* Also changed the magzine names

* fixed ubc warning

* fixed my style once again

* my stuff looks even better now ...

* ...
 2016-05-28 18:48:39 +02:00
PabstMirror
709916c0f3 Fix UBC errors for RHS 4.1 (#3800) 2016-05-19 19:53:23 -05:00
PabstMirror
9f6661f4db Make 40mm Grenades Frag (#3679) 
* Make 40mm Grenades Frag

* Just use existing force cfg instead of adding new

Add RHS compat entries
 2016-05-07 15:35:39 -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
commy2
5334b228fb remove BWA3 compat pbo (changes now in BW mod) 2016-02-22 16:18:11 +01:00
esteldunedain
4f62e56004 Unify the changes of #3130 and #3343 2016-02-20 17:05:47 -03:00
esteldunedain
63056ef47a Merge branch 'master' into fixRHSCompat 2016-02-20 17:02:11 -03:00
Thomas Kooi
8d12f1cc08 Merge pull request #3130 from acemod/ab-subsonicAmmo 
AB - Handle subsonic ammo when configs not defined
 2016-02-20 17:01:22 +01:00
esteldunedain
eac26fc239 Fix subsonic ammo from RHS that incorrectly inherit barrel length coefficients from supersonic ammo. Fix #3320 2016-02-19 00:46:31 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX 
Deterministic overheating (updated)
 2016-02-04 16:03:30 -03:00
esteldunedain
8d437c91f1 Fix ace_scopes capturing native adjustment keys for the PSO scope. Close #3238 2016-02-01 14:42:11 -03: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
VKing
569179e0bf Add the PSO-1M2-1 windage adjust 2016-01-18 14:59:38 +01:00
PabstMirror
54397abaa2 AB - Handle subsonic ammo when not defined 
Fix #3062
- Add basic AB configs for subsonic russian bullets.
- When building ab ammo cache, if round is subsonic and does not have AB
configured
attempt to use the parent's config, scaled down to the subsonic's round
speed.
 2016-01-07 15:06:12 -06: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
0c9cba0896 Merge pull request #3050 from acemod/rhs_compat_fixSpottingRifleOP 
RHS Compat fix for SMAW spotting rifle backblast
 2015-12-31 14:59:23 -06: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
PabstMirror
44568ec94e CUP compat no longer needed: CUP makes their own 
ref
https://forums.bistudio.com/topic/179326-community-upgrade-project-cup/
 2015-12-28 21:27:47 -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
VKing
fce245ad76 Remove SMAW Spotting Rifle backblast 2015-12-18 16:23:07 +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
2caabcd00a Correcting an issue in RHS AFRF Compat with Sprut turret 2015-12-15 18:59:27 -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
jokoho48
ace7894dbf fix missing Simicolon in RHS AFRF Comp 2015-11-26 20:35:45 +01:00
Thomas Kooi
581f71f8a1 Merge pull request #2141 from GitHawk/refuel 
Adding vehicle refueling
 2015-11-26 16:16:13 +01:00
IngoKauffmann
763df43fbc Added possibility to disallow rearm 
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
 2015-11-23 17:08:06 +01:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 
Conflicts:
	optionals/compat_bwa3/config.cpp
 2015-10-10 13:13:30 +02:00
commy2
014203413d handle optional pbos in checkFiles 2015-09-17 02:13:21 +02:00
commy2
15f4fc39e3 optional pbo to hide select weapon actions 2015-09-17 01:26:28 +02:00
commy2
6fe79c4fe2 remove obsolete compat pbo for BWMod, fix #2293 2015-08-27 22:10:09 +02:00
ViperMaul
5ea98143e2 Merge pull request #2211 from jonpas/integrateAsdg 
Integrated ASDG JR Optional
 2015-08-26 17:53:32 -07:00
Cyruz143
994cddebc3 Readding scopes as not natively covered 2015-08-19 20:44:53 +01:00
Cyruz143
4fd663aa29 Removing code thats in CUP natively 2015-08-19 20:37:32 +01:00
jonpas
9fd155f3ec Integrated ASDG JR Optional 2015-08-19 17:11:15 +02: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
ulteq
a28c6d3bb6 Merge pull request #1700 from Pashe/tracers_20150620 
Fill gaps in ball tracer config
 2015-07-11 09:59:38 +02:00
Nicolás Badano
a94d925bdb Merge pull request #1748 from nic547/whocaresaboutbranchnames 
BWA3 compat: HuntIR and more
 2015-07-09 10:20:47 -03:00
SzwedzikPL
46e51f6788 rhs headgear compat 2015-07-01 22:25:19 +02:00
Fadi
acc8a08d52 Cleaning up unnessecary spaces 2015-07-01 00:36:46 -05:00
Fadi
9c2009217b Correcting RHS class inheritence for ace_isbelt 2015-07-01 00:34:49 -05:00
nic547
bab49b74d4 Merge branch 'master' of https://github.com/acemod/ACE3 into whocaresaboutbranchnames 2015-06-28 22:22:19 +02:00
nic547
d36efb5a4a compat_bwa3: added ACE_isBelt 2015-06-28 22:15:54 +02:00