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,218 Commits 73 Branches 88 Tags 752 MiB
8d83800f37
Commit Graph

273 Commits

Author SHA1 Message Date
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
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
Fadi
c76972f0c2 Enabling ACE reloading on the RHS RPG-7 2015-06-25 09:17: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
Pashe
d8353f5325 Fill gaps in ball tracer config 2015-06-20 12:51:57 -05:00
ulteq
e4701b7974 Removed obsolete HLC compat pbos: 
toadie2k, thanks for transferring those configuration values.
 2015-06-19 01:03:42 +02:00
ulteq
3c775b19ba CUP weapon config improvement: 
* Adjusted magazine initSpeed values
* Adjusted weapon initSpeed coefficients
* Recalculated all airFriction values
* Added missing ace configs to some classes
 2015-06-14 17:46:46 +02:00
PabstMirror
13602262cf Update RHS compat for 0.3.8 2015-06-11 21:04:34 -05:00
ulteq
afb2bb45fe Added R3F compat pbo 2015-06-07 10:11:50 +02:00
PabstMirror
237b5b4e35 Merge pull request #1239 from acemod/laserPointerAsdgConflict 
ASDG- Fail gracefully if attachments not compatible
 2015-06-05 16:40:49 -05:00
SAM
885fe3ea1b Added NLAW disposable 2015-06-04 14:57:43 +02:00
SAM
c6f0dd465d Added RPG18 disposable config 2015-06-04 13:47:10 +02:00
SAM
3f4182d066 Finished M136 disposable config 2015-06-04 13:38:50 +02:00
SAM
c154e5a620 Added required CfgMagazines.hpp 2015-06-04 13:21:23 +02:00
SAM
ef1dc5453c Added M136 disposable config 2015-06-04 13:14:57 +02:00
SAM
a54ccbcf16 Updating all values to proper required variables 2015-06-04 10:15:26 +02:00
SAM
9581dbbbec SMAW inheritance fix 2015-06-04 10:08:11 +02:00
SAM
23b7cd93b8 Added RPG18 backblast 2015-06-04 09:47:49 +02:00
SAM
01b969cfe4 Added NLAW backblast 2015-06-04 09:47:16 +02:00
SAM
592ca28117 Added M136 backblast 2015-06-04 09:46:29 +02:00
SAM
206249ebd5 Added Strela 2015-06-04 09:33:13 +02:00
SAM
a6106f2cc2 Added stinger 2015-06-04 09:32:44 +02:00
SAM
8508d62d57 Added SMAW 2015-06-04 09:31:54 +02:00
SAM
15052b93d5 Added RPG7V 2015-06-04 09:31:15 +02:00
SAM
de18016430 Added Metis 2015-06-04 09:30:43 +02:00
SAM
c2c3b2014e Added MAAWS 2015-06-04 09:29:38 +02:00
SAM
5285207403 Added M47 2015-06-04 09:28:19 +02:00
SAM
0b160b9a0a Added CUP_launch_Igla backblast 2015-06-03 22:09:14 +02:00
ulteq
cb12146f41 Tabs -> Spaces 2015-05-30 21:53:28 +02:00
ulteq
75518af90f Tabs -> Spaces 2015-05-30 21:52:57 +02:00
ulteq
e41c51966b Added cup scopes config entries 2015-05-30 21:51:24 +02:00
ulteq
9936af3e4c Added config entries for all cup weapon classes 2015-05-30 21:20:40 +02:00
ulteq
872501dad2 Removed newline brackets 2015-05-30 21:20:17 +02:00
ulteq
6f1c6ae8c1 Added missing ammo class 2015-05-30 20:33:32 +02:00
ulteq
44fbefa0e2 Merge pull request #1427 from acemod/bwmodCompatFix 
Fixed incorrect barrel length
 2015-05-29 20:12:14 +02:00
ulteq
2d7b4e5bdc Fixed incorrect barrel length 2015-05-29 20:11:44 +02:00
Glowbal
aee783c1e0 Merge pull request #378 from acemod/ace2Tracers 
ACE2 ball tracers port.
 2015-05-29 17:52:08 +02: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
7a0fd7cf24 Removed duplicate config entries 2015-05-23 19:04:29 +02:00
ulteq
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +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
ulteq
b518313ad6 Added compat pbo for IanSkys "Scope Mod A3" 2015-05-19 19:47:04 +02:00
ulteq
eaeb84f7c9 Added RH_shortdot config draft 2015-05-19 19:46:12 +02:00
ulteq
06e1435a56 Reverted the renaming: balltracers -> tracers 2015-05-19 17:25:27 +02:00
ulteq
fb5e6395e2 Yet another typo. 2015-05-19 17:06:33 +02:00
ulteq
f59ce7179a Spelling mistake corrected. 2015-05-19 17:03:38 +02:00
ulteq
60e3d8ff6a Renamed tracers into balltracers 2015-05-19 16:55:55 +02:00
ulteq
f40e471fb9 Initial draft of the ACE2 tracer config compat pbo 2015-05-19 16:35:26 +02:00
ulteq
cd976ac796 Tabs and brackets 2015-05-19 14:46:02 +02:00
ulteq
ce3e0bc361 Disabled parts of AB for some of the pseudo SD rounds 2015-05-19 13:57:44 +02:00
ulteq
4d6cff979c 'Fixed' broken SD ammo classes, they still don't make sense 2015-05-19 13:48:49 +02:00
ulteq
b13f8ff0e7 ZO4x30 -> discreteDistance = 200 2015-05-19 13:30:04 +02:00
ulteq
093da9b66f Fixed incorrect class inheritance 2015-05-19 12:37:14 +02:00
ulteq
d99c66d5ce Added compat pbo for BWA3 mod 2015-05-19 12:23:10 +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
6c826f416c Add ACE_acc_pointer_green_IR to ASDG compat 2015-05-15 22:28:46 -05: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
jaynus
192a02ce56 No really, change it. 2015-05-11 09:03:09 -07:00
jaynus
695e775cd7 Change 'ace_serverconfig' to 'ace_server' 2015-05-11 09:01:16 -07:00
ulteq
0bae8471c5 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
ViperMaul
21ea667463 $NOBIN$ file must not be a zero-byte file in order to affect the cache to trigger a proper rebuild. 2015-05-09 11:07:27 -07:00
Felix Wiegand
6589cdfb0e Merge pull request #1041 from acemod/metric-units 
Metric units
 2015-05-08 13:09:31 +02:00
