1516 Commits

Author	SHA1	Message	Date
PabstMirror	e65d74f43d	Merge branch 'master' into disarmingTest	2015-03-29 14:41:15 -05:00
commy2	d2e6d5887a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-29 21:23:20 +02:00
commy2	54369b772f	fix: crate instantly drops when trying to pick up with lowered weapon	2015-03-29 20:46:29 +02:00
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	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	c3b9d42834	prepare realistic names for marksman	2015-03-28 12:39:51 +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
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	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
commy2	66c026d4a0	refueling the uav didn't work on UAVs local to server or HC	2015-03-28 00:30:51 +01:00
commy2	5f1201d75a	fix unexpected stringtable format	2015-03-27 19:08:01 +01:00
Glowbal	4336cf0fc1	Merge pull request #258 from KoffeinFlummi/BananaPort ... Banana	2015-03-27 00:04:53 +01: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
PabstMirror	3f137d357d	Medical - carryObj func moved	2015-03-26 15:05:50 -05:00
PabstMirror	14cbceef97	Rerun set func when respawn into captive unit	2015-03-26 14:21:26 -05:00
commy2	9fcb193064	Merge pull request #243 from KoffeinFlummi/mediccarry ... refining carrying injured persons	2015-03-26 18:04:35 +01:00
commy2	e129d139d7	indentation	2015-03-26 18:03:13 +01:00
commy2	355dfc0988	Merge pull request #254 from KoffeinFlummi/noidle ... remove idle animations for players with lowered weapon	2015-03-26 18:01:20 +01:00
commy2	c68430cb38	Merge pull request #255 from KoffeinFlummi/norearm ... hide rearm action for players	2015-03-26 18:01:01 +01:00
commy2	d9e59aba3e	Merge pull request #256 from KoffeinFlummi/hitreactions ... fall down after getting shot while moving	2015-03-26 17:56:51 +01:00
commy2	0a0e7c8a0c	disable user input was broken	2015-03-26 17:32:00 +01:00
commy2	9a0f0cb47b	stuff from medical	2015-03-26 16:58:41 +01:00
commy2	cf2b7d3bfb	private	2015-03-26 15:19:13 +01:00
commy2	20dd8f34fc	fall down after getting shot while moving	2015-03-26 15:06:51 +01:00
commy2	164e8f95c9	hide rearm action for players	2015-03-26 14:14:56 +01:00
commy2	6317dccb52	Revert "hide rearm action for the player" ... This reverts commit a2d4de605b.	2015-03-26 14:13:16 +01:00
commy2	a2d4de605b	hide rearm action for the player	2015-03-26 14:11:06 +01:00
commy2	606c1fbcf9	tweaks	2015-03-26 14:11:04 +01:00
commy2	0b05a2bfb2	speed up some debug functions by 99.99%	2015-03-26 14:11:01 +01:00
commy2	816b1d74ad	tweak, pushBack vs + Array	2015-03-26 14:10:59 +01:00
commy2	97ae218288	adjust functions to new syntax	2015-03-26 14:10:56 +01:00
commy2	dea830441b	tweak turret functions	2015-03-26 14:10:53 +01:00
commy2	6b9b3bc6bd	remove idle animations for players with lowered weapon	2015-03-26 13:21:16 +01:00
Glowbal	6a1dfe00da	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-26 08:43:48 +01:00
Glowbal	9f540e0473	fixed Missing unconcious effects #253	2015-03-26 08:43:30 +01:00
PabstMirror	d4d0a0a6de	Make sure to remove animEH	2015-03-26 00:53:38 -05:00
PabstMirror	811530f180	Ensure captiveNum is reset for respawning unit	2015-03-26 00:53:02 -05:00