5340 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PabstMirror	7cf77de8cf	Opps	2015-06-09 00:53:40 -05:00
PabstMirror	5ce7ec48e7	Minor Cleanup	2015-06-09 00:51:48 -05:00
PabstMirror	7d08469df9	Module for setting	2015-06-09 00:00:00 -05:00
PabstMirror	9d914d655a	Convert Finger to CBA/ACE format	2015-06-08 20:34:29 -05:00
PabstMirror	ebc55ca6cd	Merge pull request #1542 from TheDrill/master ... Base Finger Port	2015-06-07 15:04:45 -05:00
PabstMirror	64d529ed3c	Merge pull request #1538 from acemod/unHolsterWeapon ... #1208 - Holster key also unholsters	2015-06-07 14:25:06 -05:00
PabstMirror	da67b4e6fe	Merge pull request #1522 from acemod/allStringtableMacros ... Macroize all stringtables	2015-06-07 14:24:46 -05:00
PabstMirror	6eb7497cdf	#1208 - Holster key also unholsters	2015-06-07 12:59:53 -05:00
PabstMirror	3bf9592a5d	Macroize huntIR	2015-06-07 12:39:24 -05:00
PabstMirror	fb9c1e14a3	Merge branch 'master' into allStringtableMacros ... Conflicts: addons/kestrel4500/CfgWeapons.hpp	2015-06-07 12:24:40 -05:00
ulteq	be68284911	Fixed a typo	2015-06-07 18:20:14 +02:00
ulteq	8a6842c739	Merge pull request #1535 from acemod/kestrelModelUpdate ... New low-poly Kestrel model	2015-06-07 18:17:43 +02:00
ulteq	39ba85b213	New low-poly Kestrel model	2015-06-07 18:17:09 +02:00
ulteq	5b3fd31b1b	Merge pull request #1525 from acemod/HuntIR ... ACE2 HuntIR port	2015-06-07 17:47:27 +02:00
ulteq	b1b8fe3645	Removed debug output	2015-06-07 14:48:46 +02:00
ulteq	cb2b120023	Reduced the max. transmission range	2015-06-07 14:47:56 +02:00
ulteq	618d557227	Layer IDs are now stored in #defines	2015-06-07 13:55:35 +02:00
ulteq	9ce655dcd2	Fixes stuck camera on remote controlled units.	2015-06-07 13:50:38 +02:00
ulteq	9561957fd6	Merge pull request #1245 from acemod/ChatColours ... Chat visibility enhancement	2015-06-07 13:35:02 +02:00
ulteq	fb1ddb4dd6	Removed HuntIR explosion sound	2015-06-07 12:48:01 +02:00
ulteq	665fa55adf	Further reduced the container shell timeToLive value.	2015-06-07 12:12:06 +02:00
ulteq	5e30c88d11	Made use of the += operator	2015-06-07 11:58:56 +02:00
ulteq	9818f65545	Improved HuntIR descriptions	2015-06-07 11:58:34 +02:00
ulteq	0f186154c0	Tabs -> Spaces	2015-06-07 11:44:28 +02:00
ulteq	4339344aee	Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR	2015-06-07 11:43:42 +02:00
ulteq	48f8730415	Removed dead code	2015-06-07 11:43:32 +02:00
ulteq	66193a8c67	Removed duplicate code	2015-06-07 11:36:58 +02:00
Drill	ac40e7cc59	Change default keybinding from Ctrl-Tilda to Shift-Tilda for ... finger-pointing module	2015-06-07 12:15:23 +03:00
Drill	96e073e66d	Initial commit for finger-pointing module	2015-06-07 12:10:50 +03:00
ulteq	c40a2a9a2f	Merge pull request #1527 from acemod/r3fCompat ... Added R3F compat pbo	2015-06-07 10:18:02 +02:00
ulteq	6a792a7a82	Merge pull request #1528 from acemod/rangecardGuiFix ... Barrel length is now displayed in half inch accuracy.	2015-06-07 10:17:02 +02:00
ulteq	a9b6af38e1	Barrel length is now displayed in half inch accuracy.	2015-06-07 10:16:30 +02:00
ulteq	afb2bb45fe	Added R3F compat pbo	2015-06-07 10:11:50 +02:00
PabstMirror	0f03bef5f1	Merge pull request #1524 from acemod/handleFiredCleanup ... Removed some dead code	2015-06-06 23:31:07 -05:00
Glowbal	c75ae71adf	Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound ... Fixed find file extension in playChangefiremode	2015-06-06 21:39:34 +02:00
KoffeinFlummi	c47e0ce796	Merge https://github.com/ODK-Bn/ACE3 into russian-merge	2015-06-06 21:13:03 +00:00
ulteq	a870d5d760	ACE2 HuntIR port	2015-06-06 14:13:34 +02:00
ulteq	cfc23fe3e7	Removed some dead code	2015-06-06 10:01:30 +02:00
PabstMirror	732dbd315a	Tripod - use addToInventory	2015-06-05 21:13:33 -05:00
PabstMirror	32ce0aa6fd	Macroize all stringtables	2015-06-05 21:02:24 -05:00
PabstMirror	237b5b4e35	Merge pull request #1239 from acemod/laserPointerAsdgConflict ... ASDG- Fail gracefully if attachments not compatible	2015-06-05 16:40:49 -05:00
PabstMirror	827c51c088	Merge pull request #1488 from acemod/captiveModuleSettings ... Captive module settings	2015-06-05 16:40:36 -05:00
PabstMirror	b6951b7a13	#1022 - reset hearing deafness on respawn	2015-06-05 16:37:27 -05:00
PabstMirror	50b2dd0651	Merge pull request #1410 from Tourorist/patch-2 ... README: Shields back up	2015-06-05 12:00:40 -05:00
ulteq	595e4e7529	Merge pull request #1371 from gienkov/pl-translation-1 ... Polish translations	2015-06-05 17:58:14 +02:00
ulteq	c22a66bad4	Merge pull request #1515 from acemod/spotting_scope ... Ported the ACE2 Spotting Scope	2015-06-05 17:03:14 +02:00
ulteq	04ae03695b	Reverted dragging init.	2015-06-05 17:03:09 +02:00
ulteq	7fed1085a6	Merge pull request #1509 from acemod/SSWT_Kit ... Ported the ACE2 Tripod	2015-06-05 16:53:47 +02:00
PabstMirror	3f3ffe117e	Inherit ACE_Actions - addToInventory	2015-06-05 03:32:55 -05:00
gienkov	de13985492	interact_menu translation	2015-06-05 09:55:13 +02:00