Commit Graph

11205 Commits

Author SHA1 Message Date
56c77fed94 prep for new pain aim sway method 2016-10-06 23:44:14 +02:00
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518)
Close #4490
2016-10-06 15:58:45 -05:00
673f3b4f9f implement arithmetic source for fatigue system (#4517) 2016-10-06 22:46:46 +02:00
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02:00
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
853c7db1dc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-10-06 10:20:10 +02:00
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
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
2e147b37f0 fix formating of CBA version check (#4511) 2016-10-05 13:06:21 -05:00
97c02c306b Disable FCS on RHS helicopters (#4509)
* Disable FCS on RHS helicopters - Close #4495

* Cleanup
2016-10-05 13:03:52 -05:00
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
bc4177d4ff Merge pull request #4503 from acemod/fixTables
Make wide tables scrollable on mobile, close #3115
2016-10-03 11:42:50 +02:00
c57e2e1cd0 make wide tables scrollable on mobile 2016-10-03 07:02:50 +02:00
bad01c3126 simplify blood splatter by using woundReceived event 2016-10-02 19:13:56 +02:00
6082020056 simplify blood splatter by using woundReceived event 2016-10-02 18:35:40 +02:00
5875f58604 use new macro 2016-10-02 17:50:17 +02:00
feac296f9c use a new macro 2016-10-02 13:06:47 +02:00
56882a9bcb manual merge 2016-10-02 13:04:20 +02:00
f4d4c521d7 manual merge 2016-10-02 13:02:17 +02:00
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
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
5da11d5f79 remove obsolete macro 2016-10-02 12:17:48 +02:00
9942518a53 Merge remote-tracking branch 'origin/master' into cba-log-macros 2016-10-02 12:11:52 +02:00
b4ab15bb47 Use hitpoints in medical extension (#4494) 2016-10-02 09:41:17 +02:00
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
95da004370 Fix Ambient Sounds (#4470)
Fix #4418
- Remove leading `\` for configfile sounds
- Cleanup randomized location code
2016-10-01 10:27:00 +02:00
bfc5af32f3 Add model.cfg for medical blood (#4489) 2016-09-30 16:29:48 -05:00
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
a54aec72bc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-30 21:19:16 +02:00
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -05:00
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
c93e9e3f3b fix playSoundInjured wrong args 2016-09-30 13:03:43 +02:00
6ae57e991f delete obsolete 2016-09-30 12:28:34 +02:00
490155270b QEGVAR vs QGVAR 2016-09-30 12:18:59 +02:00
bd98e44a94 simplify 2016-09-30 11:52:05 +02:00
77f21e9441 add some more functions to engine component 2016-09-30 11:23:07 +02:00
1196cbb210 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-30 10:39:06 +02:00
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
a5d106c116 Fix cookoff event calling (#4487) 2016-09-29 18:44:48 -05:00
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
03e24d8fd9 improve checkItems function 2016-09-29 21:32:54 +02:00
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
f53d324c0d simplifications in the treatment config 2016-09-29 20:29:44 +02:00
bc7b055584 Merge remote-tracking branch 'origin/medical-rewrite-treatment-fnc' into medical-rewrite 2016-09-29 19:47:19 +02:00
4808e0e1cc manual merge 2016-09-29 19:46:20 +02:00
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00
ef8ad21446 fix inconsistencies in treatment time between basic and adv, fix item usage 2016-09-29 19:43:50 +02:00
e418cc05e9 cleanup, fix headers treatment has/use item functions 2016-09-29 19:31:48 +02:00
d3f6f040cd fix some problems with transitions from lowered weapon animations 2016-09-29 19:15:16 +02:00