701 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolás Badano	489b5de1ad	Merge branch 'agmSafeModePort' of github.com:KoffeinFlummi/ACE3 into agmSafeModePort ... Conflicts: addons/safemode/config.cpp	2015-01-17 17:33:26 -03:00
Nicolás Badano	9247bb3411	safemode: port	2015-01-17 17:32:34 -03:00
Nicolás Badano	1c1216a05d	safemode: port	2015-01-17 17:23:15 -03:00
Nicolás Badano	7c41eb04e9	AGM_SafeMode pre CBA	2015-01-17 17:01:47 -03:00
Nicolás Badano	16be448168	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-17 16:05:14 -03:00
Nicolás Badano	fd4a2192e9	map: small fixes	2015-01-17 16:04:48 -03:00
commy2	6658eafe3d	vector object height, length mode	2015-01-17 19:25:12 +01:00
Nicolás Badano	9a790a229a	Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3	2015-01-17 15:24:46 -03:00
Nicolás Badano	6abc6073e1	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-17 15:19:53 -03:00
Nicolás Badano	3fa6f1b0c9	gforces: fix for when there's no player	2015-01-17 15:18:11 -03:00
bux578	68b56d9161	Merge branch 'master' into agmScopesPort	2015-01-17 19:14:33 +01:00
PabstMirror	1d475111e7	Flashbang Icon Name	2015-01-17 12:12:02 -06:00
Nicolás Badano	6bee456aff	Merge pull request #24 from KoffeinFlummi/agmGrenadesPort ... Port: AGM Grenades	2015-01-17 15:05:15 -03:00
commy2	7a6d0eefe3	port weapon select	2015-01-17 18:26:51 +01:00
Thomas Kooi	d3c05209ea	Changed loading bar to make use of PFH	2015-01-17 18:21:52 +01:00
Nicolás Badano	e216a33574	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-17 13:58:36 -03:00
Nicolás Badano	c851a14da9	common: added execNextFrame function	2015-01-17 13:56:24 -03:00
Nicolás Badano	e89d098727	Merge pull request #50 from KoffeinFlummi/waitAndExecute ... Added waitAndExecute function	2015-01-17 13:50:47 -03:00
Nicolás Badano	4926b6970b	fixes typos	2015-01-17 13:45:56 -03:00
Nicolás Badano	f165030e3b	common: remove the support for code as string	2015-01-17 12:23:03 -03:00
Thomas Kooi	748f4f30be	Removed throw for consistency. Not used anywhere else.	2015-01-17 14:26:50 +01:00
Thomas Kooi	42c90074cb	Removed duplicate limitSpeed. Already present in vehicles pbo	2015-01-17 14:20:49 +01:00
Thomas Kooi	cdc2373872	Removed foreachDo	2015-01-17 14:14:12 +01:00
Thomas Kooi	781ebaca95	Changed StateUnconscious to "ACE_isUnconscious"	2015-01-17 14:13:37 +01:00
Thomas Kooi	7345cf91cf	Minor code clean up	2015-01-17 13:54:44 +01:00
Thomas Kooi	eaa44fce6f	Changed some spawns to call	2015-01-17 13:38:26 +01:00
Thomas Kooi	a8e257f7ab	Changed setDead to no longer use spawn.	2015-01-17 13:35:15 +01:00
Thomas Kooi	d42b83947d	Fixed script errors in limit speed functions (missing [)	2015-01-17 13:35:03 +01:00
Thomas Kooi	38947ba669	Moved sendDisplay & sendMessage functions to GUI instead of common.	2015-01-17 13:03:51 +01:00
Thomas Kooi	e5579f1c32	Removed spawn usage from limit movement speed functions	2015-01-17 12:53:23 +01:00
Glowbal	041a4fccc5	Removed CSE text ... Changed set count to pushback.	2015-01-17 12:42:10 +01:00
Glowbal	31f0b80659	Fixed CBA macro mistake	2015-01-17 12:40:06 +01:00
Glowbal	6e4a12ff4d	Fixed CBA macro mistake ... Fixed an CBA macro mistake.	2015-01-17 12:39:33 +01:00
Thomas Kooi	83128ad3d2	Fixed minor issues with unconscious & blackout effect. ... Fixed error in XEH_postInit	2015-01-17 12:35:59 +01:00
Thomas Kooi	8a61f5fbb5	Changed setUnconsciousState to no longer use spawn.	2015-01-17 12:08:11 +01:00
Thomas Kooi	a77082e4f7	Made functions compatible with removed/renamed functions.	2015-01-17 12:07:41 +01:00
Thomas Kooi	45284c7855	Changed customEventHandler_f to raiseScriptedEvent_f ... Should be replaced by the ACE eventhandler at a later stage.	2015-01-17 12:07:03 +01:00
Thomas Kooi	6509491c19	Removed duplicate functions	2015-01-17 12:06:03 +01:00
Thomas Kooi	f25766d4e4	Moved effect functions to GUI folder	2015-01-17 12:05:07 +01:00
bux578	79695f00e9	Merge remote-tracking branch 'origin' into agmScopesPort	2015-01-17 09:22:34 +01:00
PabstMirror	1783bf4db6	#49 - targetEvent for flashbang	2015-01-17 00:39:46 -06:00
Nicolás Badano	27bd5c5790	hearing: fixes	2015-01-17 03:20:41 -03:00
PabstMirror	853dfba86a	Merge branch 'master' into agmGrenadesPort	2015-01-17 00:15:07 -06:00
Nicolás Badano	a7e016fa8f	overheating: change addPerFrameHandler to waitAndExecute	2015-01-17 03:13:05 -03:00
Nicolás Badano	fefb599a55	explosives: change addPerFrameHandler to waitAndExecute	2015-01-17 03:09:51 -03:00
Nicolás Badano	8a397f80ef	hearing: change addPerFrameHandler to waitAndExecute	2015-01-17 03:02:52 -03:00
Nicolás Badano	2f4f6f3161	common: add waitAndExecute function	2015-01-17 02:58:24 -03:00
Nicolás Badano	c85db9baf9	hearing: fix PFH in case the game is paused	2015-01-17 02:24:28 -03:00
Nicolás Badano	800e16edc5	explosives: fix timer in case the game pauses	2015-01-17 02:14:09 -03:00
Nicolás Badano	1adbe8c6a9	nightvision: make EH calls traceable	2015-01-17 02:12:37 -03:00