PabstMirror
|
f811fc797e
|
Suppress optionsmenu debug
|
2015-06-13 15:03:22 -05:00 |
|
jonpas
|
254b386805
|
Allowed Kestrel4500 Inside and Sitting
|
2015-06-13 21:46:55 +02:00 |
|
ViperMaul
|
1322da5537
|
Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
|
2015-06-13 12:44:34 -07:00 |
|
jonpas
|
29ce8f635e
|
Merge branch 'master' into sitting
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
|
2015-06-13 21:43:42 +02:00 |
|
ViperMaul
|
132ec343b0
|
Suppress debug
|
2015-06-13 12:39:29 -07:00 |
|
ViperMaul
|
911a18d169
|
Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
Convert ASLtoPosition
#1575 and #1577
|
2015-06-13 12:37:10 -07:00 |
|
PabstMirror
|
849a45d68b
|
DAGR - has item check
|
2015-06-13 14:29:34 -05:00 |
|
PabstMirror
|
b2d69611d7
|
Merge pull request #1118 from acemod/multipleDevices
Multiple Devices
|
2015-06-13 14:20:38 -05:00 |
|
PabstMirror
|
e7347be47b
|
Increase delete delay for attached IR grenades (#1615)
|
2015-06-13 14:08:25 -05:00 |
|
Nicolás Badano
|
d262dc790f
|
Merge pull request #1616 from acemod/addMk16ToClaymore
Make claymores detonatable by MK16. Close #1603
|
2015-06-13 16:07:56 -03:00 |
|
PabstMirror
|
0c45d2308a
|
Merge pull request #1150 from acemod/mainMenuVersionHTML
Show Version / HTML Git Version on main menu
|
2015-06-13 14:07:36 -05:00 |
|
Nicolás Badano
|
179ad6c214
|
Merge pull request #1526 from acemod/rainExperiment
Update rain each frame
|
2015-06-13 16:07:25 -03:00 |
|
esteldunedain
|
1237b1cb4a
|
Make claymores detonatable by MK16. Close #1603
|
2015-06-13 16:05:18 -03:00 |
|
PabstMirror
|
f68a2310a8
|
Merge pull request #1589 from acemod/laserPointerSetting
Optional setting to disable laser pointer system
|
2015-06-13 13:56:01 -05:00 |
|
ulteq
|
c459a80bcb
|
Merge pull request #1613 from ProfessorCZ/master
CZ - Translation (medical, tacticalladder)
|
2015-06-13 20:48:34 +02:00 |
|
Glowbal
|
5013254769
|
Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
|
2015-06-13 20:48:18 +02:00 |
|
Nicolás Badano
|
5884eb0d5b
|
Merge pull request #1612 from acemod/removeFrisk
Remove Frisk
|
2015-06-13 15:20:13 -03:00 |
|
esteldunedain
|
d53ee1cf85
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk
Conflicts:
addons/captives/CfgVehicles.hpp
|
2015-06-13 15:19:52 -03:00 |
|
PabstMirror
|
fdb30f4e68
|
Merge pull request #1599 from acemod/captivesFixes
Captives fixes
|
2015-06-13 13:15:29 -05:00 |
|
Glowbal
|
1c066a0b3f
|
Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
PAK treatment time based on total amount of damage.
|
2015-06-13 20:14:57 +02:00 |
|
PabstMirror
|
6dba8b33da
|
Merge pull request #1507 from acemod/fixJavelinLocking
Fix javelin locking
|
2015-06-13 12:54:06 -05:00 |
|
Glowbal
|
3e24749948
|
Merge pull request #1477 from alganthe/longer_flares
flares modified
|
2015-06-13 19:51:27 +02:00 |
|
ProfessorCZ
|
c9f29aefa2
|
CZ - Translation (medical, tacticalladder)
|
2015-06-13 19:49:59 +02:00 |
|
ProfessorCZ
|
bf464ffe00
|
CZ - Translation (medical, tacticalladder)
|
2015-06-13 19:46:31 +02:00 |
|
ulteq
|
c3340b174e
|
Merge pull request #1609 from acemod/ace2EarRinging
Ported the ACE2 ear ringing logic
|
2015-06-13 19:44:15 +02:00 |
|
esteldunedain
|
3d5afd7d8f
|
Close #1018
|
2015-06-13 14:32:18 -03:00 |
|
PabstMirror
|
6ab8b129fa
|
Merge branch 'master' into multipleDevices
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-06-13 12:30:35 -05:00 |
|
ulteq
|
badfc4017c
|
Reset 'deaf' on respawn
|
2015-06-13 19:27:30 +02:00 |
|
PabstMirror
|
e9750ddc9b
|
Merge pull request #1611 from acemod/refineStaticInteration
Manual MainActions position for some statics weapons
|
2015-06-13 12:18:28 -05:00 |
|
ulteq
|
6d6c3a4285
|
Fixed function header
|
2015-06-13 19:17:26 +02:00 |
|
ulteq
|
022f9286e2
|
Fixed a bug in the caching routine
|
2015-06-13 19:12:24 +02:00 |
|
ulteq
|
3427f655b9
|
Removed debug output
|
2015-06-13 19:01:40 +02:00 |
|
ulteq
|
6d4f58c18e
|
weapon magazines caching
|
2015-06-13 18:57:02 +02:00 |
|
ulteq
|
d9722db15e
|
Abort if distance > 50m
|
2015-06-13 18:42:09 +02:00 |
|
ulteq
|
2509f1d840
|
Missing privates
|
2015-06-13 18:34:30 +02:00 |
|
ulteq
|
b6a710d282
|
Implemented a proper magazine lookup routine
|
2015-06-13 18:32:48 +02:00 |
|
ulteq
|
38dca2bb9e
|
New loudness calculation for different ammo types
|
2015-06-13 18:19:35 +02:00 |
|
PabstMirror
|
2efc095c93
|
Merge branch 'master' into laserPointerSetting
Conflicts:
addons/laserpointer/XEH_postInit.sqf
|
2015-06-13 11:02:00 -05:00 |
|
ulteq
|
db68b6c155
|
Increased loudness of missles and rockets.
|
2015-06-13 17:43:27 +02:00 |
|
Nicolás Badano
|
b17b44b869
|
Merge pull request #1601 from acemod/laserpointerCleanup
Privates, newline braces, typos
|
2015-06-13 12:25:21 -03:00 |
|
ulteq
|
feec8a14b7
|
Removed debug output
|
2015-06-13 17:23:45 +02:00 |
|
ulteq
|
eacd8e5a49
|
Removed debug output
|
2015-06-13 17:22:45 +02:00 |
|
Glowbal
|
09337fcd78
|
Added new dll build
|
2015-06-13 17:18:22 +02:00 |
|
ulteq
|
833634f010
|
Ported the ACE2 ear ringing logic
|
2015-06-13 17:16:18 +02:00 |
|
Nicolás Badano
|
c168afe8bb
|
Merge pull request #1598 from acemod/serverModulesFirst
Fix Server not reading modules
|
2015-06-13 12:01:22 -03:00 |
|
ViperMaul
|
cb1d016a39
|
Merge pull request #1592 from ProfessorCZ/master
CZ - Translation
|
2015-06-13 07:39:18 -07:00 |
|
ViperMaul
|
cbb620ba98
|
Change setPos to setPosASL to support roof tops and multi-level objects and faster code.
#1575 and #1577
|
2015-06-13 07:24:50 -07:00 |
|
Glowbal
|
9926e902b3
|
Merge pull request #1607 from gienkov/pl-translation-3
PL tactical ladder translation
|
2015-06-13 14:45:31 +02:00 |
|
gienkov
|
3d440fc0da
|
PL tactical ladder translation
|
2015-06-13 14:36:42 +02:00 |
|
Glowbal
|
e0bb3c0a4e
|
Merge pull request #1602 from acemod/medicalFallingFix2
[Adv. Medical] Improved falling damage
|
2015-06-13 13:39:22 +02:00 |
|