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 |
|