5115 Commits

Author	SHA1	Message	Date
ViperMaul	626a9cf5f9	Disable headBugFix if unconscious	2015-07-28 13:06:58 -07:00
SilentSpike	16597515f0	Adding remaining missing English straings	2015-07-28 20:55:22 +01:00
PabstMirror	9b551e3fdf	#1931 - Fix Explosives Module Strings	2015-07-28 14:42:23 -05:00
Glowbal	6289601b4e	Merge pull request #1935 from jokoho48/ParachuteFix ... change form addBackpack to addBackpackGlobal	2015-07-28 20:11:42 +02:00
Glowbal	7a65af4926	Merge pull request #1928 from acemod/headbugfix ... Headbugfix	2015-07-28 20:10:51 +02:00
Joko	46531b916a	change form addBackpack to addBackpackGlobal	2015-07-28 20:08:38 +02:00
Joko	baa1aab257	Fix Spelling	2015-07-28 19:24:34 +02:00
Joko	b2eeaacfc1	Fix Double Config Entry	2015-07-28 18:51:17 +02:00
Joko	55cac4b6d9	posible fix for #1932	2015-07-28 18:36:13 +02:00
ViperMaul	92940ea1a9	Removed improper translations ... #1738	2015-07-28 15:17:22 +01:00
ViperMaul	675996d67b	Adding HeadBugFix button to the ACE Options dialog (missing file) ... #1738	2015-07-28 15:17:20 +01:00
ViperMaul	c9d9f78e5b	Add headBugFix button to ACE Options Dialog #1738	2015-07-28 15:17:19 +01:00
SilentSpike	c73eef28ed	Pushing back ace_spectator to feature branch	2015-07-27 21:25:39 +01:00
Glowbal	5ec59045c1	Default disable sitting	2015-07-27 22:00:30 +02:00
Glowbal	7d30bc53ed	Removed non chairs	2015-07-27 21:59:38 +02:00
SilentSpike	47d96835c6	Fix arrayIntersect oversight	2015-07-27 18:32:21 +01:00
Grzegorz	d23cab06aa	+ and -	2015-07-27 13:20:07 +02:00
PabstMirror	ceb12662e0	Version To 3.2.0	2015-07-27 02:05:58 -05:00
ViperMaul	4f53bdefb9	Suppress debug in fnc_unloadPersonLocal.sqf	2015-07-26 23:54:42 -07:00
ViperMaul	9a98530392	Add support for loading unconscious into boats, refs #1729	2015-07-26 18:33:25 -07:00
ViperMaul	6142d99626	Add support for loading unconscious into co-pilot seat ... fixes #1727	2015-07-26 18:20:36 -07:00
gienkov	5136215e79	finger, parachute and spectator translation	2015-07-27 01:46:58 +02:00
gienkov	5bb1dded4b	Merge remote-tracking branch 'origin' into pl-translation-4	2015-07-27 00:47:54 +02:00
PabstMirror	bf4e95e750	Merge pull request #1548 from acemod/fingering ... Fingering	2015-07-26 16:47:41 -05:00
PabstMirror	4f9dba61ee	Mk6 - Misc cleanup	2015-07-26 16:45:34 -05:00
Glowbal	41196c15aa	Merge pull request #1686 from acemod/fixFrag ... Fix frag	2015-07-26 23:42:16 +02:00
ViperMaul	951afef495	Merge pull request #1911 from acemod/fixLoadUnloadUnconscious ... Fix load unload unconscious	2015-07-26 14:33:46 -07:00
Glowbal	0af6c5d852	Merge pull request #1913 from acemod/improveSwitchUnits ... Improve SwitchUnits	2015-07-26 21:13:21 +02:00
Glowbal	d1809e597c	Removed requirement for the medical dll ... Medical extension is now an optional requirement that improves performance for advanced medical when used.	2015-07-26 20:54:49 +02:00
SilentSpike	159937dc45	Merge branch 'master' into ace_spectator ... Conflicts: addons/explosives/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/map/stringtable.xml addons/medical/stringtable.xml addons/sitting/stringtable.xml addons/spectator/stringtable.xml extras/assets/icons/Icons_Modules.psd	2015-07-26 14:15:24 +01:00
SilentSpike	e6f016f195	GVAR typo	2015-07-26 13:13:46 +01:00
SilentSpike	e431365586	Spectate on death setting	2015-07-26 13:12:58 +01:00
SilentSpike	ec6a0da01c	Adjust camera speed while moving	2015-07-26 12:23:01 +01:00
SilentSpike	b0adf2e2ee	Fix 3D icons not rendering	2015-07-26 12:13:05 +01:00
SilentSpike	efbd5189ce	Close all dialogs when exiting	2015-07-26 12:05:41 +01:00
SilentSpike	f0f6edb549	Transition camera post-escape menu	2015-07-26 11:28:14 +01:00
bux578	cff54efbe0	add missing private	2015-07-26 09:20:38 +02:00
bux578	993f6bde16	remove respawnCounter in certain respawn template conditions	2015-07-26 09:19:29 +02:00
bux578	4ab1123efd	fix unlimited growing array	2015-07-26 09:19:09 +02:00
Glowbal	dfec850aa8	Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs ... addX macro in configs	2015-07-26 08:37:47 +02:00
PabstMirror	0b9d1fb05d	Disabled by default - Safe FOV Check	2015-07-26 00:48:53 -05:00
SilentSpike	5cfe180d3b	Fix camPan normalization	2015-07-26 02:17:09 +01:00
SilentSpike	697997ca8f	Escape menu	2015-07-26 02:17:08 +01:00
SilentSpike	878bcf819e	Fix map double click event	2015-07-26 00:25:31 +01:00
PabstMirror	c6f21f48a4	Merge branch 'master' into fingering	2015-07-25 17:28:22 -05:00
SzwedzikPL	6258e73290	addX macro in confgis	2015-07-25 21:59:52 +02:00
Glowbal	c9d4395a42	Merge pull request #1870 from SzwedzikPL/ah6_gun_fix ... M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots	2015-07-25 21:39:21 +02:00
PabstMirror	fba457999e	#1899 - Remove AV_ESS_blk config	2015-07-25 14:32:24 -05:00
Glowbal	ea8dc0a5ec	Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant ... Fix for 'Treat at...' option	2015-07-25 21:22:44 +02:00
Glowbal	3a53991ed0	fixed rvmat and texture paths	2015-07-25 21:21:31 +02:00
PabstMirror	ffc5615abd	Merge pull request #1886 from acemod/windDeflectionSinglePFEH ... Wind deflection single pfeh	2015-07-25 14:01:45 -05:00
PabstMirror	7da258111d	Merge pull request #1739 from acemod/virtualAttachObject ... Virtual attach object	2015-07-25 13:55:48 -05:00
Glowbal	3514f07d31	Merge pull request #1806 from jonpas/sittingFixes ... Akward Sitting Fixes Part 2	2015-07-25 20:42:38 +02:00
Glowbal	f0a2c7c454	Merge pull request #1854 from jonpas/lookUp ... Increased ability to look up	2015-07-25 20:41:46 +02:00
Glowbal	2f186ffbf1	Merge pull request #1897 from acemod/vectorCtrlTextGroupFix ... #1871 - Don't do ctrlText(set) on RscControlsGroup	2015-07-25 19:57:55 +02:00
PabstMirror	40ed985d34	Config Fixes	2015-07-25 12:56:57 -05:00
Glowbal	c729672e53	Merge pull request #1885 from acemod/kestullHeightFix ... Fix Kestrel Y position on large interface	2015-07-25 19:53:48 +02:00
Glowbal	6422c20e46	Merge pull request #1867 from acemod/cWire-localVehDamage ... concWire - Apply damage where vehicle is local	2015-07-25 19:52:42 +02:00
PabstMirror	e616f2240e	Merge pull request #1863 from acemod/huntIR-itemRemoved ... Close huntIR monitor if item removed	2015-07-25 12:50:05 -05:00
PabstMirror	1008567cba	Merge pull request #1847 from acemod/optionsOnIntroOutro ... Show Options on Intro/Outro in Missions	2015-07-25 12:49:20 -05:00
Glowbal	0e872a5ed5	Merge pull request #1845 from acemod/huntir-deadProjectile ... HuntIR - Handle Dead Projectile	2015-07-25 19:48:32 +02:00
ViperMaul	38bd2896ab	Merge pull request #1851 from SzwedzikPL/hearing_in_zeus ... Disable hearing in zeus camera	2015-07-25 10:44:34 -07:00
ViperMaul	55614b9ac3	Merge pull request #1839 from acemod/hearingUnification ... Hearing PFEH unification / Flashbangs	2015-07-25 10:44:11 -07:00
PabstMirror	2a19521f68	Merge pull request #1820 from acemod/mk6-fixBISleveling ... Mk6 fix leveling	2015-07-25 12:36:28 -05:00
KoffeinFlummi	88a5609016	Merge branch 'master' of https://github.com/acemod/ACE3	2015-07-25 19:35:26 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02:00
PabstMirror	9e831d257d	Merge pull request #1768 from acemod/10digitGrids2 ... 10 digit grids 2	2015-07-25 12:32:02 -05:00
Glowbal	9d7374c893	Merge pull request #1307 from jokoho48/master ... Cut Parachute/Reserve parachute	2015-07-25 19:17:37 +02:00
SilentSpike	21ce877115	Handle unit icons and provide setting	2015-07-25 14:13:37 +01:00
SilentSpike	2f1639822c	Fix incorrect variable	2015-07-25 13:24:50 +01:00
SilentSpike	7107514b05	New function to precisely control spectatable sides	2015-07-25 13:24:49 +01:00
SzwedzikPL	6569fe1d62	macro_addbackpack	2015-07-25 13:13:31 +02:00
SilentSpike	69d1db2872	String updates	2015-07-25 11:41:31 +01:00
PabstMirror	bca5fa1f4a	Spall - execNextFrame instead of addPerFrameHandler	2015-07-25 03:20:03 -05:00
PabstMirror	e29fb477f9	Merge branch 'master' into fixFrag	2015-07-25 02:38:10 -05:00
Glowbal	0ce50d7b17	Merge pull request #1896 from acemod/medicalTreatmentEndAnim ... Medical - Don't play *_medic anims at end	2015-07-25 09:27:18 +02:00
SilentSpike	5ac77fa996	Corrected default param value	2015-07-24 22:31:51 +01:00
SilentSpike	c9750919a4	PFHs only as needed	2015-07-24 20:29:43 +01:00
SilentSpike	e2e6091c1f	Close dialogs before open	2015-07-24 17:55:33 +01:00
SilentSpike	e4aee1da2c	Add categories to help splash	2015-07-24 17:50:33 +01:00
SilentSpike	bafb261c01	Adding icon toggle	2015-07-24 17:37:07 +01:00
SilentSpike	e413cb3d91	Cache unit information	2015-07-24 17:17:00 +01:00
SilentSpike	8ef6364b59	Use localized side strings	2015-07-24 16:40:29 +01:00
SilentSpike	eaeda2667c	Map icons	2015-07-24 16:40:28 +01:00
SilentSpike	fa306a0fb8	Further populate help splash	2015-07-24 11:39:41 +01:00
SilentSpike	9b3b5e9750	Prevent repeating key down events	2015-07-24 11:39:40 +01:00
PabstMirror	aa3b9e7b1c	#1871 - Don't do ctrlText(set) on RscControlsGroup ... Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control type [15]`	2015-07-23 16:46:30 -05:00
PabstMirror	1b590bf0f9	More nametag fixes / setSetting casting	2015-07-23 14:05:20 -05:00
jonpas	817dfe94e2	Added possible values	2015-07-23 20:29:51 +02:00
jonpas	964f32a721	Fixed NameTags Settings defaults	2015-07-23 20:26:31 +02:00
gienkov	2f24b240b4	Fix end line marker	2015-07-23 13:59:50 +02:00
gienkov	61fa466a53	Medical and slideshow pl translation	2015-07-23 13:56:54 +02:00
PabstMirror	cbd74d768b	Medical - Don't play *_medic anims at end	2015-07-23 02:43:19 -05:00
SilentSpike	53a0a9343b	Populating help splash	2015-07-22 15:21:36 +01:00
SilentSpike	3d290977e5	Preserve unit name in toolbar	2015-07-22 15:21:33 +01:00
SilentSpike	766b1e1dcd	Retain current settings when invalid settings given	2015-07-22 15:21:32 +01:00
SilentSpike	248cdf1f3f	Public function error messages	2015-07-22 15:21:30 +01:00
PabstMirror	4d7a2888eb	Remove Debug	2015-07-22 03:27:40 -05:00
PabstMirror	8f18fd7eaa	Single PFEH for wind deflection	2015-07-22 03:04:54 -05:00
PabstMirror	24cda6e37c	#1655 - Fix Kestrel Y position on large interface	2015-07-22 01:06:36 -05:00