KoffeinFlummi
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
jaynus
8e3e38f91d Nobin added to server build. Fixes #1043 2015-05-07 12:28:33 -07:00
KoffeinFlummi
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
Lex Rivera
5a3b672f10 [compat_asdg] fix MRCO PiP compatibility 2015-04-29 21:15:32 +03:00
ulteq
e4f6a7b2fc Added scope configs to the RHS compatibility modules 2015-04-27 17:35:03 +02:00
ulteq
0f4a95fddd Replaced TABs with Spaces 2015-04-27 15:48:53 +02:00
ulteq
44932e4fec Added missing base classes 2015-04-27 15:46:49 +02:00
ulteq
40c3bf0f81 Added RHS AFRF/USAF compatibility config 2015-04-27 15:16:42 +02:00
ulteq
bccf07cafb Fixes: https://github.com/acemod/ACE3/issues/855 2015-04-25 20:30:03 +02:00
ulteq
8c8d023345 Fixed compat_rh_m4 module component name 2015-04-25 20:29:45 +02:00
ulteq
e873aa1943 Removed unused config entries 2015-04-25 20:29:27 +02:00
ulteq
f897f204a4 Added optional CUP ammunition compatibility pbo 2015-04-25 10:28:37 +02:00
ViperMaul
be3de0d965 Fixing missing inheritance: class HLC_762x54_tracer: HLC_762x51_tracer 2015-04-24 15:25:32 -07:00
ulteq
9e33b7a32e Renamed all compatibility module to follow the new naming scheme: 
*compat_xxx
 2015-04-24 20:00:35 +02:00
ulteq
af6f9f5a8c Removed unnecessary required addon 2015-04-24 19:56:36 +02:00
ulteq
819b7af426 Added more compatibility modules: 
*hlcmods_ak
*hlcmods_aug
*rh_acc
*rh_de
*rh_m4
*rh_pdf
*rksl_pm_ii
 2015-04-24 19:56:11 +02:00
ulteq
afccc3a44b Added missing base classes 2015-04-24 17:27:26 +02:00
ulteq
9078eed6bb Added optional hlcmods_m14 compatibility pbo 2015-04-24 17:15:28 +02:00
ulteq
5e23f7d842 Added optional hlcmods_g3 compatibility pbo 2015-04-24 17:12:03 +02:00
ulteq
aeef674b08 Added optional hlcmods_fal compatibility pbo 2015-04-24 17:08:08 +02:00
ulteq
87252c3a3e Added optional hlcmods_ak compatibility pbo 2015-04-24 17:05:09 +02:00
ulteq
f707ce3577 Added optional hlc_wp_mp5 compatibility pbo 2015-04-24 16:58:01 +02:00
ulteq
7e491c95a5 Added optional hlc_ar15 compatibility pbo 2015-04-24 16:54:55 +02:00
ulteq
f7ee7323b6 Added compatibility configs for hlcmods_core and hlcmods_m60e4 2015-04-24 14:14:20 +02:00
ulteq
f5e6da60a7 Added optional rh_m4_comp with advanced ballistics configs 2015-04-23 19:59:57 +02:00
Felix Wiegand
f61ffb707e Merge pull request #486 from OnkelDisMaster/patch-2 
script_component.hpp for asdg_comp
 2015-04-20 19:58:50 +02:00
OnkelDisMaster
a1afd87342 Update config.cpp 2015-04-20 19:56:10 +02:00
OnkelDisMaster
85acaa3ab8 Update config.cpp 2015-04-11 21:22:20 +02:00
OnkelDisMaster
57bcb555e9 Update config.cpp 2015-04-11 21:22:07 +02:00
OnkelDisMaster
876cec35df Update config.cpp 2015-04-11 21:20:59 +02:00
OnkelDisMaster
6899659f1c Update config.cpp 2015-04-11 21:19:37 +02:00
OnkelDisMaster
a18171547e script_component.hpp for asdg_comp 
Included in config.cpp of #485
 2015-04-11 21:11:06 +02:00
OnkelDisMaster
f57f7186c2 Config for compatiblity to ASDG Joint Rails 
Added the  scopes and railitems to the according ASDG rails.
 2015-04-11 21:08:00 +02:00
Glowbal
8e457d43ff Update serverconfig.hpp 2015-04-04 22:58:14 +02:00
Glowbal
9713b505ee Optional server config file 2015-03-27 20:35:44 +01:00