Commit Graph

10857 Commits

Author SHA1 Message Date
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
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
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
97c02c306b Disable FCS on RHS helicopters (#4509)
* Disable FCS on RHS helicopters - Close #4495

* Cleanup
2016-10-05 13:03:52 -05:00
PabstMirror
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
bux578
bc4177d4ff Merge pull request #4503 from acemod/fixTables
Make wide tables scrollable on mobile, close #3115
2016-10-03 11:42:50 +02:00
bux578
c57e2e1cd0 make wide tables scrollable on mobile 2016-10-03 07:02:50 +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
Glowbal
b4ab15bb47 Use hitpoints in medical extension (#4494) 2016-10-02 09:41:17 +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
bc7b055584 Merge remote-tracking branch 'origin/medical-rewrite-treatment-fnc' into medical-rewrite 2016-09-29 19:47:19 +02:00
commy2
4808e0e1cc manual merge 2016-09-29 19:46:20 +02:00
commy2
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00