11662 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
nomisum	59ca44bb4b	[typofix] explosion -> explosive (#4816)	2017-01-11 17:35:35 -06:00
Dedmen Miller	6c12444d85	Fixes #4814 (#4815) ... Doesn't fix the core issue behind #4814 but it fixes the issue that bothered me so much that i reported this.	2017-01-11 15:54:03 -06:00
PabstMirror	39181fdea5	Simplify huntIR configs using += (#4521) ... * Add huntIR magazine to GL_3GL_F via sub config * Cleanup RHS 40mm huntIR GL config * Add huntir to standalone m320 - #4199	2017-01-09 12:11:31 -06:00
PabstMirror	8752b03c12	Hearing - player only event handlers (#4727)	2017-01-09 12:10:52 -06:00
PabstMirror	bce0913019	Cookoff - add function to get ammo (#4779) ... * Cookoff - add function to get ammo Fix #4565 - Function adds virtual ammo for rearm vehicles Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just the current mag Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false * Fix header * Cleanup getting ammo from turrets	2017-01-04 15:35:54 -06:00
classic	0046ba4bbb	fix Japanese translation for #4785 (#4804) ... "j" is replace by a "J"	2017-01-04 16:37:00 +01:00
KoffeinFlummi	5f4a7d7b46	Add Luigium to AUTHORS as requested.	2017-01-03 23:40:28 +01:00
J3aLeiNe	2dcd79fd1d	Update MapData (#4786) ... * Update Map data - Add IFA3LITE maps - Add CSA38 map - Add Beketov map - Add Winter Panthera map - Add Nam and Mogadishu maps - Add Uhao island map * Update fnc_getMapData.sqf - Add X-Cam-Taunus map - Add Unsung 3.1 Delta maps	2017-01-02 21:32:58 -06:00
BaerMitUmlaut	0a05401e74	Fix cookoff locality issues (#4799) ... * Fix locality issue with box cookoff * Add grenade fired EHs on hcs and dedis	2017-01-02 17:55:44 -06:00
classic	9d37d91c71	Jpn translation for overpressure #4770 (#4785) ... Japanese translation for #4770	2017-01-02 17:54:51 -06:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
jonpas	de729ec132	Merge pull request #4801 from acemod/fixDuplicateStrings ... Remove duplicated Zeus strings	2017-01-02 16:48:45 +01:00