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
4e0f3e53e0
manual merge
2016-10-12 22:03:08 +02:00
commy2
a5d070f829
blood and unconsciousness fixes
2016-10-12 21:59:32 +02:00
bux578
4d31c8f148
add missing line in medical doc ( #4545 )
2016-10-11 21:42:16 -05: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
d781890ee1
use liters for blood volume variable ( #4537 )
...
* use liters for blood volume variable
* blood volume unit vitals
* move IV transufsion rate macro to blood config
* add comment explaining why 6.0 were chosen
* simplify lost some/much blood macros
2016-10-11 20:19:55 +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
bux578
a1fef405e8
Merge pull request #4542 from acemod/docReadmeFix
...
Fix documentation README commands
2016-10-11 14:31:19 +02:00
jonpas
cbbdd6f939
Use apt-get consitently instead of new apt only
2016-10-11 14:21:54 +02:00
jonpas
627a11545a
Fix documentation README commands
2016-10-11 14:18:58 +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
bux578
0143dd40ba
Merge pull request #4524 from acemod/removeLaserSelfWiki
...
Remove Laser-SelfDesignate wiki page
2016-10-08 16:05:32 +02:00
jonpas
d29677d366
Remove Laser-SelfDesignate wiki page
2016-10-08 15:01:34 +02:00
Glowbal
8e72d89ef6
Prepare 3.80 RC1
2016-10-08 13:10:34 +02:00
ace3mod
c192378e90
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2016-10-08 12:56:30 +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
PabstMirror
1756ca2eeb
Add tool to upload ace and compats to workshop ( #4163 )
...
* Add tool to upload ace and compats to workshop
* Add ACE/RHS steamIDs, use changelog.txt
* Uncomment main ace publish
* Create individual RHS compat mods, add adr97
2016-10-07 17:05:53 -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
