33 Commits

Author	SHA1	Message	Date
commy2	7512c4e52e	manual merge	2016-05-30 21:14:34 +02:00
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
Michael Braun	5047d4de1c	Switched to ACE_LOG<LEVEL>_# variation	2015-08-26 17:39:44 +02:00
Michael Braun	097506076f	Fixed format usage in macros requiring ARR_# for it to work	2015-08-26 16:48:55 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
PabstMirror	b9db03de20	Fix count problems	2015-08-14 20:13:41 -05:00
jokoho48	156609aab2	Code cleanup of Disarming module	2015-08-09 05:18:26 +02:00
PabstMirror	f57427ec96	switch waitAndExecute with 0 delay to execNextFrame ... Should Fix #1463	2015-06-01 13:14:05 -05:00
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
PabstMirror	2da2794e20	ACE_isUnique config for mags instead of static list	2015-05-09 17:08:47 -05:00
PabstMirror	2e3e203d9f	#1081 - Fix binocular dupe ... binocs are weapons and items at the same time. need to properly drop binocs because stuff like deisgnator can have ammo	2015-05-09 14:41:46 -05:00
ulteq	50a8a89b28	Added missing privates	2015-04-30 10:50:49 +02:00
PabstMirror	638433614c	Some missing private defines.	2015-04-16 12:36:16 -05:00
PabstMirror	c055911231	Cleanup, remove debug spam	2015-04-04 00:52:21 -05:00
PabstMirror	ee961ed1e6	Fix Dropping Unique Magazines	2015-03-29 14:47:57 -05:00
PabstMirror	22483ce22e	Fix ranks, and uniform/vest drop	2015-03-20 20:47:34 -05:00
PabstMirror	38745f4871	Various Changes	2015-03-20 20:17:49 -05:00
PabstMirror	9f25641f54	Verify Mag counts, headers, check animation	2015-03-17 14:43:50 -05:00
PabstMirror	14c45afd99	Sync holder gvar	2015-02-27 18:56:15 -06:00
PabstMirror	af1544ebb9	fix name	2015-02-27 18:50:08 -06:00
PabstMirror	641cbb7f64	Dialog Stuff	2015-02-27 18:43:42 -06:00
PabstMirror	d31c19c3eb	Seems like it's working	2015-02-27 18:38:23 -06:00
PabstMirror	32f67487b5	More Work	2015-02-27 16:16:35 -06:00
PabstMirror	d55aed0813	Inv Screen Rough WIP	2015-02-27 15:23:46 -06:00
PabstMirror	744f37d18a	DragandDrop Frisking WIP	2015-02-22 18:44:33 -06:00
PabstMirror	69835ec7fb	Fix HMD bug and disarm types	2015-02-11 14:37:18 -06:00
PabstMirror	a7004cf0e9	Disarm Types Examples	2015-02-11 02:33:18 -06:00
PabstMirror	13c9db75a7	Disarming Prototype	2015-02-10 19:55:53 -06:00