6188 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PabstMirror	fb34efdd04	Cleanup stringtable phrasing	2015-08-01 11:48:41 +02:00
Glowbal	a2eeff53a8	Merge pull request #1960 from acemod/laserHandleWeirdData ... Laser - Handle Bad Data Returns	2015-08-01 11:41:04 +02:00
Glowbal	1878d448ae	Merge pull request #1968 from acemod/fixBftModule321 ... Fix BFT Module / Settings (for 3.2.1)	2015-08-01 11:39:01 +02:00
Glowbal	d86bf458fc	Merge pull request #1967 from acemod/fixWindDeflection-AB ... Fix Changes in Wind Deflection s in AB	2015-08-01 11:38:07 +02:00
PabstMirror	2d051188a7	#1957 - Fix BFT Module / Settings (for 3.2.1)	2015-08-01 00:01:33 -05:00
PabstMirror	1d82a3c193	#1962 - Fix Changes in Wind Deflection s in AB	2015-07-31 23:39:05 -05:00
Glowbal	b449e4cab8	Merge pull request #1955 from acemod/fix-return-damage ... Fix incorrect damage value return when prevent death is enabled	2015-07-31 11:20:51 +02:00
PabstMirror	822115214f	Laser - Handle Bad Data Returns	2015-07-31 03:06:27 -05:00
Glowbal	ca2a16af02	fix #1946	2015-07-30 18:21:24 +02:00
ViperMaul	63dd19825b	moveInAny seems to work better than moveInDriver. WIP	2015-07-28 13:56:22 -07:00
PabstMirror	bfd3aa71c4	Manual Fix #1931	2015-07-28 15:25:52 -05:00
ViperMaul	626a9cf5f9	Disable headBugFix if unconscious	2015-07-28 13:06:58 -07:00
SilentSpike	54e3804107	Merge branch 'english-strings' into release	2015-07-28 20:55:30 +01:00
SilentSpike	16597515f0	Adding remaining missing English straings	2015-07-28 20:55:22 +01:00
Glowbal	beae5c38bc	Updated version number	2015-07-28 20:28:26 +02: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
Glowbal	1db7b0549b	Merge pull request #1933 from jokoho48/ParachuteFix ... Parachute fix for #1932	2015-07-28 20:08:54 +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	a31e5795be	Merge branch 'remove-spectator' into release	2015-07-27 21:30:24 +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	302e476522	Merge branch 'hotfix' into release	2015-07-27 18:34:06 +01:00
SilentSpike	47d96835c6	Fix arrayIntersect oversight	2015-07-27 18:32:21 +01:00
PabstMirror	ceb12662e0	Version To 3.2.0	2015-07-27 02:05:58 -05:00
ViperMaul	2694343c69	Merge branch 'release' of https://github.com/acemod/ACE3 into release	2015-07-26 23:56:50 -07:00
ViperMaul	4f53bdefb9	Suppress debug in fnc_unloadPersonLocal.sqf	2015-07-26 23:54:42 -07:00
PabstMirror	81f9c92c44	Merge branch 'master' into release	2015-07-27 01:49:18 -05:00
PabstMirror	544387d320	Merge pull request #1922 from acemod/rebuildDLLs ... Rebuild dlls for 3.2	2015-07-27 01:48:09 -05:00
Glowbal	d0adb6c317	Merge branch 'master' into release	2015-07-27 08:41:00 +02:00
Glowbal	24e5b17497	Merge pull request #1921 from acemod/fixLoadUnconscious ... Fix load unconscious into boats and co-pilot seats	2015-07-27 08:40:16 +02:00
Glowbal	01ca669313	Merge pull request #1919 from SzwedzikPL/rhs_usf_combat_fix ... rhs usf combat config fix	2015-07-27 08:39:53 +02:00
PabstMirror	8cb0b8a30c	Rebuild dlls for 3.2	2015-07-26 23:29:07 -05: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
SzwedzikPL	bdb23301db	rhs usf combat config fix	2015-07-27 01:42:02 +02:00
PabstMirror	5b2b490434	Merge branch 'master' into release	2015-07-26 16:53:07 -05:00
PabstMirror	bf4e95e750	Merge pull request #1548 from acemod/fingering ... Fingering	2015-07-26 16:47:41 -05:00
Glowbal	1d918ecd1f	Merge pull request #1916 from acemod/master ... Start release branch for 3.2	2015-07-26 23:47:18 +02: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
bux578	ef11cda5f2	Merge branch 'TheBamse-RHSWeaponHuntIRCompatibility'	2015-07-26 21:30:10 +02:00