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
nic547
c45425a559
added frag compat for bwa3 dm51
2015-06-27 23:52:57 +02:00
Nicolás Badano
0432cd0285
Merge pull request #1745 from FadiCBB/master
...
A few items for RHS compatibility (ACE reload and reloadablelaunchers, disabling ACE FCS)
2015-06-27 12:39:50 -03:00
nic547
c44f86432c
BWA3 compat: HuntIR
...
Added HuntIR to AG40-2
2015-06-25 23:17:44 +02:00
