Commit Graph

54 Commits

Author SHA1 Message Date
8c867e5e55 Standardised script_component inclusion 2016-03-07 20:15:55 +01:00
45383a0c1d Fixed missing bracket 2016-03-07 18:55:51 +01:00
46367c003c Fixed EH parameters, prevent wrong fastroping option due to inherition 2016-03-07 18:55:50 +01:00
7344474658 Added RHS Fastroping compatibility 2016-03-07 18:55:49 +01:00
19ccf52425 MRBS to mrbs 2016-01-20 12:05:35 -03:00
6b4b8b707c Prefix new configs for consistency 2016-01-20 11:42:05 -03:00
b731232719 Fix M69 Grenade UBC in RHS Compat 2016-01-07 00:59:31 -06:00
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
0fb2fa1b8f Fix style 2015-12-31 23:39:09 +01:00
f28e0920c4 Fix inheritance from #3040 2015-12-31 23:38:49 +01:00
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
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
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
d7fbd65687 Disabling ACE FCS in RHS USF Compat for M113 family 2015-12-15 18:58:57 -06:00
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
f852eb5f4b Moved compatibility stuff 2015-08-18 23:48:25 +02:00
bdb23301db rhs usf combat config fix 2015-07-27 01:42:02 +02:00
bd6cff2e37 fix conflict 2015-07-26 21:29:53 +02:00
99e1b36712 AH6 gun fix, hearing protection change 2015-07-18 15:51:16 +02:00
46e51f6788 rhs headgear compat 2015-07-01 22:25:19 +02:00
9c2009217b Correcting RHS class inheritence for ace_isbelt 2015-07-01 00:34:49 -05:00
d96a421717 Disabling ACE FCS on RHS vehicles to prevent conflict
with their own hardcoded vehicle FCS
2015-06-25 09:20:16 -05:00
1234d8dd49 Setting ACE_isBelt for RHS magazine classes 2015-06-25 09:19:36 -05:00
d9ddb597a1 Tabs converted to four spaces 2015-06-23 19:55:10 +02:00
61b77332a1 Fixed spacings and alphabetical order. 2015-06-23 13:24:13 +02:00
874bd44749 Add HuntIR to all RHS AR15s that has M203 or M320 attached. 2015-06-22 21:34:40 +02:00
13602262cf Update RHS compat for 0.3.8 2015-06-11 21:04:34 -05:00
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
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
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
458daad5bb Elevation and windage can now have different adjustment increments:
* ACE_ScopeAdjust_VerticalIncrement
* ACE_ScopeAdjust_HorizontalIncrement
2015-05-19 20:13:31 +02:00
bc9850dc08 Added class.
(cherry picked from commit 021d277b12)
2015-05-18 14:11:15 -07:00
4bd34c64bf Fix RHS_Javelin Comp Path 2015-05-18 21:35:07 +02:00
2af607c727 Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. 2015-05-18 20:59:45 +02:00
72715dd34d Fix RHS_Javelin Comp Path 2015-05-13 17:04:27 -05:00
021d277b12 Added class. 2015-05-13 12:19:00 -07:00
a57ea7dc79 Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. 2015-05-13 12:18:40 -07:00
0bae8471c5 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00