Commit Graph

11574 Commits

Author SHA1 Message Date
Ozan Eğitmen
d2ee1e987a Frag Superanal Cleanup (#4803)
* Minimal frag cleanup

* Why did this even happen in the first place
2017-02-10 12:28:27 -06:00
Dedmen Miller
5351b43ff3 Cache Nametags onDraw3D flags. (#4847)
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
2017-02-10 12:19:14 -06:00
PabstMirror
4433f6eb38 Merge branch 'master' into medical-rewrite 2017-02-08 10:32:22 -06:00
PabstMirror
231346a199 Fix Javelin for AI (#4857) 2017-02-05 23:01:48 +01:00
commy2
10756ff02d fix HK416 name, fix #4873 (#4874) 2017-02-05 23:01:06 +01:00
jonpas
4d872b84b7 Fix double single quote to single double quote (#4876) 2017-02-05 23:00:35 +01:00
jonpas
c1f59e5334 Cleanup GitHub Changelog Generator config file (#4875) 2017-02-05 16:50:41 +01:00
Glowbal
c0c41667e7 prep v3.9.0 2017-02-05 13:48:09 +01:00
Dystopian
06f99f044c Fix deprecated AW159 and CH-47I config (#4726) 2017-02-02 17:45:32 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866)
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
2017-02-02 13:03:13 -06:00
BaerMitUmlaut
0c6eec8485 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-01-30 21:34:51 +01:00
BaerMitUmlaut
60c57a7f20 Fix unconscious state in cardiac arrest 2017-01-30 21:22:10 +01:00
BaerMitUmlaut
9d3807e7c2 Fixed div by zero 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
7ff753c3c2 Fixed missing semicolon 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
20cf30a7c6 Moved heart beat sounds to medical ui 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
ecbe429f9d Fixed missing private 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
e447d5c222 Added bleeding effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9cef8ea591 Save pain next tick in GVAR instead of on unit 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
1dc301e023 Added ACE2 like repeated eye opening when unconscious, fixed going into Zeus while waking up 2017-01-29 21:59:24 +01:00
ulteq
04b720f5bc Make use of EFUNC(medical,getPainLevel) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
57cacf63fa Rewrote unconscious effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
26627a451e Tweaked pain effect (longer flashes/pulses) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
13ef6b0d29 Fixed blood volume effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
751c7ff959 Fixed default blood volume 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9eba2bd448 Added visual effects 2017-01-29 21:59:24 +01:00
Dorbedo
aa393ccf92 typo in ace_interaction_fnc_getDoorAnimations (#4854) 2017-01-28 13:43:42 -06:00
Dystopian
b30705661c add real name for civilian kamaz trucks (#4851) 2017-01-23 12:14:55 -06:00
Neviothr
9b36ccadcc Aircraft cleanup (#4818)
* Cleanup

* Returned lines between classes

* Add files via upload
2017-01-23 12:13:37 -06:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842)
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
2017-01-23 12:13:02 -06:00
Dystopian
7cdf2d75a3 fix win newline in repo (#4849) 2017-01-23 00:56:52 +01:00
Dystopian
d5d8413ee9 fix kamaz medical can repair (#4850) 2017-01-22 10:39:02 -06:00
jonpas
c6c5149ed0 Merge pull request #4846 from acemod/rhFlashlightMapCompat
Add RH Acc Surefire flashlight map compatibility
2017-01-21 20:34:09 +01:00
jonpas
100a25cb97 Add RH Acc Surefire flashlight map compatibility 2017-01-21 19:19:56 +01:00
ViperMaul
ba810a22e6 Tab clean up. 2017-01-19 18:38:51 -06:00
ViperMaul
ad2e3719b4 Adding Normal to Common stringtable 2017-01-19 17:31:29 -06:00
ViperMaul
567c9129b2 cleanup 2017-01-19 17:23:54 -06:00
ViperMaul
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b Settings and string changes 2017-01-19 15:30:27 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
ViperMaul
69dc3ba12e Add Settings to Medical Settings Module 2017-01-19 11:48:34 -06:00
jonpas
b7f36ffd12 Add orange map chemlight entry (#4839) 2017-01-18 18:18:28 -06:00
PabstMirror
120ddd94de Merge branch 'master' into medical-rewrite 2017-01-17 18:03:28 -06:00
ViperMaul
5deb305906 Fix ace_gunbag track named properties (#4838) 2017-01-17 18:03:27 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821)
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
2017-01-17 15:33:22 -06:00
PabstMirror
4f3f847930 Fix ace_track named properties (#4837)
* Fix ace_track named properties

* Fix 4 more
2017-01-17 15:32:14 -06:00
jonpas
3ac00f2e21 Fix medical typo 'to' -> 'too' (#4824) 2017-01-17 15:26:07 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
Neviothr
ade87adf46 Modules Cleanup (#4813)
* Cleanup

* Added newlines
2017-01-14 15:47:03 -06:00
bux
3f00da7365 decrease concertina "dismount" time, use ace checks (#4812)
IRL it’s just pushing them together again
2017-01-13 13:43:54 -06:00