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
Glowbal
ce908f0fb3
Merge pull request #1579 from acemod/medicalModuleOptions
...
[Adv. Medical] New module options
2015-06-13 13:37:02 +02:00
Glowbal
d448c9e7c0
Fixed select new injuryToAdd always selects first
...
It should not always take the first injury in the list. That would with the current configuration almost always be the same injury as in `highestSpot`.
This might need to be expanded with something that prefers higher damage types.
2015-06-13 12:37:41 +02:00
ulteq
1c4566984f
Removed debug output
2015-06-13 12:13:58 +02:00
ulteq
84d20f9794
Further improved the handling of falling damage:
...
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
2015-06-13 11:53:30 +02:00
ulteq
234b62b409
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2
2015-06-13 11:12:37 +02:00
ulteq
9b2ebfcbe8
Privates, newline braces, typos
2015-06-13 10:41:19 +02:00
ulteq
86d7143890
Merge pull request #1600 from acemod/tacticalladderStringtable
...
Made use of the new stringtable macros
2015-06-13 09:52:02 +02:00
ulteq
6eeeb22fcd
Made use of the new stringtable macros
2015-06-13 09:51:49 +02:00
ulteq
b4e0504747
Merge pull request #1588 from acemod/rhs38_us_compat
...
Update RHS compat for 0.3.8
2015-06-13 09:38:07 +02:00
ulteq
b86e6b6043
Merge pull request #1493 from acemod/tacticalladder
...
Initial draft of the ACE2 tactical ladder port.
2015-06-13 09:37:41 +02:00
ulteq
42f2d88ab7
Merge pull request #1257 from LKS90/modifiedSetup
...
Added steps I had to do for windows to make ace3
2015-06-13 09:29:22 +02:00
PabstMirror
45912c6ddb
Handcuff icon for passengerActions
2015-06-13 00:12:13 -05:00
PabstMirror
9f15cfb650
Merge branch 'master' into captivesFixes
2015-06-13 00:02:41 -05:00
PabstMirror
58e5bc3581
Switch unload captive to passenger actions
2015-06-13 00:02:30 -05:00
PabstMirror
affe323435
Fix bodybag string macro
2015-06-12 23:19:17 -05:00
PabstMirror
177f590dda
Make "InitSettingsFromModules" pfeh run on dedicated
2015-06-12 22:57:01 -05:00
