2063 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PabstMirror	1e2b47d6e7	Wirecutters - use new createAction system	2015-03-29 12:08:01 -05:00
PabstMirror	24b47584a2	InteractMenu - Fix Actions Added to Objects	2015-03-29 12:04:57 -05:00
PabstMirror	209bdc8dfd	Merge pull request #257 from KoffeinFlummi/captivesFixRespawn ... Captives fix respawn Fix #230	2015-03-29 11:23:33 -05:00
commy2	6ca84c3d31	delete obsolete ammo configs	2015-03-29 14:25:13 +02:00
commy2	33f0ff9b82	1.42 ensure ace is loaded after marksmen configs	2015-03-29 14:19:01 +02:00
commy2	4a9124c170	changed behavior of silencers from Marksmen	2015-03-29 14:09:51 +02:00
PabstMirror	95a9daf18b	Minor Header Correction	2015-03-28 19:08:25 -05:00
commy2	e574d19844	1.42 - cursor mode when bipod deployed	2015-03-28 16:24:17 +01:00
commy2	c3b9d42834	prepare realistic names for marksman	2015-03-28 12:39:51 +01:00
commy2	b10d3b26ce	replace variables with new scripting commands	2015-03-28 11:23:13 +01:00
commy2	6c8064097f	delete old resting, farewell	2015-03-28 11:19:39 +01:00
commy2	86e5896c73	intendation	2015-03-28 09:05:58 +01:00
commy2	d959aa1619	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-28 08:38:37 +01:00
commy2	53aaeaacd5	fix #263	2015-03-28 08:38:16 +01:00
commy2	23cd523108	fix more inheritance	2015-03-28 08:06:08 +01:00
commy2	853c4d8dca	142 - fix inheritance changes	2015-03-28 07:50:52 +01:00
PabstMirror	40ccf7b241	Captives - Should disable reloading	2015-03-28 01:46:13 -05:00
commy2	772551cbb3	fix broken hungarian string	2015-03-28 07:39:23 +01:00
commy2	d7aaead032	remove obsolete function for channel	2015-03-28 07:04:50 +01:00
commy2	7486ae3036	ace_common_fnc_currentChannel is no longer relyable	2015-03-28 06:55:46 +01:00
PabstMirror	4e4834974a	cleanup debug	2015-03-27 23:26:41 -05:00
PabstMirror	aa5a580645	Cleanup	2015-03-27 23:24:11 -05:00
PabstMirror	909f53753a	Fix JIP Marker SYnc	2015-03-27 23:19:03 -05:00
PabstMirror	e5cbca02e4	Show placement angle in preview	2015-03-27 22:55:19 -05:00
PabstMirror	24bba5dea6	Headers	2015-03-27 20:51:30 -05:00
commy2	e7ec618f97	function decription	2015-03-28 02:10:04 +01:00
commy2	d12ba196c5	function to return attachments, muzzles with magazines and ammo, moved stuff around	2015-03-28 01:43:30 +01:00
PabstMirror	63b7f0a755	Marker Fixes for 1.42 WIP	2015-03-27 19:22:49 -05:00
commy2	66c026d4a0	refueling the uav didn't work on UAVs local to server or HC	2015-03-28 00:30:51 +01:00
Glowbal	9713b505ee	Optional server config file	2015-03-27 20:35:44 +01:00
PabstMirror	1695837e0c	1.42 Inventory Config	2015-03-27 13:10:55 -05:00
commy2	5f1201d75a	fix unexpected stringtable format	2015-03-27 19:08:01 +01:00
jaynus	d6b227e654	Merge branch 'master' into lasers	2015-03-27 10:40:33 -07:00
PabstMirror	47c72ac4ae	Disable Debug Laser / Commenting	2015-03-27 12:08:05 -05:00
PabstMirror	4d62865ea2	Stop placement on interact_menu open	2015-03-27 11:53:04 -05:00
PabstMirror	91a1ed3264	Cancle attach action	2015-03-27 11:36:31 -05:00
PabstMirror	86c7776802	and this	2015-03-27 11:14:19 -05:00
PabstMirror	f43666eb93	Use CBA PFEH instead of BI stacked	2015-03-27 11:14:04 -05:00
Glowbal	7a091215e1	Draft #188	2015-03-27 16:26:18 +01:00
PabstMirror	51e8dbf53f	misc	2015-03-27 00:12:39 -05:00
PabstMirror	d03e474075	Replace selection dialog with interact children	2015-03-27 00:02:54 -05:00
PabstMirror	efe57461b5	misc	2015-03-26 20:05:30 -05:00
Glowbal	4336cf0fc1	Merge pull request #258 from KoffeinFlummi/BananaPort ... Banana	2015-03-27 00:04:53 +01:00
PabstMirror	9ae4f39d05	Binary Seach for attach pos	2015-03-26 17:49:11 -05:00
Glowbal	f652ae89d1	Banana	2015-03-26 23:14:22 +01:00
PabstMirror	559f0dbaea	Unconc - dropping object handled in dragging	2015-03-26 16:32:44 -05:00
PabstMirror	6a71a04ad9	opps	2015-03-26 15:52:30 -05:00
PabstMirror	de644ba9b0	Medical - Reset captive status for respawning unit	2015-03-26 15:49:08 -05:00
PabstMirror	048be00a0f	Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious"	2015-03-26 15:47:08 -05:00
PabstMirror	2eefb1265d	Medical - morphine icon for left leg	2015-03-26 15:16:28 -05:00