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
1c4566984f
Removed debug output
2015-06-13 12:13:58 +02:00
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
234b62b409
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2
2015-06-13 11:12:37 +02:00
9b2ebfcbe8
Privates, newline braces, typos
2015-06-13 10:41:19 +02:00
86d7143890
Merge pull request #1600 from acemod/tacticalladderStringtable
...
Made use of the new stringtable macros
2015-06-13 09:52:02 +02:00
6eeeb22fcd
Made use of the new stringtable macros
2015-06-13 09:51:49 +02:00
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
b86e6b6043
Merge pull request #1493 from acemod/tacticalladder
...
Initial draft of the ACE2 tactical ladder port.
2015-06-13 09:37:41 +02:00
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
45912c6ddb
Handcuff icon for passengerActions
2015-06-13 00:12:13 -05:00
9f15cfb650
Merge branch 'master' into captivesFixes
2015-06-13 00:02:41 -05:00
58e5bc3581
Switch unload captive to passenger actions
2015-06-13 00:02:30 -05:00
affe323435
Fix bodybag string macro
2015-06-12 23:19:17 -05:00
177f590dda
Make "InitSettingsFromModules" pfeh run on dedicated
2015-06-12 22:57:01 -05:00
1804c6ceab
Merge branch 'master' into serverModulesFirst
2015-06-12 22:40:04 -05:00
1c0811aa31
Change from globalEvent to targetEvent
...
#1575 and #1577
2015-06-12 16:56:13 -07:00
4160c7668c
Workaround to prevent accidentally canceling the ladder deployment
2015-06-13 00:01:48 +02:00
8336f1d192
Complete overhaul of the ladder interaction routine
2015-06-12 23:54:51 +02:00
9499592322
Cleanup
2015-06-12 22:45:41 +02:00
fd40c3a947
New backpack model from raspu:
...
* Fixes incorrect positioning
2015-06-12 22:14:19 +02:00
1cbe972999
Merge pull request #1585 from acemod/huntirParachuteSpeed
...
HuntIR parachute falling speed experiment
2015-06-12 21:41:46 +02:00
62fc0a90e6
Removed the model.cfg
2015-06-12 21:41:17 +02:00
6fe7b15832
Removed debug output
2015-06-12 21:40:44 +02:00
c45b443bbc
Merge pull request #1597 from SzwedzikPL/interact_passengers_icons
...
slot icons in passengers menu
2015-06-12 15:38:45 -03:00
ac87a28daa
role icon for passengers
2015-06-12 20:32:10 +02:00
1393b79a82
Reduced the descending speed of the parachute:
...
* Adjusted the geometry LOD mass in the huntir.p3d
* Fixed the calculating of the recording time
2015-06-12 20:22:09 +02:00
19d3cd168c
del extra space
2015-06-12 19:54:45 +02:00
805c0e1c68
Open action for boxes
2015-06-12 19:48:28 +02:00
c51000e8a4
Merge pull request #1595 from acemod/dagrGunnerView
...
DAGR overlay auto hide
2015-06-12 18:44:19 +02:00
9130546c8c
DAGR overlay auto hide
2015-06-12 18:23:01 +02:00
4b0c4b9dd6
handleDamage EH for the HuntIR
2015-06-12 18:01:53 +02:00
acc5f4d29f
CZ - Translation
2015-06-12 15:05:04 +02:00
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
604cd122d3
Experiment
2015-06-12 13:54:52 +02:00
f84a936d95
Merge pull request #1504 from acemod/concertina_wire
...
Ported the ACE2 Concertina Wire
2015-06-12 13:42:32 +02:00
2e0b837190
Merge pull request #1534 from acemod/dagr
...
Initial draft of the ACE2 DAGR port
2015-06-12 13:42:25 +02:00
0aaabfde7c
Merge pull request #1591 from acemod/medicalFallingFix
...
Fixes _projectile not being updated
2015-06-12 11:54:34 +02:00
6ac2ca9208
Fixes _projectile not being updated
2015-06-12 11:48:49 +02:00
46a73f3177
Added a function to calculate the PAK treatmentTime
2015-06-12 11:42:49 +02:00
b960ae5d6b
Optional setting to disable laser pointer system
2015-06-12 00:58:04 -05:00
f48777462f
Text Spacing
2015-06-11 23:59:51 -05:00
13602262cf
Update RHS compat for 0.3.8
2015-06-11 21:04:34 -05:00
072f2cc3a7
fix animation and consistently unload units from vehicle
...
#1575 and #1577
2015-06-11 15:56:11 -07:00
99b13a584a
PAK treatment time based on total amount of damage.
2015-06-11 22:54:08 +02:00
be6d72606a
Pain is always suppressed again
2015-06-11 22:35:50 +02:00
b974a63947
Lowercased function, comment
2015-06-11 21:51:41 +02:00
eff31db128
HuntIR parachute falling speed experiment
2015-06-11 21:50:43 +02:00
d8877d0dbd
Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder
2015-06-11 21:28:44 +02:00
491e2a4429
Handle handcuffing
2015-06-11 20:01:38 +02:00
