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
commy2
f4d4c521d7
manual merge
2016-10-02 13:02:17 +02:00
commy2
05d30c5573
convert log macros to cba versions ( #4282 )
...
* convert log macros to cba versions
* Add changes to AB
* remove obsolete macro
2016-10-02 12:55:31 +02:00
commy2
f185742e68
manual merge
2016-10-02 12:51:29 +02:00
commy2
5da11d5f79
remove obsolete macro
2016-10-02 12:17:48 +02:00
commy2
9942518a53
Merge remote-tracking branch 'origin/master' into cba-log-macros
2016-10-02 12:11:52 +02:00
Pawel W
ddd036f5bd
Removed aiDispersionCoef for vanilla weapons ( #4484 )
...
When merged this pull request will restore default aiDispersionCoef for vanilla weapons.
2016-10-01 10:27:34 +02:00
PabstMirror
95da004370
Fix Ambient Sounds ( #4470 )
...
Fix #4418
- Remove leading `\` for configfile sounds
- Cleanup randomized location code
2016-10-01 10:27:00 +02:00
PabstMirror
bfc5af32f3
Add model.cfg for medical blood ( #4489 )
2016-09-30 16:29:48 -05:00
PabstMirror
6ad15e02c7
Fix spotting rifle loudness ( #4488 )
2016-09-30 15:10:20 -05:00
commy2
a54aec72bc
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-09-30 21:19:16 +02:00
PabstMirror
1bc5669c95
Merge branch 'master' into cba-log-macros
2016-09-30 11:18:58 -05:00
jonpas
8458cb2339
Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace ( #4222 )
...
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's
* Use QFUNC
* Bump required CBA version
* Change remove version to 3.110.0
2016-09-30 15:51:03 +02:00
commy2
c93e9e3f3b
fix playSoundInjured wrong args
2016-09-30 13:03:43 +02:00
commy2
6ae57e991f
delete obsolete
2016-09-30 12:28:34 +02:00
commy2
490155270b
QEGVAR vs QGVAR
2016-09-30 12:18:59 +02:00
commy2
bd98e44a94
simplify
2016-09-30 11:52:05 +02:00
commy2
77f21e9441
add some more functions to engine component
2016-09-30 11:23:07 +02:00
commy2
1196cbb210
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-09-30 10:39:06 +02:00
commy2
96a1e74c85
synch anim speed acceleration
2016-09-30 10:38:27 +02:00
PabstMirror
a5d106c116
Fix cookoff event calling ( #4487 )
2016-09-29 18:44:48 -05:00
jonpas
dad4293216
Revert "Update showHud setter for Squad Radar" ( #4485 )
2016-09-29 17:53:17 -05:00
PabstMirror
60a7490b7e
Fix some moved funcs/strings
2016-09-29 15:08:36 -05:00
commy2
03e24d8fd9
improve checkItems function
2016-09-29 21:32:54 +02:00
jonpas
1bd7a66888
Merge pull request #4085 from acemod/apexShowHud
...
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
commy2
f53d324c0d
simplifications in the treatment config
2016-09-29 20:29:44 +02:00
commy2
20a544e549
remove debug mode
2016-09-29 19:45:03 +02:00
commy2
ef8ad21446
fix inconsistencies in treatment time between basic and adv, fix item usage
2016-09-29 19:43:50 +02:00
commy2
e418cc05e9
cleanup, fix headers treatment has/use item functions
2016-09-29 19:31:48 +02:00
commy2
d3f6f040cd
fix some problems with transitions from lowered weapon animations
2016-09-29 19:15:16 +02:00
commy2
2c7864c02b
implement custom treatment sounds
2016-09-29 18:45:18 +02:00
commy2
ecd77630f5
some more animation time tweaks
2016-09-29 18:12:51 +02:00
PabstMirror
3c7ac5a3e4
Fix medical blood locality / bleeding in vehicles ( #4469 )
...
* Fix medical blood locality / bleeding in vehicles
- Fix ace_setting
- Don't run on headless if enabledFor = 1
- Don't create blood for non-local units
- Don't create blood when mounted (except static weapons)
* Add readme
2016-09-29 10:42:56 -05:00
PabstMirror
85c4a1f021
Fix frag - reflectionsEnabled ( #4475 )
...
PFEH never exited
2016-09-29 10:42:21 -05:00
commy2
36d244a868
'modernize' primary treatment functions, fix animation issues, add anim speed scaling
2016-09-29 16:00:19 +02:00
Nicolás Badano
0fda1b0c3d
Fix #4476
2016-09-28 19:37:54 -03:00
commy2
410c5f1d5f
treatment debug
2016-09-28 20:46:46 +02:00
commy2
4484a36f25
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-09-28 18:33:16 +02:00
commy2
1219d3df23
remove deprecated sitting module ( #4458 )
...
* remove deprecated sitting module
* Update sitting documentation for removal
* Remove ACE3 sitting doc, redirect to ACEX and add note
* Fix wording
2016-09-28 13:14:50 +02:00
commy2
0decd72063
manual merge
2016-09-28 08:37:39 +02:00
commy2
3d67de6fc1
fix a missing
2016-09-27 22:33:29 +02:00
commy2
035e8017cc
Merge remote-tracking branch 'origin/medical-rewrite-interactions' into medical-rewrite
2016-09-27 21:38:30 +02:00
commy2
20d00d7cd9
make units scream when they're hit
2016-09-27 21:21:44 +02:00
KoffeinFlummi
72899643bd
Merge branch 'master' into japanesestringtables
2016-09-27 20:54:17 +02:00
commy2
a913054b57
fix error with out of bounds blood loss
2016-09-27 20:00:58 +02:00
commy2
5a19d4884b
disable debug medical_damage
2016-09-27 19:22:54 +02:00
commy2
09c5fbde15
Merge remote-tracking branch 'origin/master' into medical-rewrite
2016-09-27 18:59:43 +02:00
classicarma
1fe8cc03db
translate realisticnames
2016-09-28 01:38:19 +09:00
classicarma
3f79d47fb4
translate zeus
2016-09-28 01:27:05 +09:00
classicarma
30a62b1337
translate yardage450
2016-09-28 01:26:50 +09:00
classicarma
b2e1432c2b
translate winddeflection
2016-09-28 01:26:42 +09:00
classicarma
c4038970f2
translate weather
2016-09-28 01:26:31 +09:00
classicarma
5a2f92613d
translate weaponselect
2016-09-28 01:26:17 +09:00
classicarma
e1b1a9cfec
translate viewdistance
2016-09-28 01:26:08 +09:00
classicarma
de60b9fdbf
translate vehicle
2016-09-28 01:25:57 +09:00
classicarma
d1c2c5be2e
translate vehiclelock
2016-09-28 01:25:47 +09:00
classicarma
8f86482a86
translate vector
2016-09-28 01:25:36 +09:00
classicarma
ff4464370c
translate ui
2016-09-28 01:25:23 +09:00
classicarma
04e3a5f92e
translate tripod
2016-09-28 01:25:14 +09:00
classicarma
2f2c426e97
translate trenches
2016-09-28 01:25:06 +09:00
classicarma
eed1f50ae0
translate tagging
2016-09-28 01:24:58 +09:00
classicarma
4ee9ffba3f
translate tacticalladder
2016-09-28 01:24:47 +09:00
classicarma
95da6b471c
translate switchunits
2016-09-28 01:24:37 +09:00
classicarma
2b4bcfc585
translate spottingscope
2016-09-28 01:24:28 +09:00
classicarma
038e7775a3
translate spectator
2016-09-28 01:24:21 +09:00
classicarma
4cfa3d95cc
translate slideshow
2016-09-28 01:23:18 +09:00
classicarma
6bcdaae866
translate sitting
2016-09-28 01:23:04 +09:00
classicarma
686b534701
translate scopes
2016-09-28 01:22:56 +09:00
classicarma
953ba0ff98
translate sandbag
2016-09-28 01:22:49 +09:00
classicarma
ae82c41a1b
translate safemode
2016-09-28 01:22:40 +09:00
classicarma
775a6a5bc9
translate respawn
2016-09-28 01:22:33 +09:00
classicarma
cb842a4e1c
translate repair
2016-09-28 01:22:20 +09:00
classicarma
3935a1b781
translate reloadlaunchers
2016-09-28 01:22:08 +09:00
classicarma
52d9c080cb
translate reload
2016-09-28 01:21:58 +09:00
classicarma
feebd8e1b8
translate refuel
2016-09-28 01:21:49 +09:00
