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