Glowbal
d2f485329f
Update make.py to 0.8 ( #4579 )
2016-10-25 20:11:57 +02:00
jonpas
ffd1f0aff2
Update make.py to 0.8 ( #4579 )
...
* Update make.py to 0.8
* Remove redundant extras folder obsolete handling
* Fix version updating in files when version changes number of digits
* Satisfy bux
2016-10-25 20:11:05 +02:00
PabstMirror
eeb482eb7e
#4557 - Fix warning about bad func type ( #4582 )
2016-10-22 10:57:49 +02:00
PabstMirror
fc15ab9cf0
#4557 - Fix warning about bad func type ( #4582 )
2016-10-22 10:56:26 +02:00
PabstMirror
23568609a6
Faster, non movment blocking gesture for tap shoulder ( #4578 )
...
Close #4577
2016-10-20 23:44:34 +02:00
Glowbal
1390b845d4
Prep 3.8.1 patch
2016-10-20 19:45:40 +02:00
PabstMirror
89d6fefff1
Sanatize damage value used for blood creation ( #4574 )
...
Fix #4571
2016-10-20 19:44:16 +02:00
PabstMirror
f2746891af
Sanatize damage value used for blood creation ( #4574 )
...
Fix #4571
2016-10-20 19:43:52 +02:00
commy2
347be3c222
handle vehicle crashes and add wounds for fall damage
2016-10-20 15:02:24 +02:00
commy2
576a63c27e
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-20 13:56:56 +02:00
commy2
fc39ac14b7
don't knock out if pain is removed
2016-10-20 13:49:52 +02:00
commy2
be56b4d806
knock out due to pain
2016-10-20 13:46:28 +02:00
commy2
370faf9b48
cleanup
2016-10-20 13:38:26 +02:00
commy2
0370a34672
remove some debug
2016-10-20 12:43:57 +02:00
commy2
7e498ab762
setting for basic/advanced syringes
2016-10-20 02:14:11 +02:00
Glowbal
b150f440e6
Prep 3.8.0 Release
2016-10-18 21:57:40 +02:00
Glowbal
d867805406
Prepare v3.8.0 RC3
2016-10-18 20:25:45 +02:00
jonpas
877944ddce
Fix 3rd party air and sea vehicle fuel capacity ( #4554 )
...
* Fix fuel capacity for air vehicles
* Sea vehicles as well, minor empty classes cleanup
2016-10-18 20:21:27 +02:00
classicarma
19fe4016e5
Japanese translations ( #4553 )
2016-10-18 20:19:29 +02:00
PabstMirror
5ae8145234
Don't show dogtag ID in action menu ( #4558 )
...
#4476
2016-10-17 10:55:42 +02:00
commy2
519ea25fc7
cleanup
2016-10-15 13:48:13 +02:00
Glowbal
d9a199b942
Increment build number
2016-10-15 11:44:43 +02:00
Glowbal
8afb3c7279
Update CBA required version
2016-10-15 11:44:26 +02:00
PabstMirror
6fce923783
Fix mortar changes for laser shootRay changes
...
Ref #4478
2016-10-15 11:42:09 +02:00
PabstMirror
fe35e64696
Reset animation speed when not swimming ( #4546 )
2016-10-15 11:41:03 +02:00
commy2
633c6f0ce4
formating
2016-10-13 21:21:42 +02:00
commy2
6b84bd1ff6
fix misc. treatment actions
2016-10-13 21:11:13 +02:00
commy2
e03614757e
fix misc. treatment actions
2016-10-13 21:08:41 +02:00
commy2
03fe2826dd
remove some debug
2016-10-13 20:31:39 +02:00
commy2
f2dfc6dc0e
fixes, tweaks
2016-10-13 20:17:21 +02:00
commy2
bc4c1787f9
show tourniquets in 3d menu
2016-10-13 19:05:29 +02:00
commy2
ba2d6fda8a
treatment tweaks
2016-10-13 17:39:01 +02:00
commy2
fe2c6e8d85
basic <-> advanced
2016-10-13 17:14:43 +02:00
commy2
68d75beae6
manual merge
2016-10-13 16:56:57 +02:00
commy2
2d243d45f3
fix tourniquets
2016-10-13 10:28:28 +02:00
commy2
e1cbeeea16
fix tourniquets
2016-10-13 10:12:28 +02:00
commy2
18907adcd5
increase medical item mass to at least 100 grams
2016-10-13 09:48:58 +02:00
commy2
5965326ca1
merge basic and adv. bandage actions
2016-10-13 09:47:52 +02:00
commy2
b1f0af7e1c
merge basic and adv. bandage actions
2016-10-13 09:10:08 +02:00
commy2
68d199c5b2
merge basic and adv. bandage actions
2016-10-13 02:05:14 +02:00
commy2
4a06d19ce4
merge basic and adv. bandage actions
2016-10-13 01:55:10 +02:00
commy2
fd6e46b622
make waking up rocket soldier kneel not stand
2016-10-13 01:42:32 +02:00
commy2
71884778dd
animation fixes
2016-10-13 01:16:51 +02:00
commy2
e38845bf45
add ace_kill event handler
2016-10-12 23:20:22 +02:00
commy2
92fc4ec14b
add a setting for 'basic' blood bags
2016-10-12 22:38:58 +02:00
commy2
a5d070f829
blood and unconsciousness fixes
2016-10-12 21:59:32 +02:00
commy2
be71e6fa7b
Merge branch 'medical-rewrite-blood' into medical-rewrite
2016-10-12 04:05:50 +02:00
commy2
41dde51e8e
Merge branch 'medical-rewrite-pain' into medical-rewrite
2016-10-12 03:19:48 +02:00
commy2
b0b9037f24
simplify lost some/much blood macros
2016-10-11 19:44:20 +02:00
commy2
d1df47919d
support neg numbers to remove pain in addPain
2016-10-11 19:36:04 +02:00
commy2
1ea2a72f20
don't play scream by addPain function
2016-10-11 19:29:44 +02:00
commy2
ed6688c899
Merge remote-tracking branch 'origin' into medical-rewrite
2016-10-11 19:14:13 +02:00
Glowbal
84cbd50582
Merged branch master into release
2016-10-11 19:04:14 +02:00
commy2
8822cb1b90
emulate frag grenade ai behaviour for incendiaries ( #4534 )
2016-10-11 19:04:08 +02:00
jonpas
b8cc10fecb
Fix #4523 - fuel nozzle disconnect at maximum hose distance
2016-10-11 18:57:58 +02:00
PabstMirror
5d610cf148
Always create namespace at preInit
2016-10-11 18:57:34 +02:00
commy2
130265fd9f
add function to disable dogtags for factions, and disable for civilians
2016-10-11 18:57:34 +02:00
Glowbal
a98013c36e
Merge branch 'master' into release
2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce
Bump REQUIRED_VERSION to 1.64
2016-10-11 18:49:31 +02:00
BaerMitUmlaut
2ba0137a1e
Fix going unconscious while fastroping ( #4531 )
2016-10-11 18:48:20 +02:00
commy2
c390b6c1fc
increase red laser alpha, close #4535
2016-10-11 18:47:52 +02:00
commy2
4fb5d230ac
remove civilian rank icons from nametags ( #4538 )
2016-10-11 18:44:27 +02:00
commy2
d0df141cf7
add comment explaining why 6.0 were chosen
2016-10-10 18:22:46 +02:00
commy2
e2d174837a
move IV transufsion rate macro to blood config
2016-10-10 18:20:58 +02:00
commy2
c2f7366d32
blood volume unit vitals
2016-10-10 17:46:17 +02:00
commy2
3438ea0946
use liters for blood volume variable
2016-10-10 17:30:42 +02:00
commy2
fc079abd46
function header
2016-10-10 16:53:25 +02:00
commy2
2ad7c4c4ea
add addPain function, cap pain
2016-10-10 16:44:03 +02:00
commy2
3521bca00b
change blood texture threshold
2016-10-10 15:22:59 +02:00
commy2
0f43829b63
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-10 14:29:50 +02:00
PabstMirror
a3bbc848a7
Fix ammo box cookoff strings ( #4528 )
2016-10-09 11:57:29 +02:00
Glowbal
8e72d89ef6
Prepare 3.80 RC1
2016-10-08 13:10:34 +02:00
Nicolás Badano
ab6fc8efca
Laser guidance for all designators ( #3308 )
...
* Fix laser and missileguidance over water
* Return a normalized vector in EFUNC(common,getTurretDirection)
* Make laser dispersion simulation optional, default off
* Prototype for ace_laser_designate
* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate
* Simplify laser into one module
Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate
* Cleanup missile guidance
* Headers, fix laser over water
* Cleanup
* Test
* Change setting to scalar, more cleanup
* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
74dfa6ca33
avoid PCTW error on certain vehicles ( #4463 )
...
fix #4413
2016-10-08 12:45:40 +02:00
commy2
4c96278bb4
fix fatigue when diving while sprinting, fix #4481
2016-10-08 12:44:37 +02:00
commy2
842279af9a
setup hit-points LODs
2016-10-08 12:43:28 +02:00
commy2
d1db8899c1
fix damage materials of repair items
2016-10-08 12:43:28 +02:00
PabstMirror
de1c4bc4d9
Draw Straight Lines with maptool ( #4410 )
...
* Draw Straight Lines
* Fix roamer sides, handle closing map mid-draw
* Add missing privates / formula notes
2016-10-07 17:21:19 -05:00
PabstMirror
ef9fd92898
Show correct elev for mortar with no ammo ( #4478 )
...
Fix #3757
2016-10-07 17:06:04 -05:00
commy2
b0c0156d75
reduce some overhead
2016-10-07 05:10:43 +02:00
commy2
4bc1c1db56
handle blood visuals
2016-10-07 04:21:01 +02:00
commy2
b698a88dc1
move modifyAction func to menu component
2016-10-07 01:58:40 +02:00
commy2
d4dd1626a5
delete some unused/moved functions from medical main component
2016-10-07 00:19:51 +02:00
commy2
50eeebd30d
add weapon sway by pain
2016-10-07 00:09:58 +02:00
commy2
f004504a53
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-10-06 23:44:31 +02:00
commy2
56c77fed94
prep for new pain aim sway method
2016-10-06 23:44:14 +02:00
PabstMirror
198f6c93e4
Fix FRIES attach point for unarmed wildcat ( #4518 )
...
Close #4490
2016-10-06 15:58:45 -05:00
commy2
673f3b4f9f
implement arithmetic source for fatigue system ( #4517 )
2016-10-06 22:46:46 +02:00
commy2
e9586ebccc
use common header file for medical components
2016-10-06 22:40:36 +02:00
Glowbal
059980b1a5
Add ammo cookoff ( #4376 )
...
* Add Ammo cookoff
* Remove tabs
* Add initial ammo box cook-off
Does not include a fire effect, mostly just a proof of concept.
Should probably also add further potential cook-off conditons (if hit by tracer for example).
* Add burning effects to ammo box cook off
- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning
Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.
* Improve ammo cookoff
* Integrate ammo cookoff with the incendiary grenade
* Disable ammo cook off underwater
* Optimize fnc_detonateAmmunition
I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!
* Improve ammo box cook off
- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke
* Add tracer induced ammo box cook off
Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.
* Decrease amount of explosions from ammo cookoff
* Add is local check for remote event
2016-10-06 22:37:38 +02:00
commy2
853c7db1dc
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-10-06 10:20:10 +02:00
PabstMirror
dfa09d3161
Functions to perform arithmetic ops on sets ( #4514 )
...
* Functions to perform arithmetic ops on a set
* fix spelling
2016-10-06 10:18:14 +02:00
commy2
5613ec5d5a
treatment functions and unconsciousness rework
2016-10-06 00:54:57 +02:00
commy2
2e147b37f0
fix formating of CBA version check ( #4511 )
2016-10-05 13:06:21 -05:00
PabstMirror
1779099b71
Cleanup old common macros ( #4507 )
2016-10-04 05:29:37 +02:00
commy2
bad01c3126
simplify blood splatter by using woundReceived event
2016-10-02 19:13:56 +02:00
commy2
6082020056
simplify blood splatter by using woundReceived event
2016-10-02 18:35:40 +02:00
commy2
5875f58604
use new macro
2016-10-02 17:50:17 +02:00
commy2
feac296f9c
use a new macro
2016-10-02 13:06:47 +02:00
commy2
56882a9bcb
manual merge
2016-10-02 13:04:20 +02:00
