5095 Commits

Author	SHA1	Message	Date
jaynus	ad95105508	Added and enabled AMG for AI.	2015-04-14 18:25:02 -07:00
jaynus	ef6d090238	Fixed: JAV_DIR was erroring.	2015-04-14 18:18:38 -07:00
jaynus	37de67395f	Fixed: issue where Javelin wouldn't hit > 1500	2015-04-14 18:18:27 -07:00
commy2	2940d1f83c	base rallypoints create a respawn marker if none is present in the mission	2015-04-15 03:10:17 +02:00
PabstMirror	1488ba2aac	#595 - Hide ace optino button if no world loaded ... I wanted to use a rscMapControl onDraw, but it throws an error onMouseMoving seems odd, but it works and I don't have to overload onLoad	2015-04-14 19:52:35 -05:00
commy2	e1926c6af1	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 02:12:16 +02:00
jaynus	b39209cc28	BAD @esteldunedain! BAD DOGGY!	2015-04-14 17:09:13 -07:00
commy2	29633d763a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 02:05:55 +02:00
jaynus	fb6553a7a7	Only show distance if laser is on.	2015-04-14 16:57:01 -07:00
commy2	4cdf61ab9e	fix misc issues with rallypoints	2015-04-15 01:50:58 +02:00
Grzegorz	d538cd257c	PL translation fix ... Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1	2015-04-15 01:44:33 +02:00
Nicolás Badano	10b1587453	Merge pull request #592 from gienkov/master ... PL translation	2015-04-14 20:36:25 -03:00
Nou	15ac5ec7b8	Two explosions processed per-frame.	2015-04-14 16:33:47 -07:00
jaynus	934f2ce097	Display current laser code. Standardize GVARs	2015-04-14 16:29:49 -07:00
esteldunedain	88b78ad3ca	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-14 20:21:39 -03:00
esteldunedain	ee04ea2f41	Allow actions on coordinates instead of selections	2015-04-14 20:21:11 -03:00
jaynus	2ec74a6a3e	align correctly, create event, remove FCS from laserDesignator.	2015-04-14 16:20:03 -07:00
jaynus	971566fc3e	Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER	2015-04-14 16:05:01 -07:00
Grzegorz Sikora	3543b9c806	PL Translation ... Some french, german and russian entries were listed twice, had to remove one of two here and there so this list is for revision by different translators	2015-04-15 00:43:42 +02:00
jaynus	81e61e2f04	Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591	2015-04-14 15:30:04 -07:00
esteldunedain	2ff6eef792	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-14 19:18:08 -03:00
esteldunedain	ad750977e0	Fix ACRE volume on medical unconsciousness	2015-04-14 19:17:05 -03:00
jaynus	10bb77e738	Merge branch 'master' of github.com:acemod/ACE3	2015-04-14 15:11:55 -07:00
jaynus	c136b78fc8	rename 20mm	2015-04-14 15:11:49 -07:00
esteldunedain	495c822061	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-14 19:10:31 -03:00
esteldunedain	6f4bb48489	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/attach/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/magazinerepack/stringtable.xml addons/overheating/stringtable.xml extensions/CMakeLists.txt	2015-04-14 19:09:57 -03:00
commy2	7c5a6538a9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-15 00:06:12 +02:00
jaynus	36ebb96531	Merge branch 'master' of github.com:acemod/ACE3	2015-04-14 14:58:29 -07:00
jaynus	85c10328ae	missed one.	2015-04-14 14:58:19 -07:00
Felix Wiegand	5d8dd701d2	Merge pull request #518 from acemod/basic-medical-tweaks ... Basic medical tweaks	2015-04-14 23:49:00 +02:00
jaynus	df3c8155a0	Merge branch 'master' of github.com:acemod/ACE3	2015-04-14 14:45:30 -07:00
jaynus	c6943fbdaf	fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588	2015-04-14 14:45:21 -07:00
commy2	4c6cc8dddf	merging stringtables	2015-04-14 23:22:25 +02:00
KoffeinFlummi	9b80245479	Fix speed limiter not working	2015-04-14 23:13:02 +02:00
KoffeinFlummi	8b1bce3b3d	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-14 23:00:59 +02:00
KoffeinFlummi	9e64538bc7	Fix minor adjustment strings	2015-04-14 23:00:17 +02:00
KoffeinFlummi	f07949cf19	Remove some old todos	2015-04-14 22:57:18 +02:00
KoffeinFlummi	676f7c8732	Remove hitpart from action names for non-self	2015-04-14 22:50:06 +02:00
KoffeinFlummi	13d7649c4a	Buff colour flashing effect	2015-04-14 22:49:26 +02:00
KoffeinFlummi	2391c5e6d6	Tweak crate names	2015-04-14 22:34:19 +02:00
KoffeinFlummi	91e25dc215	Missing stringtable entries	2015-04-14 22:34:08 +02:00
ulteq	8aad369ed3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-14 22:23:56 +02:00
ulteq	035ed573b8	Reworked the magazine configs	2015-04-14 22:23:36 +02:00
ulteq	1d64b8c36e	Added the new magazines into various ammo boxes	2015-04-14 22:22:36 +02:00
ulteq	e214511e36	Added new magazine classes: ... *ACE_100Rnd_65x39_caseless_mag_Tracer_Dim *ACE_200Rnd_65x39_cased_Box_Tracer_Dim *ACE_30Rnd_556x45_Stanag_Mk262_mag *ACE_30Rnd_556x45_Stanag_Mk318_mag *ACE_10Rnd_762x51_M118LR_Mag *ACE_20Rnd_762x51_M118LR_Mag *ACE_20Rnd_762x67_Mk248_Mod_0_Mag *ACE_20Rnd_762x67_Mk248_Mod_1_Mag *ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag *ACE_30Rnd_65x47_Scenar_mag *ACE_10Rnd_762x54_Tracer_mag	2015-04-14 22:19:51 +02:00
ulteq	f0a716fee8	Added new ammo classes: ... *762x67mm Mk248 Mod 0 *762x67mm Mk248 Mod 1 *762x67mm Berger Hybrid OTM *65x47mm Scenar	2015-04-14 22:17:27 +02:00
KoffeinFlummi	7af6ea36a6	Fix missing pain effect option name	2015-04-14 22:07:43 +02:00
Nou	114d66af7e	Do it every frame, no need for delay.	2015-04-14 13:00:57 -07:00
KoffeinFlummi	348bf611f8	Merge branch 'master' into basic-medical-tweaks	2015-04-14 21:55:45 +02:00
KoffeinFlummi	684c36f8a5	Add pain effect option	2015-04-14 21:49:56 +02:00
Nicolás Badano	462947a04c	Merge pull request #585 from acemod/fix-clientSetable ... Fix spelling of "isClientSetable"	2015-04-14 16:48:50 -03:00
KoffeinFlummi	ebcdafe610	Fix spelling of "isClientSetable"	2015-04-14 21:43:19 +02:00
KoffeinFlummi	e7807c009f	Use playerInventoryChanged instead of Take ... This makes sure to also fire when other mods, like TFAR (when adding backpacks) add items via script.	2015-04-14 21:28:18 +02:00
PabstMirror	b2be71c9cf	Merge branch 'master' into userActionPrototype	2015-04-14 14:22:57 -05:00
Glowbal	af255604ac	Switched to event based sync system for open wounds	2015-04-14 21:17:36 +02:00
jaynus	2f2eab87e2	Merge branch 'master' of github.com:acemod/ACE3	2015-04-14 11:42:38 -07:00
jaynus	739807303b	Fix script error for canceling designation and dying while designating.	2015-04-14 11:42:26 -07:00
KoffeinFlummi	71b19b4621	Remove duplicate bleeding code	2015-04-14 20:40:38 +02:00
KoffeinFlummi	ba377dfd3a	Show seperate message for "scratches"; localize	2015-04-14 20:40:17 +02:00
KoffeinFlummi	c6118901b4	Merge branch 'master' into basic-medical-tweaks	2015-04-14 20:35:17 +02:00
KoffeinFlummi	7ca36cdb65	Always show wounds, even for very low damage	2015-04-14 20:28:19 +02:00
KoffeinFlummi	a4c93ab2e2	Add seperate crates for basic and advanced	2015-04-14 20:28:00 +02:00
KoffeinFlummi	c379f2775e	Style fixes	2015-04-14 20:27:42 +02:00
jaynus	0ae27d16c5	Merge pull request #580 from acemod/seeker_fov ... Seeker FOV check optimizations	2015-04-14 11:19:00 -07:00
jaynus	24830f815f	random lock interval was causing phasing.	2015-04-14 11:18:16 -07:00
ulteq	cf7caf4549	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-14 20:18:03 +02:00
ulteq	837f155ad7	Fixed incorrect key handler return value	2015-04-14 20:17:54 +02:00
jaynus	1dd41a00ba	integration.	2015-04-14 10:51:53 -07:00
jaynus	226312c504	Merge remote-tracking branch 'origin/master' into seeker_fov ... Conflicts: addons/missileguidance/functions/fnc_checkSeekerAngle.sqf	2015-04-14 10:47:40 -07:00
jaynus	511ca860e0	Merge pull request #579 from acemod/moreJavelinLockingFixes ... More javelin locking + UI fixes	2015-04-14 10:40:51 -07:00
jaynus	fb5b524023	Loosen DAGR curve	2015-04-14 10:39:00 -07:00
jaynus	f0940707be	Disable locking on unloaded. Closes #539	2015-04-14 10:27:37 -07:00
jaynus	6f3ce27894	Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite	2015-04-14 10:25:08 -07:00
jaynus	c436541f1c	Reworked, fun fun.	2015-04-14 09:36:39 -07:00
jaynus	376f924999	Finish guidance rewrite.	2015-04-14 08:24:13 -07:00
Nicolás Badano	a93cb310d4	Merge pull request #513 from acemod/mainCleanup ... ACE_Main major cleanup	2015-04-14 10:25:14 -03:00
esteldunedain	c827c72412	AB and Kestrel: Move macros from defines.h to script_component	2015-04-14 10:22:26 -03:00
KoffeinFlummi	57c526c04d	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-14 15:12:46 +02:00
KoffeinFlummi	c1fccecb21	Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge	2015-04-14 15:12:24 +02:00
Nicolás Badano	85d253cdc1	Merge pull request #574 from gienkov/master ... Advanced Ballistics PL translation	2015-04-14 10:10:59 -03:00
KoffeinFlummi	b563bf8a8e	Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-14 15:04:42 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
commy2	ea7659a36e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix	2015-04-14 13:36:02 +02:00
commy2	f89e02a5ca	fix no laser in ffv slots	2015-04-14 13:24:17 +02:00
commy2	83ce3fa2bd	remove drawline3d	2015-04-14 13:14:37 +02:00
ulteq	994071960c	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-14 12:52:30 +02:00
ulteq	1a39005e72	Removed debug output.	2015-04-14 12:52:21 +02:00
KoffeinFlummi	96319c8799	Merge https://github.com/ruPaladin/ACE3 into russian-merge	2015-04-14 12:50:14 +02:00
Coren4	83c8abb3ba	Update stringtable.xml	2015-04-14 12:41:35 +02:00
ulteq	44232987b0	Commented out deprecated icon paths	2015-04-14 12:34:27 +02:00
ulteq	3d558f376f	Fixed some icon path names	2015-04-14 12:16:29 +02:00
Grzegorz Sikora	1be197728e	AdvBal PL translation	2015-04-14 11:42:52 +02:00
ulteq	864a3c3cda	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 ... Conflicts: addons/weather/XEH_postInit.sqf	2015-04-14 11:14:27 +02:00
ulteq	5a7078ad2c	Removed a deprecated workaround	2015-04-14 11:12:58 +02:00
ulteq	9f0388fa12	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics	2015-04-14 11:09:38 +02:00
ulteq	983a36e52d	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-14 11:06:32 +02:00
ulteq	d931745f5c	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments	2015-04-14 11:02:37 +02:00
ulteq	2f39067cb3	Removed TABs	2015-04-14 10:47:09 +02:00
Nou	14579fb90e	Explosive reflection, enabled on all frag rounds.	2015-04-14 00:41:19 -07:00
PabstMirror	85beb72a3a	ASL Stuff	2015-04-13 23:27:03 -05:00
PabstMirror	c6b4a57ee2	Pull Icon from config	2015-04-13 23:11:18 -05:00
PabstMirror	5c994765ef	Cleanup	2015-04-13 22:39:00 -05:00
PabstMirror	e84c5f4bb3	Radius Distance	2015-04-13 22:26:38 -05:00
PabstMirror	fda4f60a9e	House UserAction Prototype	2015-04-13 22:19:38 -05:00
jaynus	22d90fee9a	Begin modelToWorld work.	2015-04-13 16:47:09 -07:00
jaynus	761fef39c8	working save.	2015-04-13 15:34:51 -07:00
commy2	3da3543381	toggle laser vs ir laser	2015-04-14 00:32:09 +02:00
Harakhti	e7e46b3b59	Translation: S to W ... That's all I've found so far.	2015-04-14 00:05:39 +02:00
Harakhti	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00
commy2	c95bd42a19	Merge pull request #548 from acemod/opticsfix ... fix misc issues with optics, fix #537	2015-04-13 23:22:12 +02:00
ulteq	acc021c11c	Replaced TABs and newline braces	2015-04-13 23:10:55 +02:00
Harakhti	1b60a335a5	Translation: J to M ... I feel burned out. This was very specifically long and tedious.	2015-04-13 23:03:09 +02:00
commy2	b72366f0f6	hide laser beam during day	2015-04-13 22:34:43 +02:00
commy2	ada62fca7d	reloading launchers didn't work on remote clients	2015-04-13 21:38:01 +02:00
ulteq	c2ac7fc547	Removed magazines module	2015-04-13 21:37:19 +02:00
ulteq	33a06c5706	Updated stringtable	2015-04-13 21:36:47 +02:00
ulteq	2332f19274	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics ... Conflicts: addons/ballistics/stringtable.xml addons/magazines/CfgAmmo.hpp addons/magazines/CfgMagazines.hpp addons/magazines/CfgVehicles.hpp addons/magazines/CfgWeapons.hpp addons/magazines/newclasses.txt	2015-04-13 21:35:53 +02:00
ulteq	1073f4e484	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX ... Conflicts: AUTHORS.txt	2015-04-13 21:33:12 +02:00
ulteq	032d745334	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments	2015-04-13 21:32:09 +02:00
ulteq	fa88ab484e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 ... Conflicts: addons/kestrel/stringtable.xml	2015-04-13 21:31:04 +02:00
Nicolás Badano	db6361a086	Merge pull request #565 from Kllrt/master ... Added another new CZ strings	2015-04-13 16:25:32 -03:00
ulteq	ea78a6325f	Changed the module setting defaults	2015-04-13 21:20:07 +02:00
ulteq	1b2691ff1c	Fixed incorrect calculation of the scope adjustment limits	2015-04-13 21:17:30 +02:00
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +02:00
ulteq	8edb2d2c49	Complete overhaul of all ammo/magazine and weapon classes: ... *Merged the magazines- into the ballistics module *Adjusted all magazine class initSpeeds *Adjusted all weapon class initSpeeds	2015-04-13 21:08:31 +02:00
commy2	804079cfae	manual merge	2015-04-13 20:20:55 +02:00
Harakhti	3c3f6ba4c3	Translation: A to I ... Some parts filled out, other parts corrected or stylized.	2015-04-13 19:28:58 +02:00
commy2	bd168981e2	how do I merge	2015-04-13 19:23:42 +02:00
bux578	0e6eb46bb4	Merge pull request #560 from gienkov/master ... Further PL translation fixes	2015-04-13 19:18:54 +02:00
commy2	fa64225e55	Merge pull request #505 from acemod/muteunit ... Muteunit framework, fix #473	2015-04-13 19:18:45 +02:00
commy2	f48b6dc77a	Merge pull request #519 from acemod/marksmenai ... increase engagement ranges / burst mode on new mmg / full auto dmr	2015-04-13 19:18:40 +02:00
Grzegorz	2cd456432e	Update stringtable.xml	2015-04-13 19:17:42 +02:00
Grzegorz	5269f32d62	weird but fixed ... Something went wrong there, but fixed	2015-04-13 19:11:39 +02:00
jaynus	ff858c1194	Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways.	2015-04-13 09:56:15 -07:00
jaynus	e5d8fe2634	Guidance timing per FPS fixes.	2015-04-13 09:24:28 -07:00
jaynus	3e7c8ca634	remove optic debug.	2015-04-13 09:03:19 -07:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +02:00
jaynus	6aa9f5bcbc	NFOV/WFOV	2015-04-13 09:01:18 -07:00
jaynus	c66f99faac	Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539	2015-04-13 08:59:36 -07:00
jaynus	2d6b2f9a1a	I had accidently commented out seeker FOV on the Titan rockets.	2015-04-13 08:33:03 -07:00
Grzegorz	ec381699ca	fix missing class ... Am I doin it right? Works for me.	2015-04-13 16:48:14 +02:00
bux578	cba66366bd	fix invalid xml	2015-04-13 15:25:51 +02:00
bux578	8c24d9ec35	fix invalid xml, fix duplicate keys	2015-04-13 15:25:30 +02:00
ulteq	c12cc24a78	TABS: ... * "kill them with fire" * "then kill them again, with a rusty spoon"	2015-04-13 14:48:31 +02:00
ulteq	d8c23c2a64	Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp	2015-04-13 14:46:21 +02:00
Niko Lehtovirta	21c9272293	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-13 15:37:38 +03:00
KoffeinFlummi	363a6b3738	Fix erroneus tag in nametags stringtable ... Re: f6c7d444	2015-04-13 14:32:55 +02:00
KoffeinFlummi	8d4003a396	Merge https://github.com/HerrStein/ACE3 into german-merge	2015-04-13 14:21:00 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
commy2	f94b4befef	initial commit	2015-04-13 13:04:23 +02:00
KoffeinFlummi	b93cf4fb4a	Merge branch 'polish-merge'	2015-04-13 13:01:17 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
ulteq	5354d6578b	Simplified the AB PFH massively	2015-04-13 12:56:53 +02:00
ulteq	63760acc4f	Added an error message when the ab extension is missing	2015-04-13 12:56:18 +02:00
ulteq	c8aa3032fe	Added some sanity checks to the module setting initialization	2015-04-13 12:54:06 +02:00
commy2	fce7c4d0be	manual merge	2015-04-13 12:52:47 +02:00
commy2	0214d891e1	fix misc issues with optics, fix #537	2015-04-13 12:04:43 +02:00
ulteq	4355df118c	Refactored the Kestrel4500 Code.	2015-04-13 11:53:19 +02:00
Kllrt	915ac46e04	Very small typo in CZ translation ... -.-	2015-04-13 11:00:47 +02:00
ruPaladin	ccc2124abe	Russian translation for addons/interaction ... Fix for addons/interaction translation.	2015-04-13 11:53:15 +03:00
PabstMirror	bf3e3d3b64	#542 - ACE_fakeWeapon not found	2015-04-13 03:46:42 -05:00
ulteq	c98422b2c6	Shrinked some of the .paa files	2015-04-13 10:45:37 +02:00
ulteq	deadbd9414	Reduced the amount of LOD levels of the Kestrel	2015-04-13 10:39:31 +02:00
ulteq	939365a376	New texture for the Kestrel model	2015-04-13 10:39:14 +02:00
PabstMirror	7111cdd8ff	#540 - remove debug spam	2015-04-13 03:16:33 -05:00
PabstMirror	2a015482a1	Old Interaction Events (1713999 is long dead)	2015-04-13 01:03:08 -05:00
PabstMirror	878bdadbb3	Switch clientInit to postInit	2015-04-13 00:46:45 -05:00
PabstMirror	70dbae5a25	#527 - Unconscious switching groups	2015-04-13 00:32:07 -05:00
PabstMirror	669dbe10c9	BecomeLeader - Don't create new group	2015-04-13 00:23:00 -05:00
Nou	b58598c6aa	Woops, missing )	2015-04-12 21:47:27 -07:00
PabstMirror	b50a7a0147	Try to fix degree symbol (encoding issue)	2015-04-12 22:56:46 -05:00
PabstMirror	7719da2f66	Javelin Localiztion	2015-04-12 22:45:55 -05:00
PabstMirror	36b92b3d44	Don't do client stuff on dedicated.	2015-04-12 22:44:19 -05:00
Nou	4c74ff8717	FOV check made faster.	2015-04-12 19:49:14 -07:00
Nou	dc5028275a	Seeker FOV implemented, fast FOV check.	2015-04-12 19:16:58 -07:00
Anthariel	3e8c8384cf	Update stringtable.xml ... Missing translation	2015-04-13 02:24:13 +02:00
Anthariel	8339d15087	Update stringtable.xml ... Added: French translations (note, I've already removed a % at the line 30	2015-04-13 02:21:57 +02:00
Anthariel	7a8cd684a3	Update stringtable.xml	2015-04-13 02:19:58 +02:00
Anthariel	2939862e8c	Update stringtable.xml	2015-04-13 02:12:56 +02:00
Anthariel	d9f9dffbc0	Update stringtable.xml	2015-04-13 02:11:12 +02:00
Anthariel	e176df4636	Update stringtable.xml	2015-04-13 02:10:23 +02:00
Anthariel	7523dd011f	Update stringtable.xml	2015-04-13 02:06:17 +02:00
Anthariel	161866a8e5	Update stringtable.xml	2015-04-13 02:05:36 +02:00
Anthariel	67be340360	Update stringtable.xml	2015-04-13 02:05:15 +02:00
Nou	8df26b3246	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-12 17:03:16 -07:00
Nou	98acdc4089	M22 binocular mil reticle ported from ACE2.	2015-04-12 17:03:11 -07:00
Anthariel	77058857e6	Update stringtable.xml ... Wrong translation	2015-04-13 02:02:19 +02:00
jaynus	7c6b84b1f1	Begin laserdesignator UI changes.	2015-04-12 16:52:10 -07:00
jaynus	0c3caffe89	Merge pull request #501 from acemod/network_lasers ... Break all the lasers. Continuing expansion work is in #535	2015-04-12 16:47:24 -07:00
jaynus	fd4cb50d3d	Remove thermal, prep for coding.	2015-04-12 16:44:39 -07:00
jaynus	db5d54dffd	Only allow for laser designator for vanilla compensation.	2015-04-12 16:38:43 -07:00
Anthariel	0e925bc006	Update stringtable.xml	2015-04-13 01:31:49 +02:00
Anthariel	bd28f08559	Update stringtable.xml	2015-04-13 01:30:50 +02:00
Anthariel	c2253cf199	Update stringtable.xml	2015-04-13 01:30:16 +02:00
PabstMirror	74967910a3	opps	2015-04-12 18:27:55 -05:00
PabstMirror	d50bff866b	addToInventory use addMagazineArray -maybe fix #530	2015-04-12 18:27:25 -05:00
jaynus	9a25fb4f2f	Remove debug.	2015-04-12 16:19:18 -07:00
jaynus	4bd489cd96	Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531	2015-04-12 16:18:39 -07:00
Anthariel	9bb865a73f	Update stringtable.xml	2015-04-13 01:18:24 +02:00
Anthariel	2ec9b94083	Update stringtable.xml ... Fixed: Wrong translation (thx Dirtyhank)	2015-04-13 01:18:04 +02:00
Anthariel	638868b3da	Update stringtable.xml ... Added: French translation (100%).	2015-04-13 00:41:50 +02:00
ulteq	95e7f66a46	Added a model for the Kestrel 4500 ... *We might want to use a smaller one in the future ...	2015-04-13 00:17:59 +02:00
PabstMirror	807ebd8bfe	Resave reticle_titan in objectBuilder	2015-04-12 17:14:30 -05:00
ulteq	2040f4dcc3	Improved the wind speed calculation if AB is not enabled	2015-04-12 23:25:58 +02:00
ulteq	3c25fd4008	Fixed a typo	2015-04-12 23:20:54 +02:00
ulteq	e3aa9b3d22	Added a RSC preload class	2015-04-12 23:20:27 +02:00
jaynus	509b5e1a05	Integration of lasers for vanilla laser designation as well. Remove debug.	2015-04-12 14:12:21 -07:00
jaynus	c9e2eb0869	Changed: no-crosshair reticle for Titan by BlackPixxel	2015-04-12 14:05:12 -07:00
ulteq	7797cd9a38	Added missing abs()	2015-04-12 23:03:20 +02:00
jaynus	2317a3c988	Visually hide laser targets.	2015-04-12 14:03:15 -07:00
ulteq	705017f222	Implemented the Kestrel4500 spinning wheel animation	2015-04-12 22:54:36 +02:00
licht-im-Norden87	075b52c1ff	Update stringtable.xml	2015-04-12 22:53:02 +02:00
jaynus	2e83e56a73	Seeker integration.	2015-04-12 13:02:09 -07:00
PabstMirror	38c3f43dd6	Fix UBC ... Updating base class Turrets->, by z\ace\addons\missileguidance\config.bin/CfgVehicles/B_Heli_Attack_01_F/Turrets/	2015-04-12 14:39:49 -05:00
jaynus	5251de8447	break out seeker angle check. more laser code cleanup.	2015-04-12 12:16:26 -07:00
simon84	51bc7208bc	German translation ... Some german translations and corrections	2015-04-12 20:52:15 +02:00
jaynus	9287d6fe44	Remove dead code.	2015-04-12 11:46:28 -07:00
jaynus	7f0e54b9c3	More defaults.	2015-04-12 11:43:37 -07:00
jaynus	197b13e6d9	Use current codes for FCS updates.	2015-04-12 11:41:50 -07:00
jaynus	9273a32d23	code cleanup, default laser parameters, getVariable self designation specifics.	2015-04-12 11:38:07 -07:00
jaynus	6be8cc8d84	Removed: Laser visuals ... Updated: comments and function defs Changed: pass function name, not full code.	2015-04-12 11:29:33 -07:00
jaynus	887e1d1d99	Remove optional laser visual.	2015-04-12 11:14:12 -07:00
jaynus	16cd05edc8	Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers	2015-04-12 11:01:27 -07:00
jaynus	01797fd3b9	Integarate laser code into SALH guidance + self_designate. Note todo items.	2015-04-12 11:01:22 -07:00
Nou	4a23b8be00	Allow string function names.	2015-04-12 10:52:50 -07:00
nomisum	ca27e6eb5a	fixed typo ... `Erweitertes Raketenlenksystem` shoud be a nominalization	2015-04-12 19:52:37 +02:00
ulteq	40e013ed6d	Added SORD interface (Connection to the Vectronix Vector LRF)	2015-04-12 19:51:13 +02:00
nomisum	b1c29f82c2	improved/added german translation ... Imho `Raketenlenksystem` is the best fitting german translation for missile guidance. `Raketenlenkung` sounds a bit too colloquial.	2015-04-12 19:41:44 +02:00
commy2	10c32f264e	increase engagement ranges / burst mode on new mmg / full auto dmr	2015-04-12 18:21:28 +02:00
Anthariel	45f3300967	Update stringtable.xml ... Added: Missing french translation.	2015-04-12 18:20:32 +02:00
Anthariel	8d79fd242a	Update stringtable.xml ... Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)	2015-04-12 18:18:52 +02:00
Anthariel	3db8f4ad44	Update stringtable.xml ... Added: Some missing french translation.	2015-04-12 18:10:41 +02:00
Anthariel	3ee421a233	Update stringtable.xml ... Wrong french translation for the line 173.	2015-04-12 18:08:06 +02:00
KoffeinFlummi	664cc7077d	Reduce blood loss rate	2015-04-12 18:06:57 +02:00
KoffeinFlummi	6062128436	Remove tourniquet option, add check pulse/response	2015-04-12 18:01:29 +02:00
KoffeinFlummi	f794eaac43	Merge branch 'master' into basic-medical-tweaks ... Conflicts: addons/medical/ACE_Medical_Actions.hpp addons/medical/functions/fnc_handleDamage_basic.sqf addons/medical/stringtable.xml	2015-04-12 18:00:22 +02:00
Anthariel	3f84ac4817	Update stringtable.xml	2015-04-12 17:59:53 +02:00
Anthariel	3842272c43	Update stringtable.xml ... Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)	2015-04-12 17:55:53 +02:00
ulteq	6b44a3f3f9	Updated the module settings init script	2015-04-12 16:31:12 +02:00
ulteq	e003db2454	Fixed a typo	2015-04-12 16:27:24 +02:00
ulteq	e99fb398ae	Added simulation interval setting to the ab module	2015-04-12 16:25:01 +02:00
ulteq	8f2261acdd	Removed debug output	2015-04-12 16:19:39 +02:00
ulteq	ebb34a4f21	New default simulation interval of 0.05s	2015-04-12 16:19:32 +02:00
ulteq	aff9d7c554	Fixed a syntax error / Removed debug output	2015-04-12 16:17:49 +02:00
esteldunedain	d6ec8d771e	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-12 11:14:31 -03:00
esteldunedain	91df52056b	Only display "Surrender" action if the player is not holding a weapon.	2015-04-12 11:13:54 -03:00
ulteq	9f0a2c8b80	The terrain init script now aborts if no extension is found	2015-04-12 16:10:45 +02:00
esteldunedain	3ee18f9a3a	Readd CfgModuleCategories.hpp	2015-04-12 11:06:25 -03:00
esteldunedain	e7f9245d7e	ACE_Main major cleanup	2015-04-12 10:54:18 -03:00
licht-im-Norden87	fef0d690f8	Update stringtable.xml	2015-04-12 15:25:18 +02:00
licht-im-Norden87	36ba507ab5	Update stringtable.xml	2015-04-12 14:52:37 +02:00
bux578	9184ef479a	add disarm icon, add action psd, move icon files	2015-04-12 14:47:08 +02:00
Glowbal	019163c9ce	Merge pull request #489 from acemod/medicalPerformanceImprovements ... Medical performance improvements	2015-04-12 14:44:18 +02:00
licht-im-Norden87	94eb4f3dd5	Update stringtable.xml	2015-04-12 14:42:15 +02:00
Ivan Navarro Cabello	e7a8dde782	update stringtable for spanish ... added new spanish terms	2015-04-12 14:41:50 +02:00
licht-im-Norden87	38955692ff	Update stringtable.xml	2015-04-12 14:40:04 +02:00
licht-im-Norden87	dbc7026d94	.....	2015-04-12 14:38:04 +02:00
licht-im-Norden87	b144a42e63	Update stringtable.xml	2015-04-12 14:30:40 +02:00
Legolasindar	2c0e93271c	Update stringtable.xml ... added spanish translate	2015-04-12 14:29:47 +02:00
KoffeinFlummi	8f2a1735ae	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-12 14:28:28 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
Legolasindar	4bb9f0cf77	Update stringtable.xml ... added spanish translate	2015-04-12 14:27:42 +02:00
licht-im-Norden87	a04abcf972	Update stringtable.xml	2015-04-12 14:25:41 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
licht-im-Norden87	400b8f4270	Update stringtable.xml	2015-04-12 14:14:48 +02:00
licht-im-Norden87	8f88158a2e	Update stringtable.xml	2015-04-12 14:13:38 +02:00
licht-im-Norden87	88a71042e3	Update stringtable.xml	2015-04-12 14:12:05 +02:00
licht-im-Norden87	a3f97efbc3	Update stringtable.xml ... What does WDG and MGRS mean?	2015-04-12 14:07:49 +02:00
licht-im-Norden87	e4ec9d14d4	Update stringtable.xml	2015-04-12 14:00:56 +02:00
licht-im-Norden87	15e9b2cccc	Update stringtable.xml	2015-04-12 13:59:09 +02:00
Legolasindar	b665781399	Update stringtable.xml ... updated spanish translation and added some english missed translation	2015-04-12 13:58:06 +02:00
licht-im-Norden87	6b39edbddf	Update stringtable.xml	2015-04-12 13:58:02 +02:00
commy2	56de4f05f3	scripts for vector illum, renaming some files	2015-04-12 13:56:01 +02:00
licht-im-Norden87	a01c4a0e0b	Update stringtable.xml	2015-04-12 13:55:55 +02:00
licht-im-Norden87	2222192aee	Update stringtable.xml	2015-04-12 13:51:47 +02:00
licht-im-Norden87	7eaee37ff6	Update stringtable.xml	2015-04-12 13:48:59 +02:00
licht-im-Norden87	d0fb387255	Update Stringtable: Disarming	2015-04-12 13:45:47 +02:00
nic547	0f1115c33b	Added new Ammotypes into the AGM crate	2015-04-12 13:08:50 +02:00
commy2	83e634be8a	illuminate vector number textures at night	2015-04-12 12:54:36 +02:00
ulteq	9fd19563a3	Fixed several syntax errors	2015-04-12 12:52:13 +02:00
ulteq	fd737f3f95	Minor code optimization	2015-04-12 12:36:05 +02:00
ulteq	cf88adb794	Replaced wind with ACE_wind	2015-04-12 12:34:42 +02:00
ulteq	85a7bea42b	Added wind deflection module settings: ... *simulationInterval *simulationRadius	2015-04-12 12:33:09 +02:00
ulteq	a993f2d5f1	Minor code optimization	2015-04-12 12:15:39 +02:00
ulteq	cb0df8783a	Fixed a calculation error	2015-04-12 12:09:55 +02:00
commy2	7b0e7a1efb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-12 12:04:07 +02:00
commy2	f16d5398f4	enable vector on ffv positions, fix #506	2015-04-12 12:03:49 +02:00
ulteq	1c8da72716	Removed debug output	2015-04-12 11:59:45 +02:00
ulteq	879c6b42b9	Finished the advanced ballistics module settings	2015-04-12 11:59:02 +02:00
ulteq	c532742a5b	Overworked the module settings (WIP)	2015-04-12 11:48:21 +02:00
commy2	e87f491470	mute implementation in noradio, handle post init on remote units	2015-04-12 11:17:58 +02:00
Kllrt	be8ff39767	Fixed broken missileguidaince stringtable.xml ... sry	2015-04-12 10:58:00 +02:00
commy2	54f29d75f5	functions to mute unit	2015-04-12 10:05:49 +02:00
Glowbal	6bfd3e5c74	Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying ... Fixed breaking of unconscious animation on drop object.	2015-04-12 09:48:27 +02:00
commy2	018854a7c3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit	2015-04-12 09:15:45 +02:00
PabstMirror	78b64ea273	Missing English	2015-04-12 01:36:41 -05:00
bux578	2fc7f44c39	french translation, tabler 4 spaces test	2015-04-12 07:50:23 +02:00
bux578	0e3d971274	Fix translations error	2015-04-12 07:46:43 +02:00
esteldunedain	dfea99debf	Switch "Team" for "Group"	2015-04-12 01:32:03 -03:00
esteldunedain	0565eb6c74	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment ... Conflicts: addons/laser_selfdesignate/stringtable.xml	2015-04-12 01:26:55 -03:00
esteldunedain	654ab4daf5	Remove >> from attach actions	2015-04-12 01:24:42 -03:00
esteldunedain	0420a94938	Streamline Team management actions	2015-04-12 01:19:38 -03:00
esteldunedain	630a2a0f7a	Make the list menu optional via a client setting	2015-04-12 01:15:38 -03:00
esteldunedain	01bc6b233a	Merge branch 'breakLineExtension' into linearMenuExperiment ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf	2015-04-12 00:21:05 -03:00
esteldunedain	7b797d906f	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf addons/overheating/stringtable.xml	2015-04-12 00:19:33 -03:00
Nou	40c5de8cfb	Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot).	2015-04-11 20:14:03 -07:00
Nou	db3f816843	Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot).	2015-04-11 20:13:52 -07:00
PabstMirror	18cd0e7f39	Use DisableAI from common	2015-04-11 21:48:12 -05:00
PabstMirror	c3c815db8d	Better LOS check	2015-04-11 21:42:57 -05:00
esteldunedain	df17df61f9	Improve the way lines are split	2015-04-11 23:39:06 -03:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	362753209e	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-12 05:40:24 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
KoffeinFlummi	5108137302	Merge https://github.com/Ricciardino/ACE3 into italian-merge	2015-04-12 04:38:46 +02:00
PabstMirror	8fc3b53507	Use new medical func	2015-04-11 21:22:34 -05:00
PabstMirror	3be70556ab	Medical: adjustPainLevels from outside functions	2015-04-11 21:21:33 -05:00
KoffeinFlummi	5101a21beb	Remove "Original" stringtable entries	2015-04-12 04:21:06 +02:00
Nou	e4c459132b	Merge branch 'master' into network_lasers	2015-04-11 18:36:57 -07:00
Nou	8386c0e22a	Seeker system and network enabled laser simulation.	2015-04-11 18:36:10 -07:00
licht-im-Norden87	a30eabfb1d	Update stringtable.xml	2015-04-12 03:30:11 +02:00
licht-im-Norden87	bd673d3374	Update stringtable.xml	2015-04-12 03:28:12 +02:00
licht-im-Norden87	bd07e18b43	Update stringtable.xml	2015-04-12 03:26:45 +02:00
esteldunedain	d06e1b4a2a	Break line extension	2015-04-11 22:22:19 -03:00
PabstMirror	350a79c8a4	#498 - Use cursor mode when scoped	2015-04-11 19:44:42 -05:00
Felix Wiegand	0531f2cc12	Merge pull request #493 from FreeZbe/patch-7 ... Update stringtable.xml	2015-04-12 01:14:40 +02:00
esteldunedain	a01864319a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-11 19:34:53 -03:00
esteldunedain	488000bdf3	Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494	2015-04-11 19:34:29 -03:00
PabstMirror	baf4b0146e	Missing semmicolon	2015-04-11 16:50:35 -05:00
PabstMirror	0805d5b640	Update UAV battery icon from AGM	2015-04-11 16:48:49 -05:00
ulteq	ef0884c49d	Added comments to all ATragMX functions	2015-04-11 23:40:46 +02:00
FreeZbe	3ff6abde71	Update stringtable.xml	2015-04-11 23:18:51 +02:00
jaynus	2a2f96a034	ACRE API functions and core functions were incorrect.	2015-04-11 14:10:30 -07:00
jaynus	458c49b0a7	Merge remote-tracking branch 'origin/master' into javelinLocking ... Conflicts: addons/common/XEH_preInit.sqf	2015-04-11 14:01:47 -07:00
jaynus	6e28b3b9b7	Disable gates (reload)	2015-04-11 13:59:17 -07:00
jaynus	d744074b2f	localization.	2015-04-11 13:48:46 -07:00
Glowbal	e00f0ea4c3	No longer creates a new waitAndExec for every handleDamage call	2015-04-11 22:47:10 +02:00
jaynus	2418d99f97	Finalizes port. Closes #75	2015-04-11 13:41:00 -07:00
jaynus	75216c2f8b	readme, authors.	2015-04-11 13:39:16 -07:00
jaynus	2999ff55e1	Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d.	2015-04-11 13:37:55 -07:00
ulteq	05f14d6242	Added AdvancedBallistics module options	2015-04-11 22:34:19 +02:00
Glowbal	97fa40b4c1	Make use of new global variables for selections and hitpoints	2015-04-11 22:31:38 +02:00
Glowbal	6cc115a628	We already determine the new damage in caching, so we will use that value instead of recalculating it here	2015-04-11 22:31:17 +02:00
Glowbal	e8d2a00994	Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables ... No longer have to recreate the selection and hitpoint arrays every time	2015-04-11 22:30:52 +02:00
Glowbal	c69f71ba71	formatting	2015-04-11 22:29:32 +02:00
Glowbal	51906e341d	Removed unused variables	2015-04-11 22:29:11 +02:00
jaynus	505005891d	Remove debug, targeting constraints working.	2015-04-11 12:42:30 -07:00
Glowbal	082ab5155e	Minor performance improvements ... Before avg: 0.0858495ms After avg: 0.0701045ms	2015-04-11 21:27:49 +02:00
PabstMirror	f5cce94b91	Merge pull request #136 from acemod/disarmingTest ... Unit Disarming/DropGear Merge	2015-04-11 14:14:22 -05:00
ulteq	e108598b36	Added a model for the ATragMX	2015-04-11 21:01:38 +02:00
nic547	63e5247d3b	more ammotypes for the mags	2015-04-11 21:00:41 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Glowbal	66bd7e7e5f	fixed #457	2015-04-11 20:32:07 +02:00
commy2	b9077888aa	unmute handleing	2015-04-11 20:26:43 +02:00
jaynus	458958ef09	Target gating implemented.	2015-04-11 11:17:34 -07:00
Glowbal	24765741ab	Enabled setAccTime fix from commy	2015-04-11 20:05:22 +02:00
jaynus	aa53a1815c	scaling.	2015-04-11 10:58:27 -07:00
jaynus	fb6c99d69b	re-path. Wtf safezones.	2015-04-11 10:56:58 -07:00
Glowbal	dd7e746368	formatting	2015-04-11 19:52:30 +02:00
ulteq	5c5f41cf5b	AB is now disable by default	2015-04-11 19:51:58 +02:00
ulteq	9893d940df	Disabled advanced scope zeroing if AB is not enabled	2015-04-11 19:47:14 +02:00
ulteq	1ff7218903	Change the Kestrel 4500 behavior 'back to normal' when AB is disabled	2015-04-11 19:44:38 +02:00
jaynus	efaee770bb	rename wep_javelin to javelin	2015-04-11 10:44:13 -07:00
Kllrt	12f87013b2	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 19:38:28 +02:00
Niko Lehtovirta	4b50d760e9	fixed to use proper 4-space tabbing	2015-04-11 20:36:38 +03:00
Niko Lehtovirta	0e0935ac01	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 20:28:04 +03:00
ulteq	2b0a0145c5	Removed the last spawn/sleep commands from AB	2015-04-11 18:39:15 +02:00
Felix Wiegand	0bf32bfb3a	Merge pull request #476 from acemod/dropbackpack ... function to drop backpack	2015-04-11 18:23:27 +02:00
commy2	e1bf475355	Merge pull request #419 from acemod/cfgtriggers ... rename cfgAce_Triggers to ACE_Triggers	2015-04-11 18:19:36 +02:00
ulteq	44198b18d7	Rewrite of the terrain initialization: ... *Replaced spawn/sleep with a PFH	2015-04-11 18:18:38 +02:00
commy2	4dc38ca7ee	Merge pull request #395 from acemod/flashsup ... flashsupressors for new weapons, #264	2015-04-11 18:18:05 +02:00
Kllrt	56681e632d	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 16:36:31 +02:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
commy2	761e4aec64	edit description	2015-04-11 16:27:04 +02:00
esteldunedain	dec5aa3ec5	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-11 11:12:56 -03:00
esteldunedain	b8e0388581	Fix nearestObjects with getPos choking over seawater. Fix #465	2015-04-11 11:12:40 -03:00
commy2	62b45a8a07	initial commit	2015-04-11 15:59:21 +02:00
commy2	9cf44b1d32	initial commit	2015-04-11 15:46:41 +02:00
ulteq	23733263ea	Updated the extension file name	2015-04-11 15:06:30 +02:00
nic547	a37cd51fe7	more stuff ... - added more ammotypes - stringtable now follows guideline	2015-04-11 15:02:56 +02:00
ulteq	d7a40bfba2	Replaced all execVM calls with FUNC()	2015-04-11 14:51:40 +02:00
ulteq	a36bd588d5	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments	2015-04-11 14:31:23 +02:00
ulteq	fee65cd56f	Overhauled the scope adjustment module: ... *Added configs for the new marksmen scopes *Introduced minor and major steps *Introcuded a new increment config (ACE_ScopeAdjust_Increment) *Changed the default zero range to 100m *Added a zero reference setting *Added an interaction menu entry to update the zero reference setting	2015-04-11 14:02:44 +02:00
Niko Lehtovirta	4a7358e05a	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 14:30:40 +03:00
commy2	5a5a1fd66a	ACE_optic_SOS_PIP - iron sight was missing, fix #470	2015-04-11 13:18:45 +02:00
VyMajoris	9d326ce9a5	Added - Portuguese translation to magazineRepack	2015-04-11 03:10:39 -03:00
VyMajoris	31a9897952	Added - Portuguese translation to wirecutter	2015-04-11 03:07:15 -03:00
PabstMirror	b5e5359795	CursorCentered - Localizations	2015-04-11 00:35:18 -05:00
PabstMirror	ae064359f6	Remove Debug	2015-04-10 23:51:07 -05:00
PabstMirror	0edcf03e12	Handle Vehicle Attunation	2015-04-10 23:21:54 -05:00
PabstMirror	dac3047fca	Use AllVehicles Instead of CAManBase	2015-04-10 22:16:33 -05:00
PabstMirror	787df67248	Merge branch 'master' into disarmingTest	2015-04-10 19:20:34 -05:00
Tenga	e7b5218d52	Altimeter fix, division by zero when no time has passed (game paused, etc.)	2015-04-11 00:14:06 +02:00
jaynus	4188893839	Move spatial model translations to ace_common	2015-04-10 14:23:55 -07:00
jaynus	0a88220fc2	Constraints work, added worldToScreenBounds to common.	2015-04-10 14:20:06 -07:00
jaynus	721898d9fb	Constraint dialogs working.	2015-04-10 13:57:44 -07:00
commy2	11ad74735c	Merge pull request #458 from Tenga/master ... Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera	2015-04-10 22:12:55 +02:00
PabstMirror	adc7db9ae9	#456 - Fix AI rotating while dead (disableAI func) ... Still some small head movements, but I don't know how to fix that.	2015-04-10 15:02:40 -05:00
Tenga	b710c2543e	Return the newline to fnc_externalCamera.sqf	2015-04-10 21:59:28 +02:00
commy2	2a72e183b1	Merge pull request #450 from Tenga/master ... Count the commander camera as a 3rd person camera	2015-04-10 21:54:52 +02:00
Tenga	229590ed20	Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera	2015-04-10 21:54:47 +02:00
Tenga	c8cff6e91c	- Added isFeatureCameraActive to ace_common ... - ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature	2015-04-10 21:48:24 +02:00
jaynus	83b453a294	Merge pull request #379 from acemod/allTheMissiles ... Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.	2015-04-10 12:48:10 -07:00
jaynus	8429b262f2	more debug removal, backup vanilla usage.	2015-04-10 12:40:58 -07:00
PabstMirror	661ddc3562	#441 - Crash with no model on ace_fakeweapon	2015-04-10 14:35:08 -05:00
FreeZbe	4a996bf147	Update stringtable.xml	2015-04-10 21:22:07 +02:00
esteldunedain	ee8af7f153	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-10 16:21:27 -03:00
esteldunedain	d6e70cfe6b	Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 ... Conflicts: addons/common/stringtable.xml addons/explosives/stringtable.xml addons/frag/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/medical/stringtable.xml	2015-04-10 16:20:18 -03:00
FreeZbe	e09a3b29d7	Update stringtable.xml	2015-04-10 21:20:09 +02:00
jaynus	5577a541ca	Add example.	2015-04-10 12:19:02 -07:00
jaynus	0225cb510c	Add missile strings.	2015-04-10 12:16:18 -07:00
Riccardo Petricca	d9e78e511e	Added italian translation to the last terms. ... Added italian translation to the last added terms.	2015-04-10 21:13:03 +02:00
jaynus	391b1556cb	Disable all debug.	2015-04-10 12:12:25 -07:00
FreeZbe	4dbba270f9	Translations fixes	2015-04-10 21:07:38 +02:00
nic547	a4b9090e34	Added new ammotypes for both types of .388 ammo	2015-04-10 21:01:49 +02:00
jaynus	bcb7d18e7e	remove debug.	2015-04-10 11:57:50 -07:00
jaynus	c28ac5b4a9	Compensate for target velocity.	2015-04-10 11:40:18 -07:00
jaynus	5083a5a0d2	Javelin locking fire modes were reversed.	2015-04-10 11:37:03 -07:00
ruPaladin	8ea96b3086	Update stringtable.xml	2015-04-10 21:21:40 +03:00
ulteq	127d100628	Overworked the scope adjustment keybinds: ... *Fixed duplicate actionIDs *Introduced minor/major steps *Reset the stringtable.xml	2015-04-10 20:17:26 +02:00
PabstMirror	db5861da52	#428 - GJ Git	2015-04-10 13:05:39 -05:00
PabstMirror	33570c94e4	#428 - Only work on locked vehicles.	2015-04-10 13:05:39 -05:00
Tenga	eec5f458db	Count the commander camera as a 3rd person camera	2015-04-10 20:05:33 +02:00
PabstMirror	97e277d710	#448 - Adjust Nightvision in vehicles	2015-04-10 12:55:42 -05:00
jaynus	c428bf051f	placeholder model for hellfire, optics refreshing on titan	2015-04-10 10:42:02 -07:00
esteldunedain	b44f22c262	Add 1 mil scope adjustment keybinds	2015-04-10 14:41:34 -03:00
ruPaladin	d198cb25e9	Update stringtable.xml	2015-04-10 20:37:21 +03:00
commy2	ec29cdd731	remove forgotten debug item, .MD for optics, fix #439	2015-04-10 19:34:44 +02:00
ruPaladin	9c8c38aaae	Update stringtable.xml	2015-04-10 20:28:05 +03:00
ruPaladin	a3a40a711c	Update stringtable.xml	2015-04-10 20:24:23 +03:00
ruPaladin	100954da06	Update stringtable.xml	2015-04-10 20:19:19 +03:00
jaynus	2fe55b3117	Attack profile buildout.	2015-04-10 10:14:30 -07:00
commy2	5d097c4dd9	add comment explaining why isNumber is used	2015-04-10 19:11:51 +02:00
ulteq	2c4c6763c3	Removed deprecated CSE code (EnableForAI module option)	2015-04-10 19:02:32 +02:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
commy2	c03ee8e9c6	lowercase gps	2015-04-10 18:34:26 +02:00
commy2	dc49f2c71e	rewrite assigned item fix	2015-04-10 18:31:43 +02:00
FreeZbe	31a08d22d8	Translation changes	2015-04-10 18:18:45 +02:00
ulteq	9604699f26	Replaced QUOTE(GVAR(...)) with QGVAR(...)	2015-04-10 18:11:01 +02:00
ulteq	4e50760064	Fixed a syntax error	2015-04-10 18:08:38 +02:00
commy2	5ff1d9863d	remove +2 offset for check temperature, also fix the shade of grey, #431	2015-04-10 17:48:21 +02:00
commy2	fc98e78a53	hide check temperature action when empty weapon is selected, #431	2015-04-10 17:36:58 +02:00
FreeZbe	62bb1c6907	Translation changes	2015-04-10 17:11:15 +02:00
FreeZbe	6de5cd76dc	Translation changes	2015-04-10 17:10:51 +02:00
commy2	c7ad94efbf	renamed hpp to ACE_Triggers	2015-04-10 17:09:48 +02:00
commy2	5c12b22666	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into cfgtriggers	2015-04-10 17:07:47 +02:00
Grzegorz	584c77a0b6	microdagr PL translation ... fixes	2015-04-10 17:07:40 +02:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
ulteq	37804f01f6	Fixed a nasty typo	2015-04-10 16:48:58 +02:00
ulteq	013c56f070	Replaced an outdated ATragMX 'AdvancedBallistics detection routine'	2015-04-10 16:48:45 +02:00
FreeZbe	3541500947	Translation changes	2015-04-10 16:41:51 +02:00
Grzegorz	a95b0b051c	inventory PL translation	2015-04-10 16:33:09 +02:00
Grzegorz	439dfa7b3c	laser_selfdesignate PL translation ... fixes	2015-04-10 16:31:47 +02:00
FreeZbe	8fc73af1c4	Translation update ... Addition of french translation	2015-04-10 16:26:09 +02:00
ulteq	6d40859ec2	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 ... Conflicts: addons/kestrel/config.cpp	2015-04-10 15:51:22 +02:00
ulteq	87406d739d	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-10 15:49:14 +02:00
ulteq	ad8e6450eb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics	2015-04-10 15:44:33 +02:00
ulteq	f07d743c1d	Fixed Kestrel4500 not working when bipod is deployed	2015-04-10 15:26:56 +02:00
Niko Lehtovirta	9f2f660b89	fixed PFH to use EFUNC(common,waitAndExecute)	2015-04-10 16:23:27 +03:00
ulteq	25ec665f45	Fixed the ATragMX 'AdvancedBallistics detection routine'	2015-04-10 15:17:16 +02:00
ulteq	ad3c9493d7	Fixed ATragMX not working when bipod is deployed	2015-04-10 15:09:38 +02:00
ulteq	c7db3dbffe	Renamed canShow function to fit the rest of the functions	2015-04-10 15:09:18 +02:00
ulteq	f003ff590e	Fixed the target speed assist feature: ... *Replaced while/sleep with a PFH	2015-04-10 15:02:45 +02:00
Asgar	16b2311376	Added German translation for a couple of things,	2015-04-10 14:21:55 +02:00
Niko Lehtovirta	b318d2cced	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-10 15:10:47 +03:00
Legolasindar	c7d3618d79	Update stringtable.xml ... fix spanish term	2015-04-10 13:43:39 +02:00
Legolasindar	a224ec3371	Update stringtable.xml ... added spanish translation	2015-04-10 13:43:07 +02:00
Legolasindar	f2a73ab9c6	Update stringtable.xml ... added some spanish translation	2015-04-10 13:41:44 +02:00
Legolasindar	19da5b366e	Update stringtable.xml ... added spanish translation	2015-04-10 13:38:19 +02:00
Legolasindar	c741154ff2	Update stringtable.xml ... added spanish translation	2015-04-10 13:36:17 +02:00
Legolasindar	6f69361a73	Update stringtable.xml ... added spanish translation	2015-04-10 13:34:16 +02:00
Niko Lehtovirta	f0468fa7c8	Changed spawn code on respawn to PFH format	2015-04-10 14:21:52 +03:00
Legolasindar	470a12ed46	Update stringtable.xml ... added spanish translation	2015-04-10 13:19:26 +02:00
Legolasindar	a73c37ce05	Update stringtable.xml ... added spanish translation	2015-04-10 13:14:33 +02:00
Legolasindar	e0fc44cfa8	Update stringtable.xml ... Added spanishtr translation	2015-04-10 13:04:08 +02:00
ulteq	f7944381af	Updated the .50 Cal airFriction values	2015-04-10 13:00:08 +02:00
Legolasindar	cf769e09fb	Update stringtable.xml ... Add spanish translation	2015-04-10 12:46:31 +02:00
ulteq	8f6bf930ee	Added gun profiles for the new vanilla calibers	2015-04-10 12:41:29 +02:00
Legolasindar	52d476abd3	Update stringtable.xml ... Added spanisth translation, and two lines of english translation	2015-04-10 12:29:44 +02:00
ulteq	bbfafdb5e1	Added missing private variable declaration	2015-04-10 11:43:47 +02:00
ulteq	77d39016fa	Fixed an issue with zero ranges close to 0 meters.	2015-04-10 11:14:13 +02:00
VyMajoris	baf015ff5a	Added - Portuguese Translation to logistics_uavbattery ... The correct translation of "UAV" to Portuguese is indeed "VANT", but this term is not used as "UAV" is. In reality, most Portuguese speaking people knows what an "UAV" is but if you use the Portuguese translation they have no idea of what you are talking about. Another alternative is to use the word "Drone". Everyone knows what a drone its, however, I find that the "UAV" is more in terms with the authenticity aspect of ACE3, since it the military uses the word "UAV" instead of "Drone" Also, it seems that somebody wrote "UAV's" instead of "UAVs". If you intentd to use the plural, you should not use the Apostrophe. I am not correcting this since I am not sure if indeed this was intended for plural or not.	2015-04-10 05:22:46 -03:00
VyMajoris	599ae092da	Changed - added dot on description	2015-04-10 05:09:43 -03:00
VyMajoris	a0a0cfbfbd	Added - Portuguese translation to laserpointer	2015-04-10 05:07:44 -03:00
VyMajoris	37858ec430	Added - Portuguese translation to laser_selfdesignate	2015-04-10 05:04:15 -03:00
VyMajoris	f7166047dc	Added - Portuguese translation to Kestrel ApproximateTemp	2015-04-10 05:01:11 -03:00
Jo David	c258c6c00d	fixing translation	2015-04-10 09:05:37 +02:00
Jo David	33a14076fc	Merge branch 'master' of https://github.com/acemod/ACE3 into translations ... Conflicts: addons/captives/stringtable.xml addons/medical/stringtable.xml	2015-04-10 09:01:24 +02:00
jaynus	6286d59bd9	Remove NVG from gunner optics on comanche.	2015-04-09 23:29:37 -07:00
jaynus	9e7d4c25bb	Removes old value of stabalizing which broke gunner. Fixes #412	2015-04-09 23:28:41 -07:00
commy2	d5f190dff8	fix: getGunner returns null object when throwing grenades, planting explosives	2015-04-10 06:47:31 +02:00
commy2	105184ce88	fix: getGunner returns null object if pilot uses manual fire if no gunner is present	2015-04-10 06:36:09 +02:00
Anthariel	04bf321099	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:31:42 +02:00
Anthariel	81122e0839	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:30:49 +02:00
Anthariel	b5841f8f09	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:28:59 +02:00
Anthariel	dd8f9cd8d6	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:27:04 +02:00
Anthariel	0191abc529	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:25:05 +02:00
Anthariel	523417ba3c	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:23:13 +02:00
Anthariel	0c851a6d9a	Update stringtable.xml ... Added: French Translations (100%)	2015-04-10 06:22:26 +02:00
Anthariel	95e53fd1bf	Update stringtable.xml ... Added: French Translations (~85%)	2015-04-10 06:20:04 +02:00
Anthariel	d6b2d13a72	Update stringtable.xml ... Added: French Translation (95%)	2015-04-10 06:00:22 +02:00
commy2	5fe33fb1db	rename cfgAce_Triggers to ACE_Triggers	2015-04-10 05:56:19 +02:00
Anthariel	0d8145073f	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:54:45 +02:00
Anthariel	627f8fb41b	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:53:29 +02:00
Anthariel	87f5873c2a	Update stringtable.xml ... Added: French Translation (90%) Fixed: Uknow to Unknow (line 101)	2015-04-10 05:50:08 +02:00
PabstMirror	26d282c224	Explosives: Fix cursor interaction menu breaking	2015-04-09 22:46:19 -05:00
Anthariel	fb8c49135e	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:43:42 +02:00
Anthariel	d9986c6959	Update stringtable.xml ... Added: French Translation (75%)	2015-04-10 05:40:22 +02:00
Anthariel	7280148f91	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:37:10 +02:00
Anthariel	949cee6df4	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:35:56 +02:00
Anthariel	e6adddb7fa	Update stringtable.xml ... Added: French Translations (100%)	2015-04-10 05:34:09 +02:00
Anthariel	29f06a7bd8	Update stringtable.xml ... Added: French Translation (100%).	2015-04-10 05:29:00 +02:00
PabstMirror	170985295d	Flashbangs: Medical Pain	2015-04-09 22:00:03 -05:00
PabstMirror	eb60910aab	Flashbangs: eyePos LOS check, 3d eye direction	2015-04-09 21:58:45 -05:00
Kavinsky	a118cae13d	unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item	2015-04-10 04:36:28 +02:00
Kavinsky	b49fec58e6	Updated stringtable	2015-04-10 04:35:21 +02:00
Grzegorz	311e018ba7	weaponselect PL translation	2015-04-10 04:33:13 +02:00
Grzegorz	bf6984400f	medical PL translation ... like a boss	2015-04-10 04:30:39 +02:00
VyMajoris	ec8e2707f8	Added - Portuguese translation to inventory	2015-04-09 23:05:47 -03:00
Kavinsky	adaee74a57	removed config redundancy	2015-04-10 04:00:26 +02:00
VyMajoris	c260ff89ba	Added - Portuguese Translation to Interact_menu	2015-04-09 23:00:13 -03:00
Kavinsky	999ad49fd0	removed duplicated debugging error	2015-04-10 03:58:14 +02:00
Grzegorz	3ffd7ac8c7	attach PL translation	2015-04-10 03:57:55 +02:00
Grzegorz	37be4f9e53	captives PL translation	2015-04-10 03:56:24 +02:00
Grzegorz	95be641918	common PL translation	2015-04-10 03:52:30 +02:00
VyMajoris	be7a579f7d	Added - Portuguese translation to LaseTarget ... There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes...	2015-04-09 22:50:35 -03:00
Kavinsky	049edd1483	Added ACE Attach posibility to add more types of attachable items	2015-04-10 03:49:50 +02:00
Grzegorz	dcc07c84bc	disposable PL translation	2015-04-10 03:43:34 +02:00
VyMajoris	4198a942b3	Added/Changed - explosives Portuguese Translation ... Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.	2015-04-09 22:42:21 -03:00
Grzegorz	6be80caf2e	dragging PL translation	2015-04-10 03:41:12 +02:00
Grzegorz	d0787ab2d8	explosives PL translation	2015-04-10 03:40:03 +02:00
Grzegorz	ae1b2f04b0	fcs PL translation	2015-04-10 03:39:05 +02:00
Grzegorz	022e17417f	frag PL translation	2015-04-10 03:37:30 +02:00
Grzegorz	2925100ec6	frag PL translation	2015-04-10 03:36:32 +02:00
Grzegorz	d874140268	hearing PL translation	2015-04-10 03:33:40 +02:00
VyMajoris	c8c183863c	Changed - Dragging drop Portuguese Translation ... Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans. "STR_ACE_Dragging_UnableToDrag" Commented code unchanged	2015-04-09 22:28:45 -03:00
Grzegorz	e907553abc	interact_menu PL translation	2015-04-10 03:28:14 +02:00
Grzegorz	2984aa2e8c	interaction PL translation	2015-04-10 03:26:03 +02:00
VyMajoris	0dbb4579c4	Added - Portuguese translation Disposable	2015-04-09 22:25:37 -03:00
Grzegorz	aaa4dcba2c	inventory PL translation	2015-04-10 03:19:37 +02:00
VyMajoris	b8f2bd9636	Added - Portuguese translation to cargo door ... Confused if it is a ramp or a door. Translated to as if it is a door. Should work.	2015-04-09 22:18:46 -03:00
VyMajoris	f98b9c27c6	Added - Portuguese translation to Captive surrendering ... I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate. Are those texts talking to the player or is just a description for an action?	2015-04-09 22:16:14 -03:00
Grzegorz	e13199af2a	laser_selfdesignate PL translation	2015-04-10 03:15:28 +02:00
Grzegorz	8b6ac39d1d	laserpointer PL translation	2015-04-10 03:13:59 +02:00
VyMajoris	c1941f2719	Added - Portuguese translation to common/Stringtable ... I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.	2015-04-09 22:12:54 -03:00
Grzegorz	e0a2a144c5	logistics_wirecutter	2015-04-10 03:10:05 +02:00
Grzegorz	685d21169d	magazinerepack PL translation ... Had to make some shifts in lines 70 and 93 to make it sound good in PL	2015-04-10 03:03:03 +02:00
Grzegorz	6cbb6206c1	microdagr PL translation ... fixed typo in line 119	2015-04-10 02:47:19 +02:00
Grzegorz	0f9614eb4f	nametags PL translation ... SoundWaves :)	2015-04-10 02:36:23 +02:00
Nicolás Badano	357fd1969b	Merge pull request #406 from Legolasindar/patch-4 ... Spanish: Update stringtable.xml	2015-04-09 21:24:19 -03:00
Nicolás Badano	7e6e0d0ecd	Merge pull request #402 from Legolasindar/patch-2 ... Update stringtable.xml	2015-04-09 21:24:00 -03:00
Grzegorz	5255c91408	optionsmenu PL translation	2015-04-10 02:20:22 +02:00
Grzegorz	03faa32cef	overheating PL translation	2015-04-10 02:07:19 +02:00
Grzegorz	d193fd513f	realisticnames PL translation	2015-04-10 02:02:59 +02:00
VyMajoris	ae7af34a11	Added - Portuguese translation to common/Stringtable ... Everything translated. Even the banana.	2015-04-09 20:53:44 -03:00
Grzegorz	a150ab43e1	Update stringtable.xml	2015-04-10 01:53:28 +02:00
Grzegorz	f61832f735	reload PL translation	2015-04-10 01:44:43 +02:00
jaynus	c1089dfffa	Working save, distance shots are off.	2015-04-09 16:43:05 -07:00
Legolasindar	2a5e416dfc	Update stringtable.xml ... fixed spanish terms	2015-04-10 01:40:22 +02:00
Legolasindar	e63b9c7aa9	Update stringtable.xml ... added spanish translation	2015-04-10 01:38:31 +02:00
Grzegorz	ce46961ef1	reloadlaunchers PL translation	2015-04-10 01:38:13 +02:00
Legolasindar	2456660867	Update stringtable.xml	2015-04-10 01:36:42 +02:00
Grzegorz	08590d98a3	respawn PL translation	2015-04-10 01:35:09 +02:00
Legolasindar	5a849fe8a4	Update stringtable.xml ... added spanish translation	2015-04-10 01:33:08 +02:00
jaynus	2e9f6a7058	Better projected up/down.	2015-04-09 16:31:14 -07:00
VyMajoris	ac5589c1c1	Added - Portuguese translation to Captive surendering ... Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry.	2015-04-09 20:30:09 -03:00
Legolasindar	2542f994d6	Update stringtable.xml ... added spanish translation	2015-04-10 01:29:52 +02:00
Grzegorz	aa8275460f	weaponselect PL translation	2015-04-10 01:29:26 +02:00
Legolasindar	5f5ce47bec	Update stringtable.xml ... fixed one term in spanish	2015-04-10 01:26:06 +02:00
Grzegorz	df3927324a	wep_javelin PL translation	2015-04-10 01:24:58 +02:00
Legolasindar	65b3566d41	Update stringtable.xml ... fixed spanish terms.	2015-04-10 01:24:37 +02:00
Legolasindar	b8b151e62e	Update stringtable.xml ... added spanish terms	2015-04-10 01:20:39 +02:00
VyMajoris	f0a97bd855	Added - Portuguese translation to Attach Failed	2015-04-09 20:20:08 -03:00
Clon1998	d7bdb48547	Update stringtable.xml	2015-04-10 01:15:20 +02:00
Legolasindar	df31442599	Update stringtable.xml ... added spanish terms	2015-04-10 01:13:33 +02:00
Legolasindar	dc44b73a36	Update stringtable.xml ... updated spanish terms	2015-04-10 01:12:31 +02:00
licht-im-Norden87	852f939430	whoops	2015-04-10 01:00:35 +02:00
Legolasindar	ed87e53c80	Update stringtable.xml ... Updated spanish terms.	2015-04-10 00:48:51 +02:00
licht-im-Norden87	620d458cab	Update stringtable.xml	2015-04-10 00:45:37 +02:00
licht-im-Norden87	7221042d7c	Update stringtable.xml	2015-04-10 00:43:30 +02:00
licht-im-Norden87	7e78a7de18	Reload	2015-04-10 00:41:39 +02:00
licht-im-Norden87	fb5189be9a	Overheating	2015-04-10 00:38:51 +02:00
Legolasindar	cef9a6454a	Update stringtable.xml ... Updated spanish terms, on moved english to first raws.	2015-04-10 00:38:24 +02:00
licht-im-Norden87	88336753d0	optionsmenu	2015-04-10 00:36:41 +02:00
jaynus	1eadcade72	Linear work javelin.	2015-04-09 15:34:42 -07:00
licht-im-Norden87	c18f7cafa6	Update stringtable.xml	2015-04-10 00:34:04 +02:00
licht-im-Norden87	03aa01c354	Update stringtable.xml	2015-04-10 00:31:52 +02:00
licht-im-Norden87	fbe214db74	Not yet completed	2015-04-10 00:29:45 +02:00
licht-im-Norden87	9cca9dbd80	Update stringtable.xml	2015-04-10 00:23:49 +02:00
licht-im-Norden87	6323a85f17	Update stringtable.xml ... <English>Field Dressing</English> <German>Notverband</German> I dont know if a Notverband is the same as a Field Dressing.	2015-04-10 00:23:20 +02:00
PabstMirror	c511431e61	Fix encoding problem ... Not sure why, but it was decoding the \a's: Warning: z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM '\zceddons\mainbout.sqf';-NOGIT	2015-04-09 17:17:33 -05:00
Legolasindar	1dcbebc04c	Update stringtable.xml ... Updated spanish terms	2015-04-10 00:10:47 +02:00
Felix Wiegand	309eb7b3bf	Merge pull request #399 from licht-im-Norden87/patch-1 ... Stringtable: German additions	2015-04-10 00:06:43 +02:00
Legolasindar	7b4d62c46c	Update stringtable.xml ... Fixed spanish terms	2015-04-10 00:05:47 +02:00
licht-im-Norden87	4522b45939	Update stringtable.xml	2015-04-10 00:03:46 +02:00
licht-im-Norden87	7f54ec34b6	Update stringtable.xml	2015-04-09 23:53:15 +02:00
licht-im-Norden87	1dc56cb1af	Update stringtable.xml	2015-04-09 23:48:58 +02:00
licht-im-Norden87	7994441968	Update stringtable.xml	2015-04-09 23:48:21 +02:00
licht-im-Norden87	7d71d360b0	Update stringtable.xml ... Not quite convinced by my translation ... Flummi you better have a look	2015-04-09 23:45:33 +02:00
licht-im-Norden87	2373e78245	Update stringtable.xml	2015-04-09 23:43:58 +02:00
licht-im-Norden87	828e19a268	Update stringtable.xml	2015-04-09 23:42:45 +02:00
licht-im-Norden87	2097a5f213	Update stringtable.xml	2015-04-09 23:42:15 +02:00
licht-im-Norden87	0986eb427d	Update stringtable.xml	2015-04-09 23:41:10 +02:00
licht-im-Norden87	2304b46e2f	Update stringtable.xml	2015-04-09 23:39:48 +02:00
licht-im-Norden87	a6f8e05cb8	Update stringtable.xml	2015-04-09 23:37:26 +02:00
licht-im-Norden87	ecf5eef638	Update stringtable.xml	2015-04-09 23:36:21 +02:00
licht-im-Norden87	3c4656522f	Stringtable: German additions	2015-04-09 23:33:36 +02:00
licht-im-Norden87	00c37e0b9d	Update stringtable.xml	2015-04-09 23:12:00 +02:00
jaynus	8fe11c36ee	Linear altitude comparison.	2015-04-09 14:11:15 -07:00
licht-im-Norden87	2c7df9da6a	Stringtable: German additions	2015-04-09 23:02:28 +02:00
Glowbal	84c8e02328	Merge pull request #396 from KoffeinFlummi/medicalCleanup ... Medical cleanup	2015-04-09 22:13:31 +02:00
jaynus	198d4f3540	Fixed private variable overrides and timing failure.	2015-04-09 13:03:28 -07:00
PabstMirror	253614d442	Explosives: cancel placement when opening interact ... "zoomtemp" doesn't work for me, so this gives an additional way to cancel. It was also possible to start planting multiple explosives. made a small change to make QGVAR(PlantingExplosive) always reset	2015-04-09 14:48:27 -05:00
jaynus	01535c7f5c	Merge remote-tracking branch 'origin/master' into allTheMissiles ... Conflicts: addons/wep_javelin/config.cpp	2015-04-09 12:41:09 -07:00
Glowbal	d94943a9ff	getting hitpoint damage on non existing hitpoint returns type instead of bool	2015-04-09 21:38:35 +02:00
Glowbal	093d340ee7	Changed: Dragging/carrying now works for units with broken legs ... Added unload and load of unconscious units	2015-04-09 21:23:10 +02:00
ulteq	ab238cf404	Removed isDedicated checks	2015-04-09 20:39:38 +02:00
ulteq	5ff54f7d1c	Implemented a new logic that decides when to use AB. ... *Added a new global variable ace_advanced_ballistics_enabled *Added an updateTrajectoryPFH to the winddeflection (WD) module *WD is now automatically disabled when AB is enabled *The new updateTrajectoryPFH is called whenever AB aborts -> Wind deflection is now always present (either through AB or WD) -> AB no longer runs for non local units (unless they use high power optics)	2015-04-09 20:27:10 +02:00
Glowbal	0926397ab4	Removed deadcode and obvious comments	2015-04-09 20:13:46 +02:00
Glowbal	39cbf21278	Removed deprecated carry functions	2015-04-09 20:12:30 +02:00
commy2	a6a19e956b	flashsupressors for new weapons, #264	2015-04-09 19:59:08 +02:00
ulteq	5fe483cf33	Fixed incorrect function call	2015-04-09 19:12:39 +02:00
ulteq	377390d282	Added missing braces	2015-04-09 19:12:10 +02:00
jaynus	fe147c4986	Config expansion.	2015-04-09 09:39:23 -07:00
commy2	2d265ec6c2	prevent ai fro being stuck, #290	2015-04-09 16:54:50 +02:00
commy2	b41c6280ba	prvent falling ai from being stcuk, fix #290	2015-04-09 16:52:59 +02:00
commy2	147fcdfa0c	Merge pull request #392 from KoffeinFlummi/requiredaddons ... sorting out required addons for modularity	2015-04-09 16:37:47 +02:00
esteldunedain	f0cc0941e5	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-09 10:05:38 -03:00
esteldunedain	8519bb04b7	Merge remote-tracking branch 'origin/removeRecoil' ... Conflicts: addons/recoil/config.cpp	2015-04-09 10:05:14 -03:00
Nicolás Badano	c57044fd4a	Merge pull request #390 from KoffeinFlummi/betterMapColors ... Improve map colors by taking them from A2	2015-04-09 09:52:06 -03:00
esteldunedain	6447b39d1a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/scopes/XEH_postInit.sqf	2015-04-09 09:32:58 -03:00
esteldunedain	34639c153c	Allow holding scope adjustment keys	2015-04-09 09:31:18 -03:00
KoffeinFlummi	3a871eed58	Merge branch 'master' into tools-cleanup	2015-04-09 13:37:19 +02:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
esteldunedain	99aa439561	Improve map colors taking them from A2	2015-04-09 01:28:36 -03:00
jaynus	bbfd28586b	Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers.	2015-04-08 19:51:21 -07:00
PabstMirror	2033676e81	another undef to Make PBO-Project Happy	2015-04-08 18:20:00 -05:00
jaynus	5a9a8d239c	Remove test parameters, timing correct. Attack profile selection working.	2015-04-08 15:52:58 -07:00
jaynus	0a1aae8553	Work save, timing correction.	2015-04-08 15:41:26 -07:00
jaynus	97230c2252	compensate for FPS lag.	2015-04-08 15:34:59 -07:00
jaynus	c89df1b04f	Dir arc created.	2015-04-08 14:51:19 -07:00
jaynus	97febd6207	Disable debug, wtf math	2015-04-08 14:31:44 -07:00
ulteq	6626379a25	Added new 1.42 config data	2015-04-08 23:07:26 +02:00
jaynus	04b0efb22b	Safer calling, build out attack profiles.	2015-04-08 13:57:08 -07:00
jaynus	cf876116a9	Working configuration based guidance framework.	2015-04-08 13:45:43 -07:00
commy2	3e3390750d	manual merge	2015-04-08 22:01:41 +02:00
commy2	c5b38c8942	manual merge	2015-04-08 21:51:42 +02:00
commy2	1ae69d56ff	Merge pull request #377 from KoffeinFlummi/142light ... 142 directional light for map effects	2015-04-08 21:46:48 +02:00
commy2	7346c194f4	Merge pull request #306 from KoffeinFlummi/optics ... Taosenai's Animated Optics req 1.42	2015-04-08 21:41:12 +02:00
PabstMirror	c3564ee883	undef to Make PBO-Project Happy	2015-04-08 14:38:29 -05:00
jaynus	6f9203262a	tweak default deflection values for testing	2015-04-08 12:32:33 -07:00
Glowbal	3702679ee4	fixed wrong value for radio disabled on waking up	2015-04-08 21:31:59 +02:00
ulteq	b5b15ba591	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics	2015-04-08 21:29:17 +02:00
ulteq	09cfddc338	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-08 21:28:50 +02:00
ulteq	a6e3d1917d	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500	2015-04-08 21:28:17 +02:00
jaynus	d2e3ea347a	Merge remote-tracking branch 'origin/master' into allTheMissiles	2015-04-08 12:17:46 -07:00
PabstMirror	a4af1fcb30	Fix Marker Placement on UAV Map	2015-04-08 13:55:29 -05:00
jaynus	3946ee32d2	Fixes left/right issue.	2015-04-08 11:27:30 -07:00
commy2	3de3432664	Merge pull request #271 from KoffeinFlummi/142resting ... 1.42 - Remove scripted weapon resting	2015-04-08 20:26:13 +02:00
PabstMirror	2bc0976979	Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy ... Revert "Revert "1.42 - cursor mode when bipod deployed""	2015-04-08 13:26:05 -05:00
PabstMirror	023a2d2202	Merge pull request #267 from KoffeinFlummi/142Markers ... 1.42 Marker Placement	2015-04-08 13:24:55 -05:00
PabstMirror	176a39e86c	Merge pull request #265 from KoffeinFlummi/142InventoryConfig ... 1.42 Inventory Config	2015-04-08 13:22:12 -05:00
PabstMirror	007e4fc234	Merge pull request #274 from KoffeinFlummi/142requiredaddons ... 1.42 ensure ace is loaded after marksmen configs	2015-04-08 13:21:33 -05:00
jaynus	bc7943d729	added todo	2015-04-08 09:18:11 -07:00
jaynus	87dac2c2ad	Merge remote-tracking branch 'origin/master' into allTheMissiles	2015-04-08 08:55:14 -07:00
jaynus	177be598d7	Fixes: Laser designator now uses strongest ray result.	2015-04-08 08:48:08 -07:00
jaynus	64724737cd	Code passing cleanup.	2015-04-08 08:35:24 -07:00
PabstMirror	af3d6a5113	#386 - Ace Options Menu on main menu ... Same limitations as CBA controls, needs a intro or mission loaded Doesn't work with -skipintro command line.	2015-04-08 10:33:12 -05:00
jaynus	61f5324d29	ACE_Settings entry for guidance.	2015-04-08 08:19:19 -07:00
jaynus	104dd2258e	Guidance framework working.	2015-04-08 08:01:39 -07:00
ulteq	c1c5711e8d	Fixed a typo	2015-04-08 13:58:22 +02:00
commy2	623ab02a12	fix falling over static weapons	2015-04-08 13:06:06 +02:00
ulteq	823d834457	Replaced EGVAR(advanced_ballistics,Altitude) with EGVAR(weather,Altitude)	2015-04-08 12:56:34 +02:00
ulteq	e3626eca00	The winddeflection firedEH will now exit automatically, when the advanced_ballistics module is present.	2015-04-08 12:42:56 +02:00
ulteq	6d46567696	Overworked ATragMX canShow function	2015-04-08 11:44:09 +02:00
ulteq	f107b700a7	Fixed Kestrel4500 self interaction menu conditions	2015-04-08 11:26:12 +02:00
ulteq	f974e7a9a1	Removed duplicate Kestrel4500_ prefix	2015-04-08 11:25:15 +02:00
ulteq	9f2a862489	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500	2015-04-08 11:10:02 +02:00
ulteq	16ac43f733	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-08 11:08:53 +02:00
ulteq	78bb9193be	Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX ... Conflicts: addons/atragmx/RscTitles.hpp addons/atragmx/functions/fnc_calculate_solution.sqf addons/atragmx/functions/fnc_calculate_target_range_assist.sqf addons/atragmx/functions/fnc_target_speed_assist_timer.sqf	2015-04-08 11:08:28 +02:00
ulteq	15a594ccbc	Removed duplicate ATragMX_ prefix	2015-04-08 11:05:28 +02:00
ulteq	4a469de0f8	Deleted an unused function	2015-04-08 11:01:53 +02:00
commy2	01a9374a26	Merge pull request #382 from KoffeinFlummi/disablebs ... disable cursor showing map position	2015-04-08 10:48:31 +02:00
commy2	deece11689	remove debug	2015-04-08 10:47:56 +02:00
commy2	a47cdb9738	disable map cursor coordinates in mp	2015-04-08 10:45:57 +02:00
KoffeinFlummi	a209e49f1c	Remove partname from patientInfoDisplay for basic.	2015-04-08 07:39:16 +02:00
KoffeinFlummi	1dcff94ec7	Remove hitpart from bandage action name ... Since the context of the interaction menu makes it clear what body part you mean anyways, this is unnecessary.	2015-04-08 07:35:31 +02:00
KoffeinFlummi	5bd1ee7ecd	Do not use a treshold for unassigned damage.	2015-04-08 07:21:34 +02:00
esteldunedain	b18bcf8835	Add option to turn on/off cursor coordinates	2015-04-08 01:49:56 -03:00
PabstMirror	03dbe8e6c5	Make it optional	2015-04-07 22:57:58 -05:00
PabstMirror	ce70c72cd6	wip1	2015-04-07 22:44:41 -05:00
PabstMirror	eaeda54f8c	Remove Dialog Check so it works inside veh	2015-04-07 19:41:48 -05:00
PabstMirror	656fa8868a	Module Icons	2015-04-07 19:37:46 -05:00
PabstMirror	71d609f8e0	Private Variables	2015-04-07 19:30:07 -05:00
PabstMirror	65d61ad1e3	opps	2015-04-07 19:22:33 -05:00
PabstMirror	b9341033d7	Rangetable for vanilla ballistics	2015-04-07 19:19:08 -05:00
commy2	691ab012b4	fix map loaded on preInit	2015-04-08 00:44:14 +02:00
commy2	4834facccf	moving it to map	2015-04-08 00:30:36 +02:00
KoffeinFlummi	ce45237989	Report full version number in RPT for debugging	2015-04-08 00:27:00 +02:00
commy2	50dbbda8eb	disable cursor showing map position	2015-04-08 00:20:43 +02:00
esteldunedain	ed3ac637d2	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-07 19:19:46 -03:00
PabstMirror	2f4335d3c2	#344 - Ignore missing ace_serverconfig on client	2015-04-07 17:14:27 -05:00
commy2	949c5d4333	manual merge	2015-04-07 23:26:16 +02:00
commy2	518c704db6	manual merge	2015-04-07 23:18:31 +02:00
esteldunedain	2d211e839f	Further remove standalone { on code	2015-04-07 18:09:32 -03:00
commy2	2e66e57535	manual merge	2015-04-07 23:08:17 +02:00
esteldunedain	24750781aa	Remove { on newlines	2015-04-07 18:03:30 -03:00
commy2	d1b8595c0e	light intensity from object: handle campfires	2015-04-07 23:02:54 +02:00
ulteq	5dba9f7b3f	Fixed inconsistent tabulation	2015-04-07 22:53:20 +02:00
PabstMirror	d060b13bbe	#86 - Stretch gps info box to support 8 digits	2015-04-07 15:47:12 -05:00
ulteq	31b19a4ef3	Replaced tabs with spaces	2015-04-07 22:44:26 +02:00
ulteq	45e7194117	Fixed Readme	2015-04-07 22:40:27 +02:00
ulteq	4ea91d832e	Fixed incorrect canShow function	2015-04-07 22:37:47 +02:00
commy2	b6c278e7d3	fix using efunc vs func	2015-04-07 22:33:35 +02:00
ulteq	07e6c89267	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-07 22:27:13 +02:00
ulteq	c3fbd8a195	Removed the old Kestrel module	2015-04-07 22:22:41 +02:00
commy2	96268b6407	directional light for map effects	2015-04-07 22:19:03 +02:00
ulteq	b60a8f2547	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics	2015-04-07 22:13:20 +02:00
ulteq	183034183e	Resolved a minor issue between protractor and wind info	2015-04-07 22:02:38 +02:00
PabstMirror	6b0fb84f65	Cleanup / Headers	2015-04-07 15:01:44 -05:00
jaynus	bf70a9ba77	Tracers and colors	2015-04-07 12:59:35 -07:00
ulteq	ef3205e078	Replaced all <floats> with <NUMBER>	2015-04-07 21:54:29 +02:00
ulteq	c9ad2b279d	Commented all advanced ballistics functions	2015-04-07 21:46:43 +02:00
jaynus	fa9cf0280c	script error	2015-04-07 12:44:15 -07:00
commy2	88a5519465	cache the frames	2015-04-07 21:42:08 +02:00
PabstMirror	2ad9193475	Use DrawIcon for map tools	2015-04-07 14:38:35 -05:00
jaynus	d3d5554c49	Laser designation information localized to vehicle.	2015-04-07 12:35:34 -07:00
ulteq	a8cbcb14d3	Replaced tabs with spaces	2015-04-07 21:27:04 +02:00
ulteq	650c9592c8	Updated the readme	2015-04-07 21:24:09 +02:00
ulteq	26c8f9588a	AdvancedBallistics is now always using the dll extension	2015-04-07 21:22:58 +02:00
commy2	14718eb5b4	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-07 21:22:21 +02:00
commy2	d825505aa0	cache light config properties	2015-04-07 21:22:00 +02:00
jaynus	0c3b51c28b	Merge remote-tracking branch 'origin/master' into allTheMissiles	2015-04-07 12:12:05 -07:00
jaynus	2ea7ecdbf7	Working save.	2015-04-07 12:11:28 -07:00
Glowbal	14906c68c0	Merge pull request #374 from KoffeinFlummi/medicalImprovements ... Medical improvements	2015-04-07 21:07:28 +02:00
Glowbal	ffbe9f0c71	Setting for getting rid of hitpoint damage after adv medical damage	2015-04-07 21:06:48 +02:00
ulteq	2a458f2e3d	Removed Altitude and Latitude negation	2015-04-07 21:03:17 +02:00
ulteq	9fb640195a	Removed weather hack	2015-04-07 21:02:57 +02:00
ulteq	b5b962bd4a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration	2015-04-07 20:59:37 +02:00
ulteq	5443d46f7b	Default Altitude and Latitude are now read from the config	2015-04-07 20:59:05 +02:00
commy2	ba618a69ec	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-07 20:54:45 +02:00
commy2	722c2af4dc	lightIntensity, handle soldier flashlights	2015-04-07 20:54:25 +02:00
Glowbal	c823826f17	Merge branch 'master' into medicalImprovements	2015-04-07 20:53:24 +02:00
ulteq	ab5518c35d	Fixed a typo	2015-04-07 20:53:14 +02:00
Glowbal	2b341c2a8b	left over CSE function calls removed	2015-04-07 20:50:44 +02:00
Glowbal	545014b073	missing return value	2015-04-07 20:47:36 +02:00
ulteq	2dfc9d7919	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX	2015-04-07 20:33:44 +02:00
ulteq	71886b7266	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500	2015-04-07 20:31:34 +02:00
ulteq	0a7552d46f	Removed unnecessary canInteractWith check	2015-04-07 20:21:16 +02:00
ulteq	c94c1c1bcb	Replaced tabs with spaces	2015-04-07 20:19:35 +02:00
Glowbal	ac3bda3135	improvements to displayPatientInformation. Bandaged wounds should be more clear now	2015-04-07 20:19:32 +02:00
ulteq	f6a9a007cc	Fixed the readme	2015-04-07 20:11:50 +02:00
ulteq	a4e22986e0	Integrated the ATragMX into the ace interaction menu	2015-04-07 20:09:25 +02:00
esteldunedain	04d94bb7be	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-07 15:01:53 -03:00
esteldunedain	765ae4ee64	Merge branch 'master' into tabCleanup ... Conflicts: addons/explosives/functions/fnc_addClacker.sqf addons/explosives/functions/fnc_detonateExplosive.sqf addons/explosives/functions/fnc_getPlacedExplosives.sqf addons/explosives/functions/fnc_openDetonateUI.sqf addons/explosives/functions/fnc_openPlaceUI.sqf addons/explosives/functions/fnc_openTransmitterUI.sqf addons/explosives/functions/fnc_openTriggerSelectionUI.sqf addons/explosives/functions/fnc_placeExplosive.sqf addons/explosives/functions/fnc_place_Approve.sqf addons/explosives/functions/fnc_setPosition.sqf	2015-04-07 15:00:56 -03:00
ulteq	a4c70fe616	Integrated the Kestrel 4500 into the ace interaction menu	2015-04-07 19:57:42 +02:00
Glowbal	526e24f133	formatting	2015-04-07 19:56:54 +02:00
Glowbal	3d82cb8eac	Removed deprecated onTreatmentCompleted event	2015-04-07 19:54:24 +02:00
commy2	d34cfdb003	fix: day laser when being captured	2015-04-07 19:38:19 +02:00
ulteq	9fb26c2d18	Enabled the weather module	2015-04-07 19:21:07 +02:00
ulteq	f73bdfa148	Fixed several syntax errors in fnc_buttonPressed.sqf	2015-04-07 19:20:38 +02:00
Glowbal	7fb3ac6740	Added _x_ca suffixes to all item pictures	2015-04-07 19:16:56 +02:00
commy2	98f7125171	function to return light intensity recieved from another object	2015-04-07 18:54:53 +02:00
jaynus	6deff125ce	Self designation lockdown and cleanup	2015-04-07 09:05:19 -07:00
ulteq	b62827c050	Added comments to all functions	2015-04-07 17:58:54 +02:00
jaynus	f973505746	DAGR and Hellfire modified config values.	2015-04-07 08:53:47 -07:00
ulteq	7d42eeed28	Fixed incorrect icon path	2015-04-07 17:45:52 +02:00
ulteq	0315219cf2	Added new Kestrel4500 branch: ... *TODO: Fix the dialog button actions (action="...") in RscTitles.hpp	2015-04-07 17:43:54 +02:00
commy2	deabbcd840	add function that returns config properties of a vehicles light	2015-04-07 15:43:23 +02:00
commy2	5df25cf44d	function to return all turned on lights of any objects	2015-04-07 15:06:27 +02:00
commy2	0d126dc562	function to return object's lights	2015-04-07 14:44:34 +02:00
commy2	bb8762f4b9	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-07 13:55:09 +02:00
commy2	ad5aad60c7	fix: ambient brightness can return values greater 1	2015-04-07 13:54:33 +02:00
Pierre Humberdroz (meat)	4c49765c8f	translation changes ... #370	2015-04-07 10:39:41 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
bux578	9ce2e38814	removed <orignal> language entry	2015-04-07 09:27:26 +02:00
KoffeinFlummi	8d5bdd2c01	Revert "fix shitty initSpeed definitions breaking SD mags, fix #182" ... This reverts commit 55f49eaa1c.	2015-04-07 09:04:17 +02:00
jaynus	9aa84322c7	Magazine, Ammo and Missile breakout.	2015-04-06 23:15:26 -07:00
jaynus	2d019abede	WIP Guidance rewrites.	2015-04-06 22:38:34 -07:00
jaynus	99008ac729	Merge pull request #332 from KoffeinFlummi/medicalBox ... Added: Generic placeholder medical box.	2015-04-06 19:09:16 -07:00
jaynus	eb6fdc2e34	cleaner LOAL DAGR	2015-04-06 19:03:11 -07:00
jaynus	a744896b20	Fixed: jaynus fucked up.	2015-04-06 18:51:08 -07:00
jaynus	34444ebb32	Fixed: github merge error fixed.	2015-04-06 18:37:05 -07:00
jaynus	27caff5564	Fixed: Add platform velocity to FCS calculations; resolves #361	2015-04-06 18:36:39 -07:00
Glowbal	12493f8595	Improved wounds configuration (missing maxDamage values added)	2015-04-07 00:57:05 +02:00
Glowbal	c7549a13a4	Improved pain reduction	2015-04-07 00:41:53 +02:00
jaynus	446a30e4fc	Merge pull request #352 from KoffeinFlummi/comancheFixes ... Goes along with FCS fixes, merging quickly due to overall fixes.	2015-04-06 15:07:09 -07:00
jaynus	4a8f24b59c	Merge pull request #356 from KoffeinFlummi/fcsMadness ... Fcs madness	2015-04-06 15:00:24 -07:00
jaynus	e0605f9e81	Remove default hint for FCS but play sound, Resolves #317	2015-04-06 14:57:07 -07:00
jaynus	7fa8365d51	Remove debug, new Release build of extension.	2015-04-06 14:50:22 -07:00
esteldunedain	09461d94ef	Rewritten changeProjectileDirection	2015-04-06 18:10:17 -03:00
ulteq	26186e1ea4	Removed model = "";	2015-04-06 23:02:36 +02:00
esteldunedain	aec9962121	Fix changeProjectileDirection	2015-04-06 18:02:08 -03:00
ulteq	19cb19ab27	Finished merging ATragMX ... *TODO: Replace EGVAR(advanced_ballistics,AdvancedBallistics) *TODO: Replace EGVAR(advanced_ballistics,AdvancedAirDragEnabled)	2015-04-06 22:56:14 +02:00
esteldunedain	35129a7a41	Debug stuff for the velocity correction	2015-04-06 17:37:18 -03:00
Garth L-H de Wet	513ab25f54	Merge branch 'master' into explosiveInteraction ... Conflicts: addons/explosives/functions/fnc_placeExplosive.sqf	2015-04-06 22:30:27 +02:00
Garth L-H de Wet	9d7d71b1b1	Changed the tabs to 4 spaces. Hopefully.	2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet	e0b4efd9f1	Merge pull request #280 from KoffeinFlummi/explosiveInteraction ... Explosive interaction	2015-04-06 22:12:04 +02:00
ulteq	ec846b24f2	The ATragMX GUI (ctrlShow) relies on using execVM instead of call	2015-04-06 22:11:06 +02:00
Garth L-H de Wet	44c597f7c5	Explosives, 2 spaces to 4 space tab.	2015-04-06 22:10:00 +02:00
jaynus	acf683e621	Call every 10th of a second.	2015-04-06 12:58:53 -07:00
jaynus	906612f954	Fixed: Gunner FOV, explosive rounds and FPS drop.	2015-04-06 12:54:06 -07:00
ulteq	91be37c6f3	Replaced all execVM occurrences	2015-04-06 21:41:07 +02:00
esteldunedain	04e9f28734	Make function handle negative numbers	2015-04-06 16:12:38 -03:00
ulteq	cab8603db6	Fixed several typos	2015-04-06 21:11:02 +02:00
commy2	c1799616c7	add function to convert numbers to string	2015-04-06 20:47:11 +02:00
ulteq	6578ff4559	*Replaced call compile preprocessFile with FUNC macro ... *Removed some unused files *Fixed incorrect .paa filepath *Fixed incorrect profileNamespace access	2015-04-06 20:46:33 +02:00
jaynus	d6cf07a3b6	Changed: FCS update was not being delayed for laser. Delay of 0.5s added.	2015-04-06 11:44:17 -07:00
Glowbal	bdb5c8e728	Merge pull request #349 from KoffeinFlummi/medicalBugFixes ... Exit displayPatientInformation PFH when a different selection is selected.	2015-04-06 19:49:12 +02:00
Glowbal	4c6dad69f9	Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error)	2015-04-06 19:43:27 +02:00
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
jaynus	bdcec243a8	Changed: Comanche Gatling HEDP effects and dispersion.	2015-04-06 09:14:56 -07:00
PabstMirror	c1abb2669d	#340 - Fix stringtables	2015-04-06 11:03:04 -05:00
jaynus	c3dbcf1351	increase frequency of laser update.	2015-04-06 07:40:20 -07:00
commy2	796a430292	Merge pull request #326 from KoffeinFlummi/VectorFOSfix ... Fix for Vector Fall-of-Shot display	2015-04-06 16:20:13 +02:00
commy2	1e497c228c	switch sides of add/drop left/right	2015-04-06 16:18:59 +02:00
Glowbal	1c28e82725	Merge pull request #341 from KoffeinFlummi/medicalFixes ... Fixes for bodybag and support for radio mods in medical	2015-04-06 16:17:08 +02:00
commy2	ebd1e555a3	fix: derp when switching control numbers	2015-04-06 16:07:52 +02:00
ulteq	1320176c12	Initial merge of the ATragMX - Ballistics calculator WIP)	2015-04-06 15:51:59 +02:00
Glowbal	76ad6b8294	Added missing main actions	2015-04-06 15:46:50 +02:00
Glowbal	ce4cdd3722	staged bodybag fixes	2015-04-06 15:11:54 +02:00
Glowbal	661d93e82c	Working commit	2015-04-06 14:51:17 +02:00
Glowbal	8e176eff55	Fixed treatment locations	2015-04-06 14:32:37 +02:00
Glowbal	43b3190202	config fix	2015-04-06 14:14:00 +02:00
Glowbal	10a1108aae	Added support for customizable treatment location limitation	2015-04-06 14:11:10 +02:00
Glowbal	2657677bd8	Added support for TFR/ACRE on unconscious	2015-04-06 14:09:59 +02:00
esteldunedain	be81e16c71	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-06 09:07:20 -03:00
esteldunedain	4cf2410622	Fix duplicated laser designator actions	2015-04-06 09:06:56 -03:00
Glowbal	0bcb7f76dc	This should not be here	2015-04-06 13:12:40 +02:00
Glowbal	83c670576b	fixed typeOf instead of typeName	2015-04-06 11:58:52 +02:00
PabstMirror	d295ee6980	Localization / Headers	2015-04-06 01:05:28 -05:00
esteldunedain	52918557f2	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into abIntegration	2015-04-06 00:30:29 -03:00
esteldunedain	5a0faf720f	EFUNC(advanced_ballistics,calculateWindSpeed)	2015-04-06 00:27:33 -03:00
esteldunedain	7a1e905c79	Move Latitude and Altitude parameters to weather	2015-04-06 00:19:48 -03:00
esteldunedain	c73aff03bd	displayWindInfo tab to space	2015-04-06 00:13:43 -03:00
esteldunedain	2d770eb355	Make wind in displayWindInfo dependant on wether AB is used or not	2015-04-06 00:12:50 -03:00
esteldunedain	caf52e8a2f	Move wind display resources to weather	2015-04-06 00:12:22 -03:00
esteldunedain	6f89233e12	Move wind info display to weather	2015-04-06 00:02:34 -03:00
esteldunedain	33a87b0488	Reenable weather (disabled in 076c5abf88)	2015-04-05 23:56:24 -03:00
Glowbal	befb52e855	Merge pull request #260 from KoffeinFlummi/serverConfig ... Server Config support	2015-04-06 01:42:33 +02:00
esteldunedain	038c871356	Make overheating use bullet mass in grains introduced by ab	2015-04-05 20:11:42 -03:00
PabstMirror	2ada87e3ac	Rangetable Item	2015-04-05 18:05:23 -05:00
esteldunedain	100686d34a	Move ballistic data outside the advance_ballistics pbo, so: ... - it can be used by other pbos like overheating without it requiring ab. - the tweaks to airfriction are available to basic wind_deflection too if ab is not present.	2015-04-05 20:05:04 -03:00
PabstMirror	a8b000c159	Some Headers	2015-04-05 17:50:07 -05:00
PabstMirror	5c5b8f656e	Tweak Air to match known data	2015-04-05 17:37:11 -05:00
jaynus	c87f2f8bcc	Added: Generic placeholder medical box.	2015-04-05 15:16:32 -07:00
PabstMirror	c768ef65b2	Tweaking PowderEffects/AirRestitance	2015-04-05 17:07:55 -05:00
esteldunedain	b8c493a495	Merge branch 'master' into AdvancedBallistics	2015-04-05 19:05:12 -03:00
PabstMirror	3e77eb9737	Rangetable Builder and Prepcalc	2015-04-05 16:28:12 -05:00
jaynus	8fa6ab38fd	Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig	2015-04-05 14:08:54 -07:00
jaynus	d6632a0e45	Module should default to true.	2015-04-05 14:08:42 -07:00
PabstMirror	61a0ae1aec	Rangetable Dialog	2015-04-05 15:48:56 -05:00
jaynus	e3ad83e109	Merge pull request #286 from KoffeinFlummi/lasers ... Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS	2015-04-05 13:26:54 -07:00
VKing	8255ff666d	Fix long-standing typo (get it?)	2015-04-05 22:18:28 +02:00
VKing	8ad202b039	Fix Fall-of-Shot units being inverted	2015-04-05 22:16:47 +02:00
Glowbal	9e3bb8ac95	fixed triage card	2015-04-05 22:07:38 +02:00
PabstMirror	3d9da5f142	Make Mils Toogle Self Action	2015-04-05 15:00:59 -05:00
jaynus	7d5fca3c5a	DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works.	2015-04-05 12:55:17 -07:00
PabstMirror	34a86e0db3	Fix Heading Mils	2015-04-05 14:48:26 -05:00
Glowbal	12d10b8bf7	Blood loss for basic (from AGM medical)	2015-04-05 21:38:15 +02:00
PabstMirror	0281897a3d	Show Charge - Cleanup Settings	2015-04-05 14:34:39 -05:00
ulteq	93eaaeb8e2	Added new advanced_ballistics module	2015-04-05 21:08:55 +02:00
jaynus	788487baa5	Debug disable	2015-04-05 11:54:00 -07:00
jaynus	34b834e700	Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking.	2015-04-05 11:51:39 -07:00
Glowbal	147bb92541	Added setting to disable variable sync (recommended on)	2015-04-05 20:23:07 +02:00
Glowbal	7ffd690a71	Changed: IVs are now synced and medics can see a unit is receiving an IV	2015-04-05 20:11:54 +02:00
jaynus	278ffe7d65	save	2015-04-05 10:45:09 -07:00
Glowbal	89015c94d4	Removed rouge system chat and diag_log messages	2015-04-05 19:42:55 +02:00
PabstMirror	e71378f9b3	AirResit Module Setting / Charge Display ctrl	2015-04-05 12:40:48 -05:00
Glowbal	ae2adc17b9	changed all medical items to inherit from ACE_ItemCore	2015-04-05 19:37:07 +02:00
Glowbal	2c0bec2b07	disabled injury visualization for bandaged wounds	2015-04-05 19:36:40 +02:00
Glowbal	171ebf827a	No litter created when in vehicle	2015-04-05 19:28:57 +02:00
Glowbal	a0bbbdb0b7	fixed place in bodybag	2015-04-05 19:27:53 +02:00
Glowbal	f52891436a	oops	2015-04-05 19:27:40 +02:00
Glowbal	ecf84ae039	Updated module classname to be inline with others	2015-04-05 19:27:28 +02:00
Glowbal	0f52059249	Fixed CPR script error	2015-04-05 19:27:09 +02:00
Glowbal	dca75c5557	Implemented bandaged wounds setting (adv)	2015-04-05 19:26:33 +02:00
Glowbal	e3e17d8fcb	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-05 15:51:42 +02:00
Glowbal	c210efcef0	fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle.	2015-04-05 15:51:28 +02:00
Glowbal	c514fde5d3	Not necessary here. Makes it only work once.	2015-04-05 15:13:34 +02:00
Glowbal	bae3826bdf	Polished server config export	2015-04-05 14:48:23 +02:00
Glowbal	b6b880fba0	Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded ... Add medical actions while boarded.	2015-04-05 14:36:17 +02:00
Glowbal	92bdae9321	Removed diag_log spam	2015-04-05 13:25:53 +02:00
Glowbal	32625b446b	fixed animation being reset even when inside a vehicle	2015-04-05 13:03:09 +02:00
Glowbal	cf1f641424	Moved selfActions to a separate hpp file	2015-04-05 13:02:55 +02:00
Glowbal	f1a3d588ba	Changed initialization order of config settings. ... ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used. This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description	2015-04-05 12:38:10 +02:00
Glowbal	279641787d	Added checks for enforce usage only in SP with settings enabled	2015-04-05 11:11:54 +02:00
Glowbal	202904f1f9	Using 1 and 0 instead of true and false for config export	2015-04-05 10:32:40 +02:00
PabstMirror	1726b787f7	AirRestitance/Wind Effects	2015-04-05 03:02:24 -05:00
PabstMirror	518f2077fe	Disable ArtyComputer	2015-04-05 02:27:13 -05:00
PabstMirror	dab4822876	Settings / Module	2015-04-05 02:18:51 -05:00
PabstMirror	e6c7758d3f	Prototype - Show Mils on mk6	2015-04-05 01:57:24 -05:00
jaynus	6288a809f7	actually final terminal decent. woops.	2015-04-04 22:36:09 -07:00
Glowbal	d487092d84	formatting	2015-04-05 02:33:45 +02:00
Glowbal	110635df7b	improved formatting	2015-04-05 02:33:11 +02:00
Glowbal	a0af055917	export config should force the settings	2015-04-05 02:22:24 +02:00
Glowbal	7928ca71a5	Server side config export	2015-04-05 02:17:43 +02:00
jaynus	583acf6558	ctrlShow is not operational on ControlGroups in RscOptics.	2015-04-04 17:15:59 -07:00
jaynus	ab0d289762	Merge remote-tracking branch 'origin/master' into lasers	2015-04-04 16:56:03 -07:00
jaynus	aee7eb9406	Working save.	2015-04-04 16:55:53 -07:00
PabstMirror	75351f2a5b	TapShoulder - fix hint message	2015-04-04 17:54:15 -05:00
esteldunedain	f417fa2285	Add medical actions while boarded.	2015-04-04 19:41:12 -03:00
PabstMirror	e03d3ed619	Merge pull request #284 from KoffeinFlummi/beltRepacking ... MagRepack - Belt Repacking / Child Actions	2015-04-04 17:18:53 -05:00
esteldunedain	848b5133ef	Remove debug chats for interact_menu	2015-04-04 19:15:29 -03:00
Glowbal	044d2551ce	Merge branch 'master' into serverConfig	2015-04-04 23:00:47 +02:00
Glowbal	b18d704686	Merge pull request #300 from KoffeinFlummi/medicalImprovements ... Medical Litter & other additions	2015-04-04 22:52:05 +02:00
Glowbal	7f9043897c	wake up by epinephrine in revive state	2015-04-04 22:50:38 +02:00
Glowbal	551c36d690	fixed treatment didnt work inside vehicles	2015-04-04 22:48:52 +02:00
Glowbal	77d39877d2	Merge branch 'master' into medicalImprovements	2015-04-04 22:01:15 +02:00
Glowbal	a56e8745c3	fixed module settings	2015-04-04 21:59:18 +02:00
Glowbal	d37094dc7a	Work around for self treatment when cursorMenu from interact is used. ... Executing it one frame later works fine, but otherwise the loading bar will fail.	2015-04-04 21:52:00 +02:00
Glowbal	5c3ee0dd1a	Added settings to modules & fixed medicalVehicle module	2015-04-04 21:51:18 +02:00
PabstMirror	6ec0859f85	MicroDAGR - Allow use in vehicles ... Can't show minimap display in turret view (cameraView = "gunner"), but can bring up the interactive dialog	2015-04-04 14:35:24 -05:00
Glowbal	89ec817ce3	Added setting for litter cleanup delay	2015-04-04 21:26:41 +02:00
Glowbal	1d33ce52b3	added support for adjustable settings for consumeItem and medicalLevel	2015-04-04 21:20:24 +02:00
Glowbal	93d9088410	fixed cardiac arrest	2015-04-04 21:20:03 +02:00
Glowbal	e3aaac7005	Only select primary weapon if no current weapon is selected	2015-04-04 20:49:30 +02:00
Glowbal	a7edd00420	removed useless doAnimation call when animation is not "unconscious" in unconscious state	2015-04-04 20:41:49 +02:00
Glowbal	2b9afcbb6c	Now supports unconscious state fully	2015-04-04 20:37:25 +02:00
Nicolás Badano	5f4030469f	Merge pull request #309 from KoffeinFlummi/closeInteractMenu ... Close interact menu when knocked out	2015-04-04 15:35:00 -03:00
Glowbal	e78fc55b45	changed; When standing before treatment, the caller will now move into crouch instead of standing up again.	2015-04-04 20:21:52 +02:00
Glowbal	ddb01e7865	Improved unconscious wakeup animations	2015-04-04 20:21:06 +02:00
Glowbal	2420db78a1	CreateLitter now supports conditions and is selection specific. ... Format: litter[] = { {"SelectionName", "Condition", {"litterClassname"} }, ... }; The array with litter classnames also support 2d arrays. ie: {"SelectionName", "Condition", {{"litterClassname"}} } Of array entries it will select a random classname.	2015-04-04 20:20:29 +02:00
commy2	55d7c0f0e6	remove scripted recoil	2015-04-04 20:02:02 +02:00
commy2	8d0ee2d578	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 142resting	2015-04-04 19:56:43 +02:00
PabstMirror	efe810ae4e	Private Variables for localEvent	2015-04-04 12:08:59 -05:00
jaynus	9d06d7c7ca	readme/author updates.	2015-04-04 09:09:42 -07:00
Glowbal	08e1949078	Improved patient unconscious animation	2015-04-04 18:08:41 +02:00
Glowbal	31b7ade057	Support unconscious animation for patient upon treatment	2015-04-04 17:33:20 +02:00
esteldunedain	d090b3328c	- Close interact_menu when the player falls unconscious ... - Prevent all types of interactions while unconscious	2015-04-04 12:25:49 -03:00
Glowbal	48758ff0e3	fixed incorrect typeNames	2015-04-04 16:59:52 +02:00
Glowbal	b54179696a	fixed basic revive 2	2015-04-04 16:28:09 +02:00
Glowbal	18900cb82c	fixed revive for basic	2015-04-04 16:27:44 +02:00
Glowbal	3a117e9b4d	fixed incorrect unit used for fullheal (was healing caller)	2015-04-04 16:26:49 +02:00
commy2	e27c91710c	Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events." ... This reverts commit 6864529d9c.	2015-04-04 16:26:32 +02:00
commy2	1dea63067a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics	2015-04-04 16:14:19 +02:00
Nicolás Badano	b78b93f2cd	Merge pull request #303 from KoffeinFlummi/strongerTextShadow ... Stronger shadow for the interact_menu text	2015-04-04 10:25:27 -03:00
commy2	d496cabbbb	remove obsolete folder from TO_MERGE folder	2015-04-04 14:38:49 +02:00
commy2	a5b071912f	CfgPreloadtextures for optics	2015-04-04 13:15:27 +02:00
Glowbal	914c5ffd0f	fixed bandage optional parameter	2015-04-04 12:14:21 +02:00
Glowbal	7c296c413d	Litter has a more random spread	2015-04-04 12:13:55 +02:00
Glowbal	d81dcba543	Added more litter variants	2015-04-04 12:13:42 +02:00
commy2	b7fa2bd8b3	disable pip scopes in arsenal	2015-04-04 12:06:20 +02:00
commy2	5fdd93587c	localization	2015-04-04 09:16:41 +02:00
commy2	ea275b1e52	2d with and without PIP	2015-04-04 08:51:22 +02:00
PabstMirror	c055911231	Cleanup, remove debug spam	2015-04-04 00:52:21 -05:00
PabstMirror	9f60bf9906	Merge branch 'master' into disarmingTest	2015-04-04 00:09:36 -05:00
esteldunedain	a658cafb4e	Remove line breaks from actions	2015-04-04 01:45:03 -03:00
esteldunedain	7617908ad3	Make menu open linearly to the right of the action point	2015-04-04 01:44:49 -03:00
commy2	98d217d97e	handle 2d optics recoil	2015-04-04 06:19:19 +02:00
jaynus	2e6a9c4967	Placeholder sounds for jav/titan locking. accurate fire tweaks	2015-04-03 21:07:04 -07:00
esteldunedain	06f6039dca	Stronger shadow for the interact_menu text	2015-04-04 01:04:32 -03:00
PabstMirror	6cd7ab2f7d	Fix getChildren - condition/only show inv mags	2015-04-03 22:37:48 -05:00
jaynus	8710bee3b8	Titan Work.	2015-04-03 20:27:52 -07:00
esteldunedain	99a90bf539	Remove ace_recoil (#271)	2015-04-04 00:25:44 -03:00
jaynus	583347aaab	tab cleanup, javelin work.	2015-04-03 17:28:33 -07:00
Glowbal	2645b102f0	Replaced waitAndExec for single PFH with 30s delay	2015-04-04 02:28:14 +02:00
PabstMirror	07dfe52133	Remove Duplicate Mortar Code (inherit from statics) ... Before an action added to staticWeapon wouldn't be applied to mk6 mortar	2015-04-03 19:07:13 -05:00
esteldunedain	a5ff34e1d8	Keep cursored menus always centered. Fix #299.	2015-04-03 20:49:40 -03:00
Glowbal	83fbc1ff10	Added setting to toggle litter creation on/off	2015-04-04 01:47:56 +02:00
jaynus	65388e1146	Added: Image Assets ... Added: ACE_AIR_SAFETY weapon for all aircraft Changed: ACE'ified Kimi code	2015-04-03 16:46:37 -07:00
Glowbal	7f45d25ee5	Added litter for medical treatment	2015-04-04 01:42:13 +02:00
jaynus	1672a5f2f9	Added: Comanche HUD revamped+stabalized, awesomeness activated.	2015-04-03 16:17:26 -07:00
PabstMirror	824448833f	Basic Test Mission ... Very simple test mission with creates, debug console enabled for all.	2015-04-03 18:14:45 -05:00
Glowbal	4ac77bceab	Model fixes and imports	2015-04-04 01:09:44 +02:00
Nou	fff8a240e3	Remove compensation for movement, instead use modelToWorldVisual	2015-04-03 15:31:44 -07:00
Glowbal	5e0f5b8b94	Added full heal/PAK for basic	2015-04-04 00:31:12 +02:00
Glowbal	7230687ea2	corrected revive setting classes	2015-04-04 00:30:59 +02:00
Nou	6541600d44	Switch everything to use modelToWorldVisual instead of modelToWorld.	2015-04-03 15:26:27 -07:00
Glowbal	d3c9d111e1	fullHeal now resets reviveState	2015-04-03 23:58:46 +02:00
Glowbal	4ddb496d8b	Added max Revive lives	2015-04-03 23:56:32 +02:00
Nou	6c4dda2dc8	Use visual versions.	2015-04-03 14:40:01 -07:00
jaynus	735384cdb4	stabalize a little more and do some debug drawing.	2015-04-03 14:28:12 -07:00
esteldunedain	bd813d0d7a	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-04-03 18:22:47 -03:00
esteldunedain	2b4d806925	Reduce or eliminate backblast cause by terrain depending on relative slope. Fix #294	2015-04-03 18:22:04 -03:00
Glowbal	36288fce43	Updated medical action config. ... Added bodybag action Added Tourniquet action to basic. Added more displayNameProgress entries. Removed deadcode	2015-04-03 22:59:28 +02:00
Glowbal	a6ce961ca1	Usage of isBeingCarried and isBeingDragged	2015-04-03 22:45:16 +02:00
Glowbal	244bac8562	Merge branch 'master' into medicalAdvanced	2015-04-03 22:42:09 +02:00
Glowbal	05389e7e25	Implemented useItems for treatment (basic and adv) ... Will remove items on treatment start. Add again on treatmentFailure. Based upon consumeItem config setting.	2015-04-03 22:40:36 +02:00
commy2	9968bc132c	get a pip scope to work	2015-04-03 22:30:29 +02:00
Glowbal	038ed5f23e	Removed deprecated returnDamage parameters	2015-04-03 21:59:47 +02:00
Glowbal	1ef262c119	Support for enableOverdosing setting in advanced	2015-04-03 21:53:58 +02:00
Glowbal	c3ddbb4be7	Prevent the usage of the blood loss coefficient to increase blood volume on bleeding	2015-04-03 21:51:44 +02:00
Glowbal	ecf16ad9f1	fixed prevent instant death setting	2015-04-03 21:49:46 +02:00
PabstMirror	604e851423	Medical - isBeingCarried	2015-04-03 14:37:04 -05:00
Glowbal	d4a6dd1038	Removed the options to enable fractures and airway through mission module	2015-04-03 21:32:49 +02:00
Glowbal	1b02cb2e82	examine actions now use activity log	2015-04-03 21:03:39 +02:00
Glowbal	43efc21f27	Only display the activity log in the activity list.	2015-04-03 21:03:22 +02:00
Glowbal	8881de4a07	Removed activity log background, made wider. Added shadow to text.	2015-04-03 21:02:56 +02:00
Glowbal	8d7ac1f930	Added selected bodypart text ... Changed "No injuries on bodypart" to still display if the generic messages have entries	2015-04-03 20:26:24 +02:00
PabstMirror	254a25b139	Medical - isBeingDragged func	2015-04-03 13:16:48 -05:00
Glowbal	b92978fb80	Now resets the proper hasMovedOut value	2015-04-03 20:11:20 +02:00
Glowbal	e68e487769	fixed units not moving out of unconscious animation	2015-04-03 20:07:39 +02:00
Glowbal	d5f0cf5cbd	Incorrect value for airwayStatus	2015-04-03 20:06:53 +02:00
jaynus	ced44f8a9d	Fixed: Reduce bouncing. ... TODO: wtf is going on with the lateral axis? TODO: maybe dummy laser that doesnt show up as a target.	2015-04-03 10:34:36 -07:00
commy2	025c1ef63f	simplify optics	2015-04-03 19:25:28 +02:00
jaynus	368b51e0ee	Fixed: Get in/out of vehicle automatically turns off lasers	2015-04-03 10:10:57 -07:00
Glowbal	14e00940cd	fixed incorrect airwayStatus values for initialization (adv medical)	2015-04-03 18:59:22 +02:00
esteldunedain	d1d6252299	Nerf the backblast damage of the Titan and NLAW, adopting standard values for soft-launch launchers from the AGM_Compatibility project	2015-04-03 13:50:47 -03:00
jaynus	ca8537105f	Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers	2015-04-03 09:49:56 -07:00
jaynus	84d801a45a	Added: ace_fcs_forceUpdate event for forcing the FCS to update from self-designate ... Merged: in-vehicle interact for laser designator Changed: Perf. tweaks on laser update times.	2015-04-03 09:49:41 -07:00
esteldunedain	b0ac672c13	Only init each vehicle type once	2015-04-03 13:24:50 -03:00
jaynus	63c42e26c8	Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers	2015-04-03 09:16:03 -07:00
jaynus	f87ea5fe1c	Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers	2015-04-03 09:03:14 -07:00
commy2	b0575bad21	improve infoDisplayChanged EH	2015-04-03 17:50:52 +02:00
esteldunedain	b7e3a94462	Add designator to the comanche's gunner	2015-04-03 12:44:09 -03:00
esteldunedain	c82cef1b28	- self designate capabilities read from config ... - add designator on/off actions to the interact_menu	2015-04-03 12:43:41 -03:00
Nicolás Badano	63ac3bb768	Merge branch 'master' into lasers ... Conflicts: addons/common/XEH_preInit.sqf	2015-04-03 10:40:11 -03:00
Glowbal	1d7f351cb5	Merge pull request #288 from KoffeinFlummi/Banana ... Added banana to curator item list	2015-04-03 12:56:37 +02:00
Glowbal	4478602cfb	Consistent use of quotes for localized text	2015-04-03 12:56:12 +02:00
commy2	6d3ddfeb5e	2d scripted optics	2015-04-03 12:33:12 +02:00
Garth L-H de Wet	7c73f7479e	Used a more suitable icon for taking explosives.	2015-04-03 09:51:32 +02:00
Glowbal	8226edc6cb	Fixed module function call ... Wind deflection module was using the incorrect function name,	2015-04-03 09:43:06 +02:00
Glowbal	368002cc79	fixed undefined _selectionName variable #289	2015-04-03 08:48:10 +02:00
Glowbal	ffcc01ef74	Removed rouge systemChat message on unconsciousness #292	2015-04-03 08:45:02 +02:00
PabstMirror	98428c42f5	#291 - RemoveDeadBodiesDisconnected	2015-04-03 01:05:14 -05:00
PabstMirror	33ee7dc07c	iMenu - Add some localization and fix veh icons	2015-04-03 00:42:25 -05:00
PabstMirror	e99e35d70b	mdagr - remove unneeded error msg	2015-04-02 22:37:00 -05:00
PabstMirror	7c121e6a80	Missing, unused stringtable	2015-04-02 22:32:16 -05:00
jaynus	19bc75dacd	Merge remote-tracking branch 'origin/ballistics_effects' into lasers	2015-04-02 16:44:00 -07:00
jaynus	8a18d18c08	doubleplusgood all munition TTL for range.	2015-04-02 16:35:19 -07:00
Glowbal	2d0e8dea7e	Added banana to curator item list	2015-04-03 01:27:22 +02:00
jaynus	6864529d9c	Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events.	2015-04-02 16:20:22 -07:00
jaynus	d81d1b3176	Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug ... Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters	2015-04-02 16:05:21 -07:00
commy2	ba00a31523	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-03 00:41:43 +02:00
commy2	3b23006797	fix error when aborting mission	2015-04-03 00:41:11 +02:00
PabstMirror	1c66cb9818	StaticWeapon classname	2015-04-02 17:25:05 -05:00
Glowbal	045ea02da0	Changed: CPR is now only possible when a unit is in cardiac arrest (Adv)	2015-04-03 00:10:12 +02:00
Glowbal	b399768798	Changed postInit wound sync to playerChanged eventhandler.	2015-04-03 00:04:41 +02:00
commy2	88b9d0899f	shortdot scope onDraw	2015-04-03 00:03:08 +02:00
Glowbal	c174ccf396	fixed script error when performing treatment with secondary weapon selected	2015-04-02 22:58:00 +02:00
Glowbal	57b093f845	Added minimum lethal damage for injury types in adv medical	2015-04-02 22:57:35 +02:00
Glowbal	b267a52ec6	Fixed support for custom damage types	2015-04-02 22:57:02 +02:00
Glowbal	6f4b53ed9e	Correct use of medical handleDamage calls	2015-04-02 22:56:23 +02:00
Glowbal	6f630d4c03	Changed setUnconscious contract to support a minimum unconscious time	2015-04-02 22:55:23 +02:00
Glowbal	c6c04442c1	GForces now uses correct unconscious function	2015-04-02 22:54:39 +02:00
commy2	646a4b5bd1	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-02 22:40:47 +02:00
commy2	35ad71bbfd	add testing scope	2015-04-02 22:40:21 +02:00
Garth L-H de Wet	703bc24657	Made picking up explosives use the new AddToInventory function from common.	2015-04-02 21:44:33 +02:00
Garth L-H de Wet	1e8a8e79fe	Merge branch 'master' into explosiveInteraction	2015-04-02 21:30:08 +02:00
jaynus	b88d1b4cac	Begin time to live changes for extended range rounds.	2015-04-02 10:45:52 -07:00
jaynus	0ca1703048	Slight tweak to deflection.	2015-04-02 10:41:54 -07:00
jaynus	596854a264	Moved getTurretDirection to common. ... Tweak creation of action (fucking actions?!) :( :( :(	2015-04-02 10:05:50 -07:00
jaynus	c83e602028	Merge remote-tracking branch 'origin/master' into lasers	2015-04-02 09:35:51 -07:00
jaynus	ec64a1b0ca	Changed: Laser functionality tweaking ... Changed: DAGR deflection refinement Clean up of tabs	2015-04-02 09:35:36 -07:00
PabstMirror	ec59397e4f	Fix playerTurretChanged event	2015-04-02 11:15:31 -05:00
jaynus	b0926a542c	Merge pull request #282 from KoffeinFlummi/AddItemToInventory ... Added a function that will add the passed item to the unit or place it i...	2015-04-02 08:42:48 -07:00
commy2	f2d802eb90	make getGunner work in person turret turret units (commander FFV) and for foot soldiers	2015-04-02 13:52:22 +02:00
commy2	d8e0c54406	function to log ace config entries	2015-04-02 10:27:21 +02:00
commy2	2fd2e313f2	sort stuff	2015-04-02 08:44:58 +02:00
commy2	8fde553731	getItemType more relyable after potential arma updates	2015-04-02 08:16:13 +02:00
commy2	191126ecd6	update getItemType	2015-04-02 07:37:44 +02:00
PabstMirror	a92a541234	Headers	2015-04-01 23:05:41 -05:00
jaynus	cc27ff63d6	finalized. works for weapons/mags/items. Optional container also works.	2015-04-01 16:51:34 -07:00
jaynus	5d6495dafe	Merge remote-tracking branch 'origin/master' into AddItemToInventory	2015-04-01 16:42:24 -07:00
PabstMirror	c9352e1970	And This	2015-04-01 15:18:39 -05:00
commy2	411fb6bc62	getText vs. getNumber	2015-04-01 22:13:37 +02:00
PabstMirror	4e66aea25d	Make it work	2015-04-01 15:09:05 -05:00
commy2	a14cc0853e	function to return item type	2015-04-01 21:52:56 +02:00
Garth L-H de Wet	452947148a	Random clean ups and explosive can now detonate with their object. ... Defuse object doesn't get cleaned up on it's own. But if a player comes near it with interact menu on it will get cleaned up.	2015-04-01 20:43:18 +02:00
PabstMirror	1303f59cd8	opps	2015-04-01 13:09:22 -05:00
PabstMirror	0d27806571	Repack Mag Child Actions	2015-04-01 13:09:03 -05:00
Glowbal	7252966a78	Replaced advanced wounds event sync by regular setvariable public	2015-04-01 20:03:44 +02:00
Glowbal	635f3e31c9	Disable medical carry and drag	2015-04-01 19:56:00 +02:00
jaynus	bd1f69d8a2	assign container	2015-04-01 10:37:47 -07:00
commy2	b66bb4ffd6	add functions to get cfg type of items and objects	2015-04-01 19:36:11 +02:00
jaynus	46a761a1c8	canAdditem works on weapons.	2015-04-01 10:35:22 -07:00
jaynus	de920e8874	Final cleanup.	2015-04-01 10:34:38 -07:00
jaynus	ec6fb6fcb8	containerize.	2015-04-01 10:34:16 -07:00
jaynus	c3f915a0ac	tabs because	2015-04-01 10:22:27 -07:00
jaynus	37bbbc607f	derp.	2015-04-01 10:20:58 -07:00
jaynus	46284622b3	Optional container variable for adding item to a specific container (vest/backpack/uniform)	2015-04-01 10:20:24 -07:00
Garth L-H de Wet	7d5555a2e0	Renamed functions to be more inline with their purpose. ... Removed legacy code.	2015-04-01 19:09:19 +02:00
Garth L-H de Wet	e06e7a2a51	Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space.	2015-04-01 18:48:46 +02:00
PabstMirror	43a9e7bfc8	#176 - Belt Repacking	2015-04-01 11:21:30 -05:00
PabstMirror	0daa029622	Show Vehicle Name/Icon for interaction	2015-03-31 23:56:41 -05:00
PabstMirror	41489e271c	Merge pull request #261 from KoffeinFlummi/attachCleanup ... Attach cleanup	2015-03-31 19:46:25 -05:00
Nicolás Badano	0d8bd0bc80	Merge pull request #279 from KoffeinFlummi/fixesInteractionConditions ... Fixed various interaction conditions	2015-03-31 20:10:05 -03:00
Garth L-H de Wet	c020128f0e	Made explosives use children action points rather than the listbox at all points. ... Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing. Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.	2015-03-31 23:20:32 +02:00
Nicolás Badano	e38f48d7ad	Remove debug stuff	2015-03-31 18:16:53 -03:00
Nicolás Badano	1def2bd2b4	Fix bugs with interaction with vehicles and passengers	2015-03-31 18:09:29 -03:00
Nicolás Badano	4381f164d1	Fix the self interaction menu of vehicles	2015-03-31 18:09:23 -03:00
Nicolás Badano	149fd13fce	Prevent the interact menu from closing dialogs opened by the actions	2015-03-31 18:09:20 -03:00
Nicolás Badano	9a182b98b6	Fix the FCS keybinds	2015-03-31 18:09:14 -03:00
Garth L-H de Wet	613257141b	Merge branch 'removedExpPlaceMenu' into explosiveInteraction ... Conflicts: addons/explosives/CfgVehicles.hpp addons/explosives/functions/fnc_openPlaceUI.sqf	2015-03-31 19:29:09 +02:00
Garth L-H de Wet	8158a3e841	Fixed small errors caused by working blind.	2015-03-31 19:26:38 +02:00
Garth L-H de Wet	9c13a87d83	Merge branch 'master' into explosiveInteraction	2015-03-31 17:21:55 +02:00
Garth L-H de Wet	37fe824426	Added pickup action to put down explosives.	2015-03-31 17:12:12 +02:00
PabstMirror	146812b5e6	Dragging - Detect static weapon disassembled ... Static weapons can still be disassembled at any time during dragging. This just adds a simple distance check and drops if object moves away from player.	2015-03-30 21:51:11 -05:00
Nicolás Badano	1e0ece9fa2	Revert "Revert "1.42 - cursor mode when bipod deployed""	2015-03-30 17:32:55 -03:00
Nicolás Badano	d9bfb84675	Revert "1.42 - cursor mode when bipod deployed"	2015-03-30 17:31:50 -03:00
Nicolás Badano	a7f1e58dcf	Merge pull request #272 from KoffeinFlummi/142menudeploy ... 1.42 - cursor mode when bipod deployed	2015-03-30 17:26:18 -03:00
PabstMirror	ee961ed1e6	Fix Dropping Unique Magazines	2015-03-29 14:47:57 -05:00
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	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
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
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
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
commy2	91b63fbb7d	tweaks	2015-03-26 03:20:17 +01:00
commy2	6a0ca8590f	speed up some debug functions by 99.99%	2015-03-26 02:26:09 +01:00
commy2	cb29f1a6c9	tweak, pushBack vs + Array	2015-03-26 01:58:49 +01:00
commy2	288c79fb46	Merge pull request #251 from KoffeinFlummi/turrettweak ... tweak turret functions	2015-03-25 23:38:39 +01:00
commy2	b613ab8630	adjust functions to new syntax	2015-03-25 23:03:45 +01:00
commy2	80349658d6	tweak turret functions	2015-03-25 22:50:28 +01:00
Glowbal	eb80831525	fixed script error with medical display patient information after check response	2015-03-25 22:18:52 +01:00
commy2	e007a247d8	detach when entering a vehicle, don't mess up animation insidea vehicle	2015-03-25 21:51:50 +01:00
commy2	01b7d3b213	global setDir on attachTo	2015-03-25 20:45:47 +01:00
commy2	3634eaf568	tweak carry stance req., timeout certain PFH, exit PFH, debug	2015-03-25 20:18:23 +01:00
bux578	02141a2947	add microDAGR to weapons array	2015-03-25 18:23:01 +01:00
bux578	1f3c3ce34b	fixed spelling of engl. autoinjector ... http://en.wikipedia.org/wiki/Epinephrine_autoinjector	2015-03-25 18:22:45 +01:00
commy2	39500110b5	remove disable command menu option - it does nothing	2015-03-25 15:14:22 +01:00
commy2	9b553c1134	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-25 15:07:42 +01:00
commy2	50c63b8fb9	don't overwrite input in weapon select, fix: weapon select didn't work in FFV	2015-03-25 15:06:47 +01:00
PabstMirror	a88908d795	Release autotrack when trying to drag map	2015-03-25 09:00:49 -05:00
PabstMirror	600c7aed97	Restore Interaction Icon	2015-03-25 08:57:44 -05:00
commy2	569a77d41b	logic	2015-03-25 14:34:19 +01:00
commy2	0c8e8236dd	logic	2015-03-25 14:32:36 +01:00
commy2	e1b5b96a7e	derped the file	2015-03-25 14:09:49 +01:00
commy2	20882ed694	properly remove fake weapon after carrying persons	2015-03-25 14:07:50 +01:00
commy2	ebe9d7ed5f	carrying unconscious persons	2015-03-25 13:32:59 +01:00
commy2	4ae3c22642	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry	2015-03-25 11:08:13 +01:00
bux578	c44b944044	add missing icons	2015-03-25 06:32:08 +01:00
bux578	074bf4ba6d	tab to space	2015-03-25 06:06:04 +01:00
bux578	4fecc1372f	add microDAGR to ace misc box	2015-03-25 06:05:06 +01:00
Glowbal	b6133eb73e	removed diag_log calls	2015-03-24 23:10:03 +01:00
Glowbal	3b17cc68e1	medical_onUnconscious is now a globalEvent instead of targetEvent. ... Feature request by commy.	2015-03-24 22:10:41 +01:00
Glowbal	975ad5a399	Merge branch 'master' into medical-fixes ... Conflicts: addons/medical/CfgVehicles.hpp	2015-03-24 22:07:15 +01:00
Glowbal	706e159815	Adjusted color of tourniquet message	2015-03-24 22:01:33 +01:00
Glowbal	2f729f67f1	Slightly increased the distance of medical actions ... Removed sub menu medical on torso	2015-03-24 21:41:03 +01:00
commy2	655f23b53c	start carrying phase	2015-03-24 21:37:27 +01:00
Glowbal	7420f70020	Fixed #232	2015-03-24 21:26:20 +01:00
Glowbal	95489ed627	fixed missing handleDamage EH #235	2015-03-24 21:25:21 +01:00
Glowbal	53e7fe1ba5	fixed #227	2015-03-24 21:08:45 +01:00
Glowbal	f175467813	fixed #241 and #228	2015-03-24 21:08:13 +01:00
commy2	12062c0e25	deleting obsolete stuff in common	2015-03-24 20:32:13 +01:00
commy2	34df28d938	cleaning up common	2015-03-24 20:28:44 +01:00
commy2	53a61eb001	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry	2015-03-24 20:10:11 +01:00
Nicolás Badano	77dc50f10f	Some more fixes for self interaction inside vehicles	2015-03-24 16:06:03 -03:00
Nicolás Badano	4fb50fa71e	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-24 15:44:10 -03:00
Nicolás Badano	8b3648cf8d	Configure exceptions for self actions inside vehicles	2015-03-24 15:43:49 -03:00
bux578	7744d5b5fb	fix authors #2	2015-03-24 19:43:06 +01:00
bux578	05896a55ea	fix authors	2015-03-24 19:40:48 +01:00
bux578	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01:00
commy2	749352f0a8	animations, onUnconscious events	2015-03-24 19:07:39 +01:00
commy2	941d98a88d	disable all self actions inside vehicles on default	2015-03-24 16:45:10 +01:00
Nicolás Badano	a1d6c052ba	Refactored interaction key handling while boarded: ... - Self-interaction key opens up your own self interaction menu - Interaction key opens interaction options of the vehicle and passengers	2015-03-24 12:27:27 -03:00
commy2	43846970fa	init drag/carry options on persons	2015-03-24 16:12:46 +01:00
commy2	bdc60c074a	cleaning up in common	2015-03-24 16:01:53 +01:00
PabstMirror	82042f85f4	Wirecutters: fix error on end mission with keydown	2015-03-24 04:03:16 -05:00
PabstMirror	8346de8150	vehLock disable debug rpt spam	2015-03-24 04:01:20 -05:00
PabstMirror	3ab033065f	#233 - Clean up mDAGR interaction menu ... Adds exception to use on map (also for base ACE_equipment) selfInteract has 3 options [close, show minimap, show dialog] (only 2 possible shown at any time) Keybinds are just toggle and close	2015-03-24 03:50:06 -05:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00
Nicolás Badano	bc0dae63ca	Fix #173	2015-03-24 00:57:03 -03:00
Nicolás Badano	58ea333b42	Fix #236	2015-03-24 00:34:41 -03:00
Nicolás Badano	8767a0d6ac	Fix #206	2015-03-24 00:30:15 -03:00
Nicolás Badano	a823fb2dca	Tweaks on action names to: ... - Remove >> for submenus - Split long action names in two lines	2015-03-24 00:16:32 -03:00
Nicolás Badano	17d0c0ae38	Various tweaks on interact_menu styling to improve usability	2015-03-24 00:15:22 -03:00
Nicolás Badano	70ffefde10	Possibly close multiple dialogs when interact_menu is opened	2015-03-23 21:26:40 -03:00
Nicolás Badano	65d3e312d1	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-23 20:03:08 -03:00
Nicolás Badano	f64092f09c	Close dialogs when pressing the interaction k	2015-03-23 20:02:30 -03:00
PabstMirror	ed3fc5919f	#231 - Close DAGR if player dead/null	2015-03-23 17:34:40 -05:00
Nicolás Badano	50f5e2c858	Change the interact_menu selector to be a control. Makes it work reliably when surrendered	2015-03-23 19:16:10 -03:00
Nicolás Badano	a432f74a6b	Make self interact_menu finally work on the map screen!!	2015-03-23 18:26:20 -03:00
Nicolás Badano	75a09357aa	Properly configure canInteractWith and exceptions for self interaction	2015-03-23 18:08:58 -03:00
Nicolás Badano	eb557bf777	Make interac_menu work in real 2D: ... - Children positions are calculated directly on screen space - Saves a lot of worldToScreen, ATLtoASL, etc calls - Selector is now a control instead of a 3D icon	2015-03-23 18:08:31 -03:00
PabstMirror	20362e8dc9	Cleanup exception names	2015-03-23 15:22:26 -05:00
PabstMirror	ef3b411c6c	Close dagr when dropping item	2015-03-23 15:02:20 -05:00
Nicolás Badano	ba9fce8636	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-23 16:53:56 -03:00
Nicolás Badano	dbbfdd88df	Forgotten line	2015-03-23 16:53:28 -03:00
bux578	ba42ec831b	second batch of icons	2015-03-23 20:02:35 +01:00
PabstMirror	17eddb089b	Missing Semicolon	2015-03-23 13:57:16 -05:00
PabstMirror	2329212060	Medical Action Stringtable	2015-03-23 13:52:26 -05:00
PabstMirror	14d6db4596	Merge pull request #183 from KoffeinFlummi/microDAGR ... MicroDAGR	2015-03-23 13:24:37 -05:00
bux578	cdb6a1f947	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-23 18:43:00 +01:00
Nicolás Badano	c8b6f6dc78	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-23 14:02:06 -03:00
Nicolás Badano	bf1d808b82	Small optimizations on interact_menu	2015-03-23 14:01:38 -03:00
Nicolás Badano	1e5a194bf6	Optimize ace_common_fnc_toHex	2015-03-23 12:16:50 -03:00
bux578	1114e12186	add first batch of module icons, naming conventions	2015-03-23 13:56:59 +01:00
PabstMirror	d6ad0e15b4	Move wep_dragon to toMerge ... Always throws error during compile Has multiple references to Arma2 assets.	2015-03-22 17:34:28 -05:00
Glowbal	15edb0bff2	fixes	2015-03-22 23:24:24 +01:00
Glowbal	d7de92c60d	Merge branch 'master' into Medical_Dragging ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf	2015-03-22 22:41:36 +01:00
Glowbal	9e43ab5c25	Merge branch 'master' into medical-advanced	2015-03-22 22:37:37 +01:00
Glowbal	df43b7fd2d	Merge branch 'master' into medical-jip-fixes ... Conflicts: addons/medical/CfgVehicles.hpp	2015-03-22 22:35:32 +01:00
Glowbal	4ff849c2fd	Merge branch 'master' into medical-advanced	2015-03-22 22:34:07 +01:00
Glowbal	c7b505a31c	Merge pull request #218 from KoffeinFlummi/pre-postInit-module-exec ... Pre-postInit module execution	2015-03-22 22:33:32 +01:00
Glowbal	1bb32dcfcb	fixed missing condition variable	2015-03-22 22:20:44 +01:00
Glowbal	1aa2425c1e	Merge branch 'master' into Medical_Dragging	2015-03-22 21:07:26 +01:00
Glowbal	4995016a66	Switched to canInteractConditions	2015-03-22 20:59:57 +01:00
Glowbal	7bc6fa3c3b	Disable interaction for objects	2015-03-22 20:39:22 +01:00
Glowbal	6eac193825	Replaced deleting of body by hiding it	2015-03-22 20:37:55 +01:00
commy2	84dbeb19d1	fix: timeout could cause being stuck with attached item	2015-03-22 17:35:26 +01:00
Glowbal	2d2687e759	Added self interact items	2015-03-22 17:28:48 +01:00
commy2	11bb1a050a	fix: could drag and carry object at the same time	2015-03-22 17:12:14 +01:00
Glowbal	dd7dad1b90	define base class	2015-03-22 17:05:31 +01:00
Glowbal	f252b2c96f	advanced medical JIP improvements	2015-03-22 17:04:42 +01:00
commy2	c243513227	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-22 16:38:38 +01:00
commy2	e1200f8753	fix: release action didn't show up	2015-03-22 16:38:21 +01:00
Glowbal	694ab7d51e	Merge branch 'master' into pre-postInit-module-exec	2015-03-22 15:17:24 +01:00
Glowbal	8b4c0c0e36	fixed postInit depending on setting	2015-03-22 15:16:42 +01:00
commy2	4607fd8605	localization	2015-03-22 14:42:47 +01:00
commy2	f734aeee95	reload launcher mag progress bar	2015-03-22 14:05:31 +01:00
Glowbal	be9c09b605	Added cfgPatches dependancy on ace_modules	2015-03-22 12:49:04 +01:00
Glowbal	7ceaf7907a	Indentation	2015-03-22 12:45:46 +01:00
Glowbal	281bad1e7e	Use of the ACE module instead of Module_F.	2015-03-22 12:44:26 +01:00
Glowbal	73489a7795	PBOPREFIX	2015-03-22 12:39:49 +01:00
Glowbal	d7e43ce28e	First draft	2015-03-22 12:39:26 +01:00
Glowbal	55e7e768ca	removed systemChat messages	2015-03-22 11:21:17 +01:00
Glowbal	5063e9cff9	fixed config duplicate entry	2015-03-22 11:21:08 +01:00
commy2	ae5fbaef86	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into reloadLaunchers	2015-03-22 10:48:54 +01:00
Glowbal	ac4309237b	Added drag/carry actions	2015-03-22 10:28:41 +01:00
Glowbal	0428a1d558	Added canDrag	2015-03-22 10:28:33 +01:00
Glowbal	7b519fc2e0	Merge branch 'master' into Medical_Dragging ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/stringtable.xml	2015-03-22 09:46:58 +01:00
Nou	12cadc603f	Fragmentation enabled.	2015-03-21 21:22:16 -07:00
Nicolás Badano	08eb40a606	Merge pull request #209 from KoffeinFlummi/disposableCleanup ... Disposable cleanup	2015-03-21 20:44:38 -03:00
Nicolás Badano	5dcf29ba80	Merge pull request #212 from KoffeinFlummi/interactivePelvis ... Move main interactions to pelvis; leave torso for medical	2015-03-21 20:44:18 -03:00
Nicolás Badano	32be87806b	Clear the caches again after performing the action, cause it's very possible something changed as a result.	2015-03-21 20:37:01 -03:00
Nicolás Badano	6a83d0d9fc	clear canTreat caches before calling the last condition	2015-03-21 20:33:25 -03:00
Nicolás Badano	323aa156d1	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into clearCacheOnEvents	2015-03-21 20:31:01 -03:00
Nicolás Badano	2beb1a289e	Ensure the condition of the action is always checked uncached before calling the statement.	2015-03-21 20:30:27 -03:00
Nicolás Badano	71c79e7785	Merge pull request #214 from KoffeinFlummi/clearCacheOnEvents ... Added to cachedCall an option to clear the cache on an event	2015-03-21 20:15:10 -03:00
PabstMirror	3a6995fbec	Cleanup medical Item classnames	2015-03-21 18:07:50 -05:00
Felix Wiegand	be4f21ea2e	Merge pull request #215 from KoffeinFlummi/medical-itemcheck ... Medical itemcheck	2015-03-21 22:41:06 +01:00
Glowbal	a7d8914884	Removed GVAR/QGVAR from items	2015-03-21 22:22:28 +01:00
commy2	1bf13cea34	remove obsolete camera eh from agm	2015-03-21 22:13:36 +01:00
Nicolás Badano	87b1458dc0	Fix debug stuff	2015-03-21 18:09:42 -03:00
Glowbal	b74eb550b0	Added advanced items	2015-03-21 22:08:42 +01:00
KoffeinFlummi	58237751b0	Woopsie	2015-03-21 22:01:20 +01:00
KoffeinFlummi	f6f910fb8a	Replace vanilla items with ours.	2015-03-21 21:59:08 +01:00
commy2	1b8a9290cd	remove obsolete custom eh from agm	2015-03-21 21:56:22 +01:00
commy2	cefd8d5c54	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-21 21:51:48 +01:00
commy2	1d4249a825	macros	2015-03-21 21:51:27 +01:00
Nicolás Badano	213b817947	Added to cachedCall an option to clear the cache on an event	2015-03-21 17:50:35 -03:00
Glowbal	d73f16861b	Merge pull request #213 from KoffeinFlummi/medical-advanced ... Medical advanced	2015-03-21 21:02:35 +01:00
Nicolás Badano	ce3ed988a2	Removed debug traces	2015-03-21 16:33:59 -03:00
Glowbal	89daf840f6	fixed incorrect macro	2015-03-21 20:08:52 +01:00
Nicolás Badano	4e32e584be	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 15:33:36 -03:00
Nicolás Badano	f8ea603977	Added dynamic actions to unload patients (unconscious) from vehicles	2015-03-21 15:32:32 -03:00
PabstMirror	9578024693	Dupe stringtable entry ... `Item STR_ACE_MEDICAL_BANDAGING listed twice`	2015-03-21 12:52:08 -05:00
Nicolás Badano	274dae9a02	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 14:28:33 -03:00
Nicolás Badano	dbb9765035	Fix isSubPath	2015-03-21 14:28:17 -03:00
PabstMirror	054f21eede	+2more	2015-03-21 12:18:19 -05:00
PabstMirror	e8112ada71	Merge branch 'master' into disarmingTest	2015-03-21 12:15:12 -05:00
PabstMirror	8a9ac4147f	Update $PBOPREFIX$ ... Only getting error on server, not client `Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`	2015-03-21 12:14:38 -05:00
Glowbal	7d6afdf1a9	Added triage card option	2015-03-21 17:30:49 +01:00
Glowbal	82ec93b84e	Medical icons	2015-03-21 17:05:32 +01:00
Glowbal	7ae45fbeff	Fixed canTreatCached	2015-03-21 16:47:51 +01:00
PabstMirror	0e6f76b50b	Cannot drop attachements because of duplication	2015-03-21 10:35:21 -05:00
Glowbal	d0b14286ff	Wrong function name	2015-03-21 16:34:42 +01:00
Glowbal	1d63e94fff	canTreatCached	2015-03-21 16:33:14 +01:00
Glowbal	8de985d754	Added medical icons	2015-03-21 15:45:35 +01:00
Nicolás Badano	d7363a6dab	Move main interactions to pelvis; leave torso for medical	2015-03-21 11:01:38 -03:00
Glowbal	4bcfd1a0ba	Merge branch 'master' into medical-advanced ... Conflicts: addons/medical/functions/fnc_handleUnitVitals.sqf	2015-03-21 14:54:37 +01:00
Felix Wiegand	8fac4b5798	Merge pull request #192 from KoffeinFlummi/medical-basic ... Basic Medical Tweaks	2015-03-21 14:41:46 +01:00
Glowbal	946ade63e5	Merge branch 'master' into medical-advanced	2015-03-21 14:40:59 +01:00
Glowbal	ff5c8e911d	Added InteractionMenuClosed event for closing the patient information display	2015-03-21 14:40:51 +01:00
Glowbal	77210581f5	Added corners to triage card	2015-03-21 14:40:26 +01:00
KoffeinFlummi	75517f7ce4	Replace setDamage with setDead	2015-03-21 14:40:23 +01:00
Nicolás Badano	f5f91c4802	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 10:24:01 -03:00
Nicolás Badano	83d9aa4bb6	Replace tap shoulder and check (others) ammo animations by PutDown	2015-03-21 10:23:36 -03:00
Nicolás Badano	9fd45fa707	Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3 ... Vehicle Lock Cleanup	2015-03-21 09:51:47 -03:00
Nicolás Badano	4a8b5079a6	Fix #211	2015-03-21 09:37:01 -03:00
Nicolás Badano	4fe09034ff	Merge branch 'master' into dynamicInteractMenu	2015-03-21 08:55:05 -03:00
Glowbal	7c30127ffb	Disabled unimplemented medical systems	2015-03-21 10:55:40 +01:00
Glowbal	bc082783c9	check if unit is in a vehicle before checking the vehicle	2015-03-21 10:55:27 +01:00
Glowbal	b5c6e52416	fixed #201	2015-03-21 10:54:52 +01:00
Nicolás Badano	e7d7fa8e6c	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 00:27:41 -03:00
Nicolás Badano	14566c783b	Prevent canInteractWith from throwing errors if third parameter is not supplied	2015-03-21 00:27:19 -03:00
Nicolás Badano	4210b175c3	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu ... Conflicts: addons/interact_menu/functions/fnc_compileMenu.sqf addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf	2015-03-21 00:16:52 -03:00
PabstMirror	0dcb1dfab8	GUI	2015-03-20 20:48:39 -05:00
PabstMirror	22483ce22e	Fix ranks, and uniform/vest drop	2015-03-20 20:47:34 -05:00
Nicolás Badano	3d6660b115	Debug stuff	2015-03-20 22:44:36 -03:00
Nicolás Badano	b3aa7c8970	Make collectActiveActionTree follow mounts correctly	2015-03-20 22:44:25 -03:00
PabstMirror	52623f71b8	Use Inventory Scaling Option	2015-03-20 20:27:04 -05:00
PabstMirror	38745f4871	Various Changes	2015-03-20 20:17:49 -05:00
PabstMirror	f8e758e136	Merge branch 'master' into disarmingTest	2015-03-20 19:05:54 -05:00
KoffeinFlummi	a060e4bea5	Apply translations to epipen and morphine actions	2015-03-21 00:31:47 +01:00
KoffeinFlummi	b1ed80a23d	Remove trailing whitespace in medical stringtable	2015-03-21 00:28:19 +01:00
KoffeinFlummi	510538bc53	Remove superfluous todo	2015-03-21 00:26:14 +01:00
KoffeinFlummi	88fb2765e3	Standardize actions across basic and advanced	2015-03-21 00:21:30 +01:00
PabstMirror	7e383dc10e	#198 canInteractWith EGVAR -> EFUNC	2015-03-20 17:55:39 -05:00
KoffeinFlummi	6f8b5cc676	Fix missing dollar sign	2015-03-20 23:53:25 +01:00
KoffeinFlummi	fea63e597e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic	2015-03-20 23:48:42 +01:00
PabstMirror	8840284309	Fix progressBar	2015-03-20 17:46:21 -05:00
KoffeinFlummi	33d4bf2f5a	Add localization for basic treatments and actions	2015-03-20 18:21:03 +01:00
KoffeinFlummi	9082712ff7	Replace Original with English keys in stringtable	2015-03-20 17:54:26 +01:00
KoffeinFlummi	66078a047b	Wut.	2015-03-20 07:52:41 +01:00
Nicolás Badano	66731c9cdd	First rough implementation of the passengers menu, with mounted main actions	2015-03-20 00:53:58 -03:00
Nicolás Badano	b854db0195	Updated interact_menu api calls on ace_dragging	2015-03-19 23:33:11 -03:00
Nicolás Badano	84bf44e026	Refactoring of interact_menu: ... - Reordering of action members - Removed full path from actions, so they can be mounted under different paths if needed - Added api for creating actions - Api for adding actions for objects or classes	2015-03-19 23:32:44 -03:00
PabstMirror	ad12904ca4	minor formating	2015-03-19 20:37:36 -05:00
PabstMirror	0c88b92eba	Condense AI func, and drop attachements	2015-03-19 20:24:14 -05:00
PabstMirror	6e03bb6144	Merge branch 'master' into disposableCleanup	2015-03-19 19:37:10 -05:00
KoffeinFlummi	07570fccd4	Make isMedic even prettier	2015-03-19 22:34:12 +01:00
KoffeinFlummi	5589b80c70	Rewrite and fix isMedic	2015-03-19 22:27:12 +01:00
KoffeinFlummi	97082e4ce3	Simplify condition checking in canTreat.	2015-03-19 22:01:40 +01:00
KoffeinFlummi	69e0ebf107	Add injury texts	2015-03-19 21:31:56 +01:00
KoffeinFlummi	102d86d7d1	Merge remote-tracking branch 'origin/master' into medical-basic	2015-03-19 21:30:27 +01:00
Glowbal	3dda70a4af	fixed variable name	2015-03-19 21:14:42 +01:00
Nicolás Badano	49cdf6512e	Merge branch 'master' into dynamicInteractMenu	2015-03-19 15:09:31 -03:00
Nicolás Badano	b89e573005	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-19 15:08:53 -03:00
Nicolás Badano	b7c73f705c	Interact menu usability improvements: ... - Submenu scale as a function of the number of children - Added menu expansion animation to better communicate where the options come from - Unused action point are faded as soon as the user hovers a certain action point	2015-03-19 15:08:36 -03:00
Nicolás Badano	a3b913ad8b	Interact menu usability improvements: ... - Submenu scale as a function of the number of children - Added menu expansion animation to better communicate where the options come from - Unused action point are faded as soon as the user hovers a certain action point	2015-03-19 15:04:48 -03:00
Nicolás Badano	f96126153c	Reenable hiding useless actions	2015-03-19 14:45:05 -03:00
Nicolás Badano	386fee4694	Replace place list menu by dynamically created actions	2015-03-19 13:31:45 -03:00
Nicolás Badano	acd3ca0d56	Interact menu: ... - Allow dynamically adding children actions just-in-time - Added optional custom parameters for actions	2015-03-19 13:00:10 -03:00
PabstMirror	81836d1bc1	semiColon	2015-03-19 03:10:33 -05:00
commy2	43defaee06	get compatible missiles fnc	2015-03-18 21:33:00 +01:00
PabstMirror	e57f007288	Match Ace_map's style	2015-03-18 14:39:04 -05:00
commy2	40eed0e12f	reload event, some basic functions	2015-03-18 20:17:53 +01:00
PabstMirror	cd6a567ba3	Fix Icon	2015-03-18 13:50:27 -05:00
PabstMirror	7688384971	Merge branch 'master' into microDAGR	2015-03-18 13:46:57 -05:00
PabstMirror	396359ba67	Self Actions To Open (under equipment)	2015-03-18 13:46:39 -05:00
commy2	0be1959934	add reloadable launcher	2015-03-18 18:25:53 +01:00
Glowbal	42de257c6e	Merge branch 'master' into Medical_Dragging	2015-03-18 18:21:05 +01:00
Glowbal	be4ba6144f	Removed unnecessary line	2015-03-18 18:17:42 +01:00
commy2	4235bd8b91	restore lost files?	2015-03-18 17:57:55 +01:00
commy2	31db62a85d	manual merge	2015-03-18 17:53:26 +01:00
commy2	1071284010	properly remove fake weapon, fix grabDrag action with fake weapon	2015-03-18 16:55:57 +01:00
commy2	330fc5658f	fake weapon had mass > 0, fix #205	2015-03-18 16:47:04 +01:00
commy2	89709e835d	Merge pull request #197 from KoffeinFlummi/drag ... add PBO to drag objects	2015-03-18 16:04:12 +01:00
commy2	be17e25487	handle dc is the same fnc as handle killed	2015-03-18 16:02:01 +01:00
commy2	0bc7811912	don't drag or carry dead objects	2015-03-18 15:52:34 +01:00
commy2	4ea6b91e47	use eventhandlers instead of PFH	2015-03-18 15:42:33 +01:00
commy2	ec6496ed2f	fix authors, add weight checks	2015-03-18 14:14:16 +01:00
commy2	c23c0788f6	tweaks, carry static weapons	2015-03-18 13:36:22 +01:00
commy2	ac8ff45d44	lock / unlock events	2015-03-18 11:29:58 +01:00
commy2	ab39608e4d	change height when carrying, fix most cases of floating objects	2015-03-18 01:36:56 +01:00
PabstMirror	9f25641f54	Verify Mag counts, headers, check animation	2015-03-17 14:43:50 -05:00
PabstMirror	7058e48f15	Merge branch 'master' into disarmingTest	2015-03-17 12:25:59 -05:00
commy2	dc7cfab06f	change default carry position	2015-03-17 15:45:34 +01:00
commy2	75548e21d9	add carry objects	2015-03-17 15:42:25 +01:00
commy2	57becc203c	handle disconnection when dragging	2015-03-17 13:47:07 +01:00
commy2	5f39cf213b	some fixes for MP	2015-03-17 12:20:46 +01:00
commy2	6d868d1bd1	fix collisions when releasing, fix crate fliping in buildings	2015-03-17 11:44:41 +01:00
KoffeinFlummi	b470276f7f	Close dialogs when falling unconscious.	2015-03-17 08:03:11 +01:00
KoffeinFlummi	8a3e3d4b52	Remove superfluous todo	2015-03-17 08:02:55 +01:00
KoffeinFlummi	056625f0fe	Check leg/arm damage in setHitPointDamage as well.	2015-03-17 07:53:50 +01:00
KoffeinFlummi	17fd051c79	Rename Bloodbag action to BloodIV	2015-03-17 07:53:35 +01:00
Nicolás Badano	3030b78ea2	Refactor the interact_menu so options for multiple objects can coexist inside a single action point	2015-03-17 00:37:28 -03:00
Nicolás Badano	eb4ccd9505	Merge branch 'hearingCleanup' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/hearing/functions/fnc_updateVolume.sqf	2015-03-16 20:39:49 -03:00
Nicolás Badano	5b91996c69	Add hearing module and additional customization parameters: ... - Enable/Disable combat deafness altogether (default on) - Volume when using earbuds (default 50%) - Volume when unconscious (default 40%)	2015-03-16 20:28:37 -03:00
Nicolás Badano	4c1f7111b5	Add map module	2015-03-16 20:24:53 -03:00
commy2	fef150cff2	attempt to fix collisions	2015-03-17 00:24:25 +01:00
Nicolás Badano	f90f1cfc21	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-16 18:39:20 -03:00
Nicolás Badano	cf45de7c11	Typo on altimeter. Fix #204	2015-03-16 18:36:09 -03:00
commy2	2aaef08c1d	can drag / drop functions, localization	2015-03-16 20:39:49 +01:00
commy2	2da0eee1e2	add drop dragged object action	2015-03-16 20:09:54 +01:00
commy2	27404fed1b	function to drop object, fix position event	2015-03-16 19:25:29 +01:00
PabstMirror	d06760e77e	Use ACRE API: acre_api_fnc_setGlobalVolume	2015-03-16 13:14:45 -05:00
PabstMirror	5d0f0c2896	Rename ACE_EarBuds -> ACE_EarPlugs ... Can't verify translations	2015-03-16 10:56:05 -05:00
commy2	ad181de578	main me ... nu for reammo_box	2015-03-16 15:41:55 +01:00
commy2	efb3657da3	drag boxes	2015-03-16 14:31:16 +01:00
PabstMirror	ec0e2d72c2	Check firer's silencer instead of player's	2015-03-15 16:47:50 -05:00
PabstMirror	04412e8ba4	Replace spawn with waitAndExec	2015-03-15 16:46:06 -05:00
PabstMirror	1cdc341320	Headers, Formatting	2015-03-15 16:40:47 -05:00
commy2	1117942c7a	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into drag	2015-03-15 19:32:07 +01:00
PabstMirror	d4624982f6	Update readme.md	2015-03-15 13:13:13 -05:00
PabstMirror	f101d40450	Readme cleanup	2015-03-15 13:10:06 -05:00
PabstMirror	726bf8d407	Headers, Formating, Fixes, Lock Inventory Option	2015-03-15 11:27:21 -05:00
commy2	898476fc2f	no target in self actions	2015-03-15 16:45:06 +01:00
commy2	2744f46bd2	spelling	2015-03-15 16:12:37 +01:00
commy2	b5f307919e	replace canInteract with canInteractWith	2015-03-15 13:00:10 +01:00
commy2	0064f5739c	manual merge	2015-03-15 09:30:26 +01:00
commy2	4dab0b73d5	add conditions on post init	2015-03-15 09:26:16 +01:00
commy2	876424695e	solve canInteract conflicts, fix #198	2015-03-15 09:02:11 +01:00
PabstMirror	5a2d7d59b6	Maptools - Use MACRO_ADDITEM from Main	2015-03-14 21:38:16 -05:00
KoffeinFlummi	99899d6562	Move advanced bloodloss handling to advanced	2015-03-15 03:26:10 +01:00
KoffeinFlummi	4cc1b08196	Add basic bleeding	2015-03-15 03:26:00 +01:00
KoffeinFlummi	d640367ff2	Add isInMedicalVehicle function	2015-03-15 03:25:31 +01:00
KoffeinFlummi	77ae997993	Don't handle unit vitals when game is paused	2015-03-15 01:48:50 +01:00
KoffeinFlummi	7f19ab7750	Only run JIP updates for wounds in advanced	2015-03-15 01:46:23 +01:00
Glowbal	62460e8b79	Fixes for animations and script error	2015-03-15 01:12:02 +01:00
Glowbal	4f08d0d006	Merge branch 'master' into SettingsMenuImprovements ... Conflicts: addons/optionsmenu/functions/fnc_onListBoxSettingsChanged.sqf addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf addons/optionsmenu/functions/fnc_onSliderPosChanged.sqf addons/optionsmenu/functions/fnc_resetSettings.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf addons/optionsmenu/functions/fnc_updateSetting.sqf addons/optionsmenu/gui/settingsMenu.hpp	2015-03-15 00:46:14 +01:00
Nicolás Badano	5264819fd4	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/map/CfgVehicles.hpp	2015-03-14 17:22:25 -03:00
Nicolás Badano	096b270b83	Merge branch 'mapContours' into mapfx ... Conflicts: addons/map/config.cpp	2015-03-14 17:20:25 -03:00
Nicolás Badano	618c021f7e	Tab to space plus comments for the spawns	2015-03-14 17:15:28 -03:00
Nicolás Badano	518010be36	Reordered the map, mapfx and pbos: ... - mapfx moved inside map - everything related to map tools and drawing moved to it's own pbo called ace_maptools Also fixed a couple of bugs in BFT - Only a single marker was being drawn - The BFT_HideAi parameter had the opposite effect	2015-03-14 16:58:05 -03:00
PabstMirror	bab1984782	Merge pull request #194 from KoffeinFlummi/captivesMedicalInegration ... Captives medical inegration	2015-03-14 13:11:31 -05:00
PabstMirror	ebbebea6f2	Merge pull request #187 from KoffeinFlummi/wirecuttersInerationTest ... Wirecutters Interaction	2015-03-14 13:11:17 -05:00
PabstMirror	da337fff3e	Merge pull request #184 from KoffeinFlummi/InventoryResize ... Dynamic Inventory Resize	2015-03-14 13:10:56 -05:00
PabstMirror	a92389f450	optMenu - remove 'fix anim' button and add headers	2015-03-14 13:10:25 -05:00
commy2	b79978116d	some functions	2015-03-14 18:38:44 +01:00
Nicolás Badano	c03115b564	Refactored mapfx code, make the three features optional	2015-03-14 13:46:10 -03:00
commy2	f3f20439c8	config stuff, functions to make objects dragable	2015-03-14 13:51:23 +01:00
commy2	58212f5ce0	add PBO to drag objects	2015-03-14 12:05:43 +01:00
Glowbal	2bee533a8c	Added AGM stringtables for drag, carry, load & unload	2015-03-14 09:51:08 +01:00
Glowbal	dcf3a73518	Added copyDeadBody function	2015-03-14 09:48:16 +01:00
Glowbal	99b1986059	Added setting for allowing movement of dead bodies	2015-03-14 09:37:19 +01:00
Nicolás Badano	69fa51cfeb	Calculate map illumination based on ambientBrightness	2015-03-13 22:27:38 -03:00
Nicolás Badano	80e7117ead	Tweak ambientBrightness to take into acount the cloud coverage	2015-03-13 22:27:14 -03:00
Nicolás Badano	7e2e6999bd	Ported from ACE2: ... - Bring scale legend to ingame map - Tweak map colors to make them exactly the same as ACE2 (had to import road colors directly from Arma 2, cause ACE just used defaults). - Hide bushes and trees from the ingame map (they remain visible on the editor) - Keep sattelite texture toogable, but with a opacity of 50%.	2015-03-13 19:34:56 -03:00
commy2	db6e0fe99b	hpps for realistic names	2015-03-13 19:10:24 +01:00
commy2	25fc24a419	fix cfgPatches in laserpointer	2015-03-13 18:52:30 +01:00
Glowbal	5390c3668e	Added icon microDAGR	2015-03-13 18:43:21 +01:00
commy2	1e731ee425	fix vector cfg patches	2015-03-13 18:34:13 +01:00
PabstMirror	93262f3b92	Use ace_isUnconscious in anim changed EH	2015-03-13 00:45:12 -05:00
Nicolás Badano	86c16953ea	Refactor and tweak map illumination to: ... - add tint depending on time of day. - make it slightly less dark at night, so it's usable under any condition. Temporarily remove light creation.	2015-03-13 01:35:45 -03:00
Nicolás Badano	a4ea5fb724	Cache the call to determineMapLight	2015-03-13 01:01:00 -03:00
PabstMirror	55fcc60453	Merge branch 'master' into captivesMedicalInegration	2015-03-12 22:44:24 -05:00
Nicolás Badano	8d0cc787b0	Initial port/reimplementation of ace_mapfx, providing: ... - dynamic map illumination - shacking maps when on the move - optional max zoom	2015-03-12 21:04:10 -03:00
Glowbal	4ce524ed3c	First draft of carry and drop unit	2015-03-12 21:16:49 +01:00
PabstMirror	c1c3325368	Fix missing display error.	2015-03-12 13:02:04 -05:00
PabstMirror	da87425df3	Vector intergration (Hold Tab+R)	2015-03-12 12:57:44 -05:00
PabstMirror	58029101b8	readme	2015-03-12 12:41:04 -05:00
PabstMirror	f33da5928c	Icon Size	2015-03-12 12:31:21 -05:00
PabstMirror	5197a5c453	Date display to info screen	2015-03-12 12:28:52 -05:00
PabstMirror	ec6d2c44bc	Fix mappos not saving	2015-03-12 12:16:33 -05:00
PabstMirror	777e088484	Ambient light levels for background fading	2015-03-12 12:09:35 -05:00
PabstMirror	862a758e3b	Merge branch 'master' into microDAGR	2015-03-12 11:39:12 -05:00
KoffeinFlummi	82f73117f4	Merge branch 'master' into medical-basic	2015-03-12 07:35:57 +01:00
KoffeinFlummi	a3069e3356	Fix wrong pain variable in patient information	2015-03-12 07:35:29 +01:00
KoffeinFlummi	ef491a7c76	Add basic information to dialog	2015-03-12 07:34:29 +01:00
KoffeinFlummi	809f6754cc	Add pain & painkiller reduction over time	2015-03-12 07:33:44 +01:00
PabstMirror	3febb1e770	WindDef - Convert to use FiredBIS	2015-03-12 00:28:33 -05:00
PabstMirror	86441ce6c5	WindDef - Enable Eventhandler	2015-03-12 00:18:18 -05:00
PabstMirror	f64abcd583	Respawn - Module icon filenames	2015-03-12 00:12:19 -05:00
PabstMirror	aaeb5a3392	Parachute - Move unused p3d back to TOMERGE	2015-03-12 00:07:28 -05:00
PabstMirror	82ea87d1de	Parachute - Config Division/Formating	2015-03-12 00:05:28 -05:00
PabstMirror	dd026cea0f	Medical - add tourniquet p3d and other missing tex ... Ported tourniquet from cse add missing textures for other items fix paths in rvmats	2015-03-11 23:52:58 -05:00
PabstMirror	bed312dcee	Use MACRO_ADDITEM from main instead of redefining	2015-03-11 17:36:40 -05:00
Nicolás Badano	d02b5d2125	Ensure the class actions are compiled from config before adding them from the API	2015-03-11 16:26:58 -03:00
PabstMirror	5ab9ad87f9	QGVAR typo	2015-03-11 13:33:45 -05:00
PabstMirror	3a7c7f7cee	Fix interactMenuClosed event	2015-03-11 12:48:17 -05:00
PabstMirror	858e5def5a	Interact menu event consistant ... "interactMenuOpened", to match event from #191	2015-03-11 12:45:01 -05:00
KoffeinFlummi	fabecdd0d3	Merge branch 'master' into medical-basic	2015-03-11 18:20:16 +01:00
KoffeinFlummi	a641a5db8b	Make use of fnc_setUnconscious	2015-03-11 18:08:29 +01:00
KoffeinFlummi	8d22b61a2d	Assign structural damage to torso	2015-03-11 18:08:00 +01:00
PabstMirror	95d59a1b3a	Headers	2015-03-11 02:06:07 -05:00
Nicolás Badano	8c7a51eac7	Added addClassAction and removeClassAction functions	2015-03-11 01:43:37 -03:00
Nicolás Badano	3dfef439e5	Delay the interactMenuClosed event until after the statement is executed, just in case it's needed to clean up afterwards.	2015-03-11 00:49:46 -03:00
Nicolás Badano	28929df32d	Avoid submenus running statements when they open. Instead just check if the hovering action should runOnHover	2015-03-11 00:39:23 -03:00
Nicolás Badano	c573b1048d	Made medical diagnosis statements run on hover	2015-03-11 00:38:31 -03:00
Nicolás Badano	f12e4ab751	Add the runOnHover parameter	2015-03-11 00:37:59 -03:00
Nicolás Badano	7138fadd71	Support additional parameters for addAction API	2015-03-11 00:25:45 -03:00
Nicolás Badano	722f49acc4	Execute statement when hovering over actions that open submenus	2015-03-11 00:21:05 -03:00
PabstMirror	d6e7775cac	Can Show: Hide when gun up	2015-03-10 22:11:25 -05:00
PabstMirror	13e6ae60b2	Settings Menu, Mils, Localization	2015-03-10 21:48:57 -05:00
Nicolás Badano	b33127d3b0	Renamed variable	2015-03-10 23:45:46 -03:00
Nicolás Badano	e97467b3e3	Throw an event when the interact menu is closed	2015-03-10 23:36:28 -03:00
Nicolás Badano	14b97de930	Cache the generation of active action trees for action points. This sensibly cuts down the execution of action conditions.	2015-03-10 23:23:13 -03:00
Nicolás Badano	fab81c8701	Added helper function to cache generic function calls for a given time	2015-03-10 23:20:05 -03:00
commy2	cad5456010	function to check if an object is alive	2015-03-10 23:35:05 +01:00
PabstMirror	794a1f9922	Wirecutter handles interact event ... adds helper objects to all fences that have actions	2015-03-10 16:01:46 -05:00
PabstMirror	49cef030d5	Add "interact_keyDown" local event to interactMenu	2015-03-10 15:48:08 -05:00
Glowbal	1da67d7b48	First draft of triage card	2015-03-10 21:12:35 +01:00
jaynus	59db61e192	Performance counter macros	2015-03-10 12:59:40 -07:00
Glowbal	45dbb0524c	Merge pull request #181 from KoffeinFlummi/Additional_UI_Client_settings ... Additional ui client settings #177	2015-03-10 19:55:44 +01:00
Glowbal	a4d73e1b01	DEFUNC -> DFUNC	2015-03-10 19:51:51 +01:00
PabstMirror	1dd270812d	Finish keybind conversion for old interact	2015-03-10 12:47:58 -05:00
PabstMirror	7173037cb0	Fix 2 broken keybinds	2015-03-10 12:45:08 -05:00
commy2	b2e8ca5dbc	zipper sounds for opening backpacks	2015-03-10 17:48:24 +01:00
commy2	025c45dccc	remove lockbackpacks code, add sound and camshake, ref #178	2015-03-10 17:18:21 +01:00
PabstMirror	3f32627d61	Implement Unconc Event Handler	2015-03-10 11:08:15 -05:00
PabstMirror	93a1cdaab6	setCaptivityStatus in setUnconsicous	2015-03-10 10:35:00 -05:00
commy2	eeb07f2bf6	rename lockbackpacks to backpacks	2015-03-10 15:58:29 +01:00
PabstMirror	6ac83b7702	Cleanup	2015-03-09 18:53:19 -05:00
PabstMirror	35f72e0fda	Dynamic Inventory Size	2015-03-09 18:46:51 -05:00
Glowbal	e741c8a12b	Config stuff	2015-03-09 22:36:25 +01:00
PabstMirror	1cf8843cae	Show Waypoints on map	2015-03-09 16:28:29 -05:00
Glowbal	4b171f9507	Indentation	2015-03-09 22:27:01 +01:00
Glowbal	6b91cefb90	Minor fixes and added pain status	2015-03-09 22:23:37 +01:00
PabstMirror	ce5595e107	BIS_fnc_gridToPos	2015-03-09 16:09:00 -05:00
Glowbal	8cc0361cb4	localization and displayText fixes	2015-03-09 22:08:43 +01:00
Glowbal	8a3eac2aa0	Added medical actions to sub menu ... Added statements	2015-03-09 22:08:32 +01:00
Glowbal	f62335f71c	Fixed custom conditions	2015-03-09 21:42:09 +01:00
Glowbal	5afc651519	fixed incorrect tourniquet classname	2015-03-09 21:41:58 +01:00
Glowbal	6aae11944b	config fixes	2015-03-09 21:41:43 +01:00
Glowbal	a37afec70e	fixed inheritance of treatment classes	2015-03-09 21:14:39 +01:00
Glowbal	9b856ea38b	Merge branch 'master' into Medical_Improvements	2015-03-09 21:08:18 +01:00
Glowbal	f7159084c3	Made the menu slightly wider	2015-03-09 21:05:11 +01:00
Glowbal	aeb4c91792	Added interaction menu actions for advanced medical	2015-03-09 21:05:01 +01:00
Glowbal	f6fbef980a	Added support for bandaging a specific injury class on a selection	2015-03-09 20:03:17 +01:00
PabstMirror	0fd49d179d	doh	2015-03-09 13:55:07 -05:00
PabstMirror	29bd613445	canShow base	2015-03-09 13:53:49 -05:00
PabstMirror	1d6cfbf6b7	Various Changes	2015-03-09 13:52:15 -05:00
Garth L-H de Wet	ece4c8e0bc	Merge branch 'master' into explosiveInteraction	2015-03-09 20:07:42 +02:00
Glowbal	c7ede12b99	Removed weapon select, is now just grenade throw	2015-03-09 19:03:55 +01:00
PabstMirror	f387da1475	Working Base MicroDAGR	2015-03-09 10:46:59 -05:00
commy2	107fec4245	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-08 19:52:12 +01:00
commy2	55f49eaa1c	fix shitty initSpeed definitions breaking SD mags, fix #182	2015-03-08 19:51:52 +01:00
Glowbal	fc1a52d48b	Added events for unconscious	2015-03-08 17:52:40 +01:00
Glowbal	85cbe5eb5f	Added support for locality switch and killed units	2015-03-08 17:50:06 +01:00
Glowbal	445ee87067	Merge branch 'master' into Additional_UI_Client_settings	2015-03-08 17:13:40 +01:00
Glowbal	252663fd81	Readded checkBloodPressure and checkPulse actions.	2015-03-08 17:13:17 +01:00
Glowbal	f08f8beeff	Merge branch 'master' into Additional_UI_Client_settings ... Conflicts: addons/reload/CfgEventHandlers.hpp addons/reload/functions/fnc_checkAmmo.sqf	2015-03-08 17:03:25 +01:00
Glowbal	2250255d65	Clientside display text option for weapon jamming	2015-03-08 16:57:06 +01:00
Glowbal	d919c2436d	Clientside display text option for weapon reload	2015-03-08 16:56:57 +01:00
Glowbal	358a95381b	Clientside display text option for weapon grenades	2015-03-08 16:56:47 +01:00
Glowbal	c7edd83296	Improvements made for airway implementation	2015-03-08 15:58:35 +01:00
Glowbal	cf82966d57	fixed pain with advanced medical	2015-03-08 15:13:44 +01:00
Glowbal	4ed19dce75	Fixed injured sounds	2015-03-08 15:13:32 +01:00
Glowbal	784a5e9fcb	Synchronizing of vital values across the net every 10-25 seconds	2015-03-08 13:56:24 +01:00
Glowbal	2e07aabd41	wrong function name	2015-03-08 12:28:17 +01:00
Glowbal	e6042ca04f	Added revive state / prevent death and unconscious conditions	2015-03-08 12:27:52 +01:00
Glowbal	d016874583	Expanded the medical settings	2015-03-08 12:05:52 +01:00
PabstMirror	81a944457b	Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding ... Key Bind Redo (switch to new CBA 150306)	2015-03-07 14:09:52 -06:00
PabstMirror	7ed682a849	Fix Parachutes	2015-03-07 13:48:39 -06:00
Felix Wiegand	8f9ced3f8e	Merge pull request #154 from KoffeinFlummi/fcs-improvements ... Refine bullet tracing in FCS extension	2015-03-07 19:31:33 +01:00
Nicolás Badano	8962ee5d51	Fix the FCS reset action	2015-03-07 14:56:20 -03:00
Nicolás Badano	bcf533292a	Remove weapon initVelocities for guns with FCS	2015-03-07 14:12:00 -03:00
PabstMirror	3940ba9a62	opps	2015-03-07 10:58:34 -06:00
PabstMirror	e191105200	Merge Changes	2015-03-07 10:36:01 -06:00
PabstMirror	3690f1a733	Pull reload changes from master	2015-03-07 10:32:31 -06:00
Nicolás Badano	31a50ee7aa	Merge pull request #158 from KoffeinFlummi/linkBelt ... Link belt	2015-03-07 13:00:26 -03:00
Glowbal	657cf14515	Indentation	2015-03-07 13:57:36 +01:00
Glowbal	239ffdc4d2	headers	2015-03-07 13:47:28 +01:00
Glowbal	9590661cc5	Removed left overs	2015-03-07 13:39:09 +01:00
Glowbal	79b3df9815	fixed bodybag classname	2015-03-07 13:37:31 +01:00
Glowbal	dc29cad4cd	Added items for curator and medical supply crate	2015-03-07 13:36:56 +01:00
Glowbal	5718649639	Added medic, medical vehicle and medical facility modules	2015-03-07 13:25:28 +01:00
Glowbal	bf8c9dc6f9	Implemented support for different medic roles	2015-03-07 13:16:32 +01:00
Glowbal	d780592629	Fixed issue with addToInjuredCollection	2015-03-07 13:06:50 +01:00
Glowbal	1c05f3578c	Added moduleMedicalSettings	2015-03-07 13:06:33 +01:00
Glowbal	f322884176	Added medical settings module	2015-03-06 22:54:44 +01:00
Glowbal	e2acb2385b	Support for a max damage value for wounds	2015-03-06 22:41:20 +01:00
Glowbal	fc0d6e8e1c	Updated author information in the config	2015-03-06 20:04:48 +01:00
Glowbal	fd44f7bca6	Indentation	2015-03-06 19:57:45 +01:00
Glowbal	8687f8d073	Changed font sizes and removed animation button.	2015-03-06 19:56:43 +01:00
Glowbal	50bdc1d4c7	Disable unused buttons	2015-03-06 19:56:15 +01:00
Glowbal	8064253a4d	Formatting, indentation, minor refactoring + fix for opening settings menu	2015-03-06 18:15:32 +01:00
KoffeinFlummi	a45486cfc8	Remove superfluous todos	2015-03-06 07:36:13 +01:00
KoffeinFlummi	8b11759fe4	Fix faulty interaction config	2015-03-06 07:32:23 +01:00
Nicolás Badano	9010f7a926	Change main action point for static weapons to the gunnerview selection	2015-03-06 01:35:12 -03:00
Nicolás Badano	5d68969b63	Added action for checking ammo on others MG's belts and on Static Weapons	2015-03-06 01:34:38 -03:00
Nicolás Badano	7b4487e8fc	Split checkammo function	2015-03-06 01:32:47 -03:00
Nicolás Badano	342b3c3a4c	Make reload require ace_interaction	2015-03-06 01:30:51 -03:00
Nicolás Badano	5b4fa6b503	Remove debug stuff	2015-03-05 22:52:37 -03:00
Nicolás Badano	c8f320d501	Fix action hierarchy	2015-03-05 22:52:29 -03:00
Nicolás Badano	6b43c7bc20	Merge branch 'master' into linkBelt ... Conflicts: addons/common/XEH_preInit.sqf addons/interact_menu/functions/fnc_renderMenu.sqf	2015-03-05 22:48:31 -03:00
Glowbal	a724fb406a	Added triage status	2015-03-05 20:55:38 +01:00
Glowbal	bfb6a726ca	Activity log is now used by all logs	2015-03-05 18:53:38 +01:00
Glowbal	199cd05aa0	New variant of the medical information display	2015-03-05 18:43:44 +01:00
Glowbal	3a40a21433	Improvements made to the advanced handleDamage system	2015-03-05 18:42:32 +01:00
Glowbal	10f30fa543	Improvements and fixes for injured loop and enabledFor check	2015-03-05 18:42:08 +01:00
Glowbal	8215abb69d	Fixed variable default values	2015-03-05 18:40:55 +01:00
PabstMirror	4018742f26	Return False on keyUp Code	2015-03-05 02:51:24 -06:00
PabstMirror	5d21cd6cc7	Fix Vector/FCS debounce	2015-03-05 02:46:24 -06:00
PabstMirror	e18cbbfaad	Vector Keys	2015-03-05 02:00:56 -06:00
PabstMirror	0919e59719	Key Bind Redo (except vector)	2015-03-05 01:32:26 -06:00
Glowbal	a11d6b2dff	Merge pull request #169 from KoffeinFlummi/Medical_Medication ... Medical: Advanced medication improvements	2015-03-04 13:16:22 +01:00
PabstMirror	ebf42bb35c	Merge pull request #165 from KoffeinFlummi/arma140inhertiaceFix ... Arma140inhertiace fix	2015-03-03 21:07:58 -06:00
Glowbal	64121c3376	Added injuries to injury list	2015-03-03 23:34:44 +01:00
Glowbal	3fc29673bb	More fixes and improvements for wounds	2015-03-03 23:26:54 +01:00
Glowbal	e4756efaa0	Optimization for new wound system	2015-03-03 22:13:22 +01:00
PabstMirror	9d4a0be0db	FCS - FCSMags could be undefined, and cause probs ... Shooting the B_apc_tracked_01_rcws_F, veh variables aren't defined and cause problems downstream. 14:40:58 Error in expression <ir select 1) * _r, _l ]; _vel = _vdir vectorMultiply _adjustSpeed + vectorMagn> 14:40:58 Error position: <vectorMultiply _adjustSpeed + vectorMagn> 14:40:58 Error Type Number,Not a Number, expected Number 14:40:58 File z\ace\addons\common\functions\fnc_changeProjectileDirection.sqf, line 42	2015-03-03 15:09:38 -06:00
Glowbal	c5a27d3cd7	Support for unlimited dosages	2015-03-03 20:16:04 +01:00
Glowbal	7f2d41b1a8	Added onOverDose callback. Allows for medication specific side effects.	2015-03-03 20:12:57 +01:00
Glowbal	7750f2d1b2	Added support for callbacks with heart rate changes through medication	2015-03-03 20:07:09 +01:00
Glowbal	83cdef770a	Can no longer go below zero	2015-03-03 19:58:58 +01:00
Glowbal	8f76832177	Added pain killer medication class draft	2015-03-03 19:57:52 +01:00
Glowbal	f8421b2589	Added support for viscosity adjustment from medication	2015-03-03 19:56:32 +01:00
Nicolás Badano	27808847db	- Solve a number of ASL vs ATL issues ... - Replace the way of calculating 3D positions for subactions	2015-03-03 01:37:17 -03:00
Nicolás Badano	12c0a77f86	Add functions to common for converting between "position" and ASL	2015-03-03 01:37:00 -03:00
Nicolás Badano	1c25baa404	Base interaction distance in distance to head instead of distance to camera. Works much better on third person view	2015-03-03 00:34:34 -03:00
Nicolás Badano	b675d9d180	Compensate for movement during the frame to get rid of jittering	2015-03-03 00:16:38 -03:00
Nicolás Badano	8fd13f3fe5	Activate bandaging conditions	2015-03-03 00:04:15 -03:00
Nicolás Badano	cd00eda8c0	Fix interactions with civilians	2015-03-02 23:30:11 -03:00
Nicolás Badano	83572921ae	- Modification of actions data structure to separate action parameters from children ... - The action tree of each interaction point is parsed before drawing, pruning inactive actions - Parent actions without statements or active children are not drawn, in order to reduce clutter	2015-03-02 23:29:57 -03:00
Nicolás Badano	094be22a19	Move collect children on a sepparate function	2015-03-02 17:53:30 -03:00
Nicolás Badano	472e2c5bff	Reduce opacity of base actions	2015-03-01 20:14:27 -03:00
Nicolás Badano	716eb72d16	Prevent ace_vehiclelock from overwritting mainaction distance	2015-03-01 19:35:18 -03:00
Nicolás Badano	71477f820a	Add displayName to vehicle main actions. Increase range to 10m	2015-03-01 18:47:49 -03:00
Nicolás Badano	a824c1266a	Create an interaction point for the current weapon	2015-03-01 18:29:54 -03:00
Nicolás Badano	8b761e3528	Bandage actions moved from base to second level	2015-03-01 18:28:05 -03:00
Nicolás Badano	8e0158209c	Merge branch 'master' into ace_interactionCleanup	2015-03-01 17:15:24 -03:00
Glowbal	f149a0825a	Merge pull request #167 from KoffeinFlummi/medical-rewrite ... Medical rewrite	2015-03-01 18:04:04 +01:00
Glowbal	7307796e89	Fixed array	2015-03-01 18:03:24 +01:00
Glowbal	076c5abf88	Added a displayName for the wounds	2015-03-01 18:02:56 +01:00
Nicolás Badano	af2faddc70	Merge pull request #164 from KoffeinFlummi/interact_2D ... Cursored self action menu	2015-03-01 12:53:09 -03:00
Glowbal	f690e54af3	Added displayPatientInformation draft	2015-03-01 16:04:53 +01:00
Glowbal	4b584846b4	Replaced disableUserInput by setDisableUserInputStatus ... Makes use of the wrapper around disableUserInput, so it will play nice with others	2015-03-01 14:27:44 +01:00
Glowbal	d5e5ab24f2	Improvements made to heart rate effects	2015-03-01 14:06:44 +01:00
bux578	29459e23c9	fix events	2015-03-01 13:43:39 +01:00
Garth L-H de Wet	3ff1bff2bf	Merge branch 'master' into explosiveInteraction	2015-03-01 14:31:06 +02:00
bux578	f55623130d	Merge branch 'master' into switchUnits_codecleanup	2015-03-01 13:12:15 +01:00
Glowbal	91a52a4b76	Added support for JIP injury synchronizing ... Enabled heart beat sounds	2015-03-01 12:33:05 +01:00
Glowbal	fb763a9d57	Added load and unload actions	2015-03-01 10:44:08 +01:00
Glowbal	769b855255	Added readme	2015-03-01 10:36:52 +01:00
Glowbal	bbfe84565a	Added heartbeat sounds	2015-03-01 10:33:51 +01:00
Glowbal	ba4fc66965	Fixed config mistake	2015-03-01 10:28:42 +01:00
Glowbal	8726e7f1d2	Added CMS equipment items.	2015-03-01 10:25:37 +01:00
Nicolás Badano	526e765144	Added base main actions for vehicle ancestors	2015-03-01 01:35:06 -03:00
Nicolás Badano	47eec69ebe	Removed old config entries	2015-03-01 01:33:38 -03:00
Nicolás Badano	2e0b195cba	Added base action for handheld weapons	2015-03-01 01:32:21 -03:00
Nicolás Badano	78b1d698c1	Added base actions for limbs on CAManBase	2015-03-01 00:52:08 -03:00
Nicolás Badano	2235f84408	Moved handcuffing/uncuffing to top level actions, as we apparently won't be interacting with hands for anything else for the moment	2015-03-01 00:48:29 -03:00
Nicolás Badano	84a7c5de46	Remove config entries for AGM interaction rose	2015-03-01 00:46:59 -03:00
Nicolás Badano	2b0cfac8e4	Removed obsolote code from ace_interaction (#109)	2015-02-28 23:00:24 -03:00
PabstMirror	44e4af2b1a	Still MainTurret probs by Heli_Transport_01_base_F	2015-02-28 19:37:35 -06:00
PabstMirror	93d889031f	1.40 Changes In Config Inhertiance (RC)	2015-02-28 19:06:17 -06:00
Glowbal	437f0fbd8a	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite	2015-03-01 00:13:27 +01:00
Glowbal	9d7e94ca09	Added initial UI element for displaying injuries	2015-03-01 00:13:08 +01:00
KoffeinFlummi	e7c0c78e5d	Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite	2015-02-28 23:36:13 +01:00
KoffeinFlummi	eeb2f6e8bb	Fix script error in setUnconscious	2015-02-28 23:35:53 +01:00
Glowbal	69801a65b0	Removed dead code	2015-02-28 23:34:14 +01:00
Nicolás Badano	a2a9643627	Add option to always display cursor for self interaction	2015-02-28 18:56:57 -03:00
Glowbal	a29cbf6977	Fixed incorrect config variable name	2015-02-28 22:45:12 +01:00
Glowbal	6310d7b582	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite	2015-02-28 22:38:54 +01:00
Glowbal	8f253620c1	Fixed handleDamage wounds	2015-02-28 22:37:39 +01:00
KoffeinFlummi	1689829f93	Get treatment callback structure working	2015-02-28 22:10:20 +01:00
Nicolás Badano	85a77150c9	- Add cursored self interaction menu (for using inside vehicles) ... - Renamed the base menu "SelfActions" to "ACE_SelfActions" - Limit the amount of objects the player is shown interactions with. This are the 3 nearest objects which have active action points visible on screen. - Cull action points that are not visible, to far away, etc before checking if they are active.	2015-02-28 17:48:46 -03:00
Nicolás Badano	e44e13d1b8	Merge pull request #162 from KoffeinFlummi/interactionOptimization ... Interaction Menu plumbing	2015-02-28 17:33:53 -03:00
Glowbal	d50466ac67	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite	2015-02-28 21:09:56 +01:00
Glowbal	68626f54fc	Missing semicolon	2015-02-28 21:09:39 +01:00
KoffeinFlummi	309d42f2e6	God damnit	2015-02-28 21:02:15 +01:00
KoffeinFlummi	46cb963630	Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/XEH_preInit.sqf	2015-02-28 20:58:19 +01:00
KoffeinFlummi	f5fe57232c	Derp 2: The Rederpening	2015-02-28 20:56:55 +01:00
KoffeinFlummi	aea448efe7	Derp	2015-02-28 20:54:23 +01:00
KoffeinFlummi	7f9daeb2f6	Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_init.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf	2015-02-28 20:50:59 +01:00
Glowbal	15afb8846a	Fixed private array and added event listener	2015-02-28 20:50:08 +01:00
Glowbal	18998bb619	Split up the openWounds through the ACE event system ... Based upon the suggestions from Jaynus	2015-02-28 20:48:34 +01:00
KoffeinFlummi	424f156977	Various Cleanups	2015-02-28 20:46:36 +01:00
Glowbal	d293008586	Fixed indentation	2015-02-28 19:28:05 +01:00
Glowbal	451f8b6d0b	Fixed advanced medical handleDamage chain. Now supports killing units.	2015-02-28 19:22:46 +01:00
Glowbal	f1445a4c45	Fixed script errors	2015-02-28 18:59:37 +01:00
Glowbal	9986fddf6b	Fixed undefined _bloodPressure	2015-02-28 18:46:44 +01:00
PabstMirror	dfdee62732	Movement Comments/Formating	2015-02-28 09:26:35 -06:00
Glowbal	5e65d5e9a8	Added support for displayText on treatment actions	2015-02-28 15:46:37 +01:00
KoffeinFlummi	8c6df1b00c	Fix indentation in treatment	2015-02-28 15:23:12 +01:00
KoffeinFlummi	9d7d66a025	Merge branch 'master' into medical-rewrite	2015-02-28 15:22:34 +01:00
KoffeinFlummi	bde6ec1996	Indentation in CfgVehicles	2015-02-28 15:19:49 +01:00
KoffeinFlummi	2873bdf0ed	Add basic anims; add system for prone/self anims	2015-02-28 15:10:58 +01:00
Glowbal	cff3e23d38	More work done on medical ... Added TODOs for remoteFuncExecs to be replaced by event system Added usage of displayTextStructed events Fixed useItem calls instead of useItems	2015-02-28 13:17:17 +01:00
Glowbal	65137b347b	Replaced quote(func for quote(dfunc	2015-02-28 13:02:05 +01:00
Glowbal	bbc2a62476	Rewrite of unconscious. Now supports basic method of unconsciousness.	2015-02-28 12:05:22 +01:00
Glowbal	1e377d460e	now also resets used medication on init	2015-02-28 11:48:11 +01:00
Glowbal	6d01a00901	Added storage for all logs	2015-02-28 11:47:35 +01:00
Glowbal	05d2d9de6b	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/XEH_preInit.sqf	2015-02-28 11:43:38 +01:00
Glowbal	49e04ae7bb	Added more treatment options and variables to init	2015-02-28 11:41:27 +01: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	901a06587d	Merge pull request #144 from KoffeinFlummi/cseSoundWaves ... CSE sound waves	2015-02-27 15:32:16 -06:00
PabstMirror	bf21a8bc91	Pull configSetting from upstream	2015-02-27 15:28:48 -06:00
PabstMirror	d55aed0813	Inv Screen Rough WIP	2015-02-27 15:23:46 -06:00
Nicolás Badano	2371bc1bb0	Removed the renderDepth variables	2015-02-27 02:35:37 -03:00
Nicolás Badano	08b15315bf	Fixed removeAction; added trekkie examples	2015-02-27 02:20:28 -03:00
Nicolás Badano	3d8854f84a	Fixed opacity of icons; removed debug traces	2015-02-27 02:07:35 -03:00
Nicolás Badano	310710b6e2	Major plumbing upgrades on interact_menu: ... - Store only one compiled menu per class - Actions added through apis for invidual objects stored on the object separately - Replaced the concept of uids by paths. This allows adding/removing actions inside other actions loaded from config seamlessly. - Temporarily removed caching of nearby actions (probe). We may go back to that if needed pretty easily. This allows the player to move freely with the interaction menu opened.	2015-02-27 01:55:16 -03:00
PabstMirror	e94d7e33dc	Merge branch 'master' into disarmingTest	2015-02-26 15:01:37 -06:00
Garth L-H de Wet	fcb7e8b1bd	Merge branch 'master' into explosiveInteraction	2015-02-26 22:30:04 +02:00
PabstMirror	7e2283115c	Merge pull request #155 from KoffeinFlummi/fixSurrendering ... Fix surrendering/handcuffs	2015-02-26 14:22:48 -06:00
KoffeinFlummi	fe79e624ff	Derp	2015-02-26 07:41:56 +01:00
Glowbal	5b50910ef6	Fixed incorrect size	2015-02-25 11:23:35 +01:00
KoffeinFlummi	ddadabc661	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf addons/medical/config.cpp addons/medical/equipment/Atropin-pen_used.p3d addons/medical/equipment/Bandage-Pack.p3d addons/medical/equipment/Bandage-elastic.p3d addons/medical/functions/fnc_ActionCheckPulse.sqf addons/medical/functions/fnc_ActioncheckBloodPressure.sqf addons/medical/functions/fnc_actionCarryUnit.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf addons/medical/functions/fnc_actionCheckResponse.sqf addons/medical/functions/fnc_actionDragUnit.sqf addons/medical/functions/fnc_actionLoadUnit.sqf addons/medical/functions/fnc_actionPlaceInBodyBag.sqf addons/medical/functions/fnc_actionRemoveTourniquet.sqf addons/medical/functions/fnc_actionUnloadUnit.sqf addons/medical/functions/fnc_cleanUpCopyOfBody.sqf addons/medical/functions/fnc_getBloodVolumeChange.sqf addons/medical/functions/fnc_getUnconsciousCondition.sqf addons/medical/functions/fnc_handleDropUnit.sqf addons/medical/functions/fnc_handleHeal.sqf addons/medical/functions/fnc_handleTreatment_Action_AirwayLocal.sqf addons/medical/functions/fnc_handleTreatment_Action_BandageLocal.sqf addons/medical/functions/fnc_handleTreatment_Action_CPR.sqf addons/medical/functions/fnc_handleTreatment_Action_Stitching.sqf addons/medical/functions/fnc_handleTreatment_Action_fullHeal.sqf addons/medical/functions/fnc_handleTreatment_Action_fullHealLocal.sqf addons/medical/functions/fnc_handleTreatment_Category_Advanced.sqf addons/medical/functions/fnc_handleTreatment_Category_Airway.sqf addons/medical/functions/fnc_handleTreatment_Category_Bandaging.sqf addons/medical/functions/fnc_handleTreatment_Category_Medication.sqf addons/medical/functions/fnc_handleUnitVitals.sqf addons/medical/functions/fnc_initalizeModuleCMS.sqf addons/medical/functions/fnc_makeCopyOfBody.sqf addons/medical/functions/fnc_moduleAssignMedicalEquipment.sqf addons/medical/functions/fnc_moduleBasicRevive.sqf addons/medical/functions/fnc_onKilled.sqf addons/medical/functions/fnc_onStartMovingUnit.sqf addons/medical/functions/fnc_onTreatmentCompleted.sqf addons/medical/functions/fnc_registerUnconsciousCondition.sqf addons/medical/functions/fnc_setDead.sqf addons/medical/functions/fnc_setUnconscious.sqf addons/medical/ui/define.hpp addons/medical/ui/menu.hpp	2015-02-24 22:35:05 +01:00
KoffeinFlummi	daff184f75	More work on basic callbacks.	2015-02-24 22:09:31 +01:00
Glowbal	5883c673e4	Merge branch 'displayTextRemoteClients' of github.com:KoffeinFlummi/ACE3 into displayTextRemoteClients	2015-02-24 20:25:43 +01:00
Glowbal	e10c907454	Added missing header arguments	2015-02-24 20:25:34 +01:00
PabstMirror	80ac6d83de	Zeus Module Messages	2015-02-24 12:44:54 -06:00
PabstMirror	97d1889971	Shift Display to Right if Zeus Interface is open	2015-02-24 12:40:22 -06:00
PabstMirror	ae3de331c4	Module At Mission Start (Issue #148)	2015-02-24 11:51:37 -06:00
PabstMirror	233647a144	Merge branch 'master' into fixSurrendering	2015-02-24 11:37:28 -06:00
PabstMirror	5364980997	Zeus Module Hints	2015-02-24 11:36:49 -06:00
Glowbal	37031b5002	Replaced execRemoteFnc by ACE event system	2015-02-24 18:10:40 +01:00
Glowbal	278f0ab889	Fixed indentation ... Added check for AI units	2015-02-24 18:02:41 +01:00
PabstMirror	85c568a061	Comments	2015-02-24 10:27:53 -06:00
Glowbal	6fde2de40f	Improved localization support and sendDisplayText to remote client objects.	2015-02-24 17:14:19 +01:00
Garth L-H de Wet	a13fe3e9ce	Merge branch 'master' into explosiveInteraction	2015-02-24 00:14:09 +02:00
Glowbal	65eb69fece	Added examine actions	2015-02-23 20:35:36 +01:00
Nicolás Badano	669568cafe	Merge pull request #157 from KoffeinFlummi/selfInteractionMenu ... Self action menu and Action menu on selections	2015-02-23 14:24:43 -03:00
Glowbal	4a64716420	Added support for displaying a treatment icon for the action	2015-02-23 18:19:35 +01:00
Glowbal	40d98b04a4	Merge pull request #145 from KoffeinFlummi/standardize_ui ... Standardize UI	2015-02-23 18:11:11 +01:00
Glowbal	fe0363ab48	Now dynamically collects the available damageTypes	2015-02-23 16:18:33 +01:00
Glowbal	bb89816a70	Replaced FUNC for DFUNC	2015-02-23 10:23:09 +01:00
PabstMirror	744f37d18a	DragandDrop Frisking WIP	2015-02-22 18:44:33 -06:00
Glowbal	df710235d5	Added useItems ... Fixed header on hasItems	2015-02-22 19:50:14 +01:00
Glowbal	bcb5bb59f6	Basic actions can now use any of the advanced treatment items.	2015-02-22 18:46:49 +01:00
Glowbal	cbfb413f22	Changed: an array now means that it can be any of the given items	2015-02-22 18:42:30 +01:00
Glowbal	8b3e5ac8e2	Added hasItems function	2015-02-22 18:38:06 +01:00
Glowbal	2b061e8de3	Added itemConsumed attribute	2015-02-22 18:34:59 +01:00
Glowbal	b05e09ccb8	Added advanced treatment actions	2015-02-22 18:33:46 +01:00
KoffeinFlummi	ca930a5717	Add basic treatments, rename onProgress	2015-02-22 17:45:46 +01:00
Glowbal	ab6bc998c2	Added canAccessMedicalEquipment check	2015-02-22 15:01:31 +01:00
Glowbal	82c181cd7c	Fixed header	2015-02-22 14:54:54 +01:00
Glowbal	5e0eb7323a	Added option to toggle between progressbar top and bottom	2015-02-22 14:38:48 +01:00
Glowbal	77666e8097	Added weapon resting state icon	2015-02-22 13:58:51 +01:00
Glowbal	dd51037c5e	Added support for image color	2015-02-22 13:44:17 +01:00
Glowbal	9d44ec18b8	Added a default text color setting	2015-02-22 13:35:05 +01:00
Glowbal	323d673eec	Removed deprecated config entries (DisplayMessage and DisplayInformation)	2015-02-22 13:20:17 +01:00
Glowbal	7f6a647b4d	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite	2015-02-22 12:26:19 +01:00
Glowbal	56dad70a9e	Removed redundant level checks	2015-02-22 12:26:08 +01:00
Kieran	c8bf9d2ce1	Changed 'impacted' to 'crushed' ... Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate	2015-02-22 21:25:28 +10:00
Kieran	7ea31f8b05	Added causes to contusions - ace_med_treatment.hpp ... Added vehiclecrash and falling to contusion causes. (As those two situations commonly do result in bruising)	2015-02-22 21:21:27 +10:00
Glowbal	14411a5ef0	Fixed weird fix for getNumber for Array bug in setSettingFromConfig.	2015-02-22 11:36:21 +01:00
Glowbal	1ed50bfe3e	Fixed font size	2015-02-22 11:35:52 +01:00
Glowbal	47e27d7be3	Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui	2015-02-22 11:19:46 +01:00
Glowbal	8393645df9	Changed position to be inline with the weapon selector UI element by default	2015-02-22 11:19:32 +01:00
Glowbal	a574487166	Added localization support for displayText	2015-02-22 11:19:10 +01:00
Glowbal	9f3a0fe8d4	Removed displayInfo and displayMessage functions.	2015-02-22 11:18:37 +01:00
Glowbal	9dc33c659d	Now takes selections into account	2015-02-22 10:56:46 +01:00
Glowbal	bdaec01112	Added medication overdose and wearoff.	2015-02-22 10:27:57 +01:00
Glowbal	fa2d0c6b06	Specified bleeding rate more accurately for subclasses	2015-02-22 09:40:36 +01:00
Glowbal	8e539bfb56	Added ability to use subclasses for injuries. ... Allows for usage of minor, medium and large injury variants.	2015-02-22 09:27:01 +01:00
PabstMirror	8945f99be1	Fix CurrentChannel ... GVAR -> FUNC onEachFrame exits when channel control is closed	2015-02-21 21:19:54 -06:00
PabstMirror	11be8f6f8f	Merge pull request #156 from KoffeinFlummi/nightVisionCleanup ... Night vision cleanup	2015-02-21 20:21:04 -06:00
Glowbal	e091ba1fd1	Added hasMedicalEnabled	2015-02-22 00:49:38 +01:00
Glowbal	e21046459e	Fixed location checking in treatment call	2015-02-22 00:47:14 +01:00
Glowbal	ab045e49c8	Fixed incorrect function calls for location	2015-02-22 00:45:58 +01:00
Glowbal	1781629c13	Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions.	2015-02-22 00:44:11 +01:00
Glowbal	b9213e8abc	Added use and has item functions for medical	2015-02-22 00:34:16 +01:00
Glowbal	c2b8e9031f	Increased the type and causes of injuries for advanced medical.	2015-02-22 00:25:07 +01:00
Glowbal	73c91af533	Added separate config parsing for basic and advanced	2015-02-22 00:24:50 +01:00
Glowbal	3f12af8b21	Added onTreatmentCompleted event calls	2015-02-21 23:17:20 +01:00
Glowbal	e5941e55fc	Added reactionToDamage and onTreatmentCompleted event	2015-02-21 23:14:21 +01:00
Glowbal	925aa094c7	Added place in bodybag function	2015-02-21 21:53:07 +01:00
Glowbal	46f28763b6	Added triage card and activity log	2015-02-21 21:47:10 +01:00
Glowbal	0d24ad5c0a	Removed outdated injury defines file	2015-02-21 21:33:07 +01:00
Glowbal	95ff4b151c	Added addHeartRateAdjustment function	2015-02-21 21:32:25 +01:00
Glowbal	72e2690b81	Fixed incorrect animation function call	2015-02-21 21:28:59 +01:00
Glowbal	909a87fdd3	Added tourniquet treatment functions	2015-02-21 21:26:39 +01:00
Glowbal	308e165cb6	Fixed headers	2015-02-21 21:25:37 +01:00
Nicolás Badano	6b7f649244	interact_menu: add headers	2015-02-21 17:11:03 -03:00
Glowbal	ead5f2ee79	Added new injury and treatment systems for advanced medical	2015-02-21 21:10:57 +01:00
Glowbal	b3e7431e67	Added new treatment framework	2015-02-21 21:09:57 +01:00
Garth L-H de Wet	2ad0aab2bb	Merge branch 'master' into explosiveInteraction	2015-02-21 13:17:08 +02:00
KoffeinFlummi	3482633fb1	Basic treatment structure	2015-02-20 22:04:01 +01:00
Nicolás Badano	96abddc31b	Ability to link a belt of ammo to an AR's machinegun while he's firing. Non stop suppresion!	2015-02-20 02:45:17 -03:00
Nicolás Badano	2c05db3ffb	Create an interaction point for the current weapon	2015-02-20 02:04:00 -03:00
PabstMirror	9935ac57bd	Base Cleanup ... Headers Formating Small optimizations	2015-02-19 19:32:41 -06:00
Garth L-H de Wet	9d1b1e1b12	Explosives are now placed first and then the trigger is set afterwards.	2015-02-20 03:28:16 +02:00
Nicolás Badano	908f23a78f	Removed filtering actions	2015-02-19 20:10:07 -03:00
PabstMirror	3511a74ef9	Don't show sound if not enabled	2015-02-19 16:59:21 -06:00
Garth L-H de Wet	477d8c9dec	Merge remote-tracking branch 'origin/selfInteractionMenu' into explosiveInteraction	2015-02-20 00:46:56 +02:00
Nicolás Badano	dd92c5e845	Tap on either shoulder. "Tap" animation	2015-02-19 19:45:46 -03:00
Garth L-H de Wet	88af894f55	Added a SetTrigger action to placement items in preparation for changes over to a set trigger after place system as opposed to before.	2015-02-20 00:45:31 +02:00
Garth L-H de Wet	910a6a16ab	Split out the EPEContactStart code into its own function since it was quite long.	2015-02-20 00:44:54 +02:00
PabstMirror	3ade628d87	Handle 3 Soundwave options	2015-02-19 16:42:28 -06:00
Nicolás Badano	bc3a226c64	Text under the icon	2015-02-19 18:56:43 -03:00
Nicolás Badano	41145e5731	reduce size of the menu	2015-02-19 18:03:25 -03:00
Nicolás Badano	0dfeb22ec8	tidy up	2015-02-19 18:03:14 -03:00
Glowbal	b58abaa2c0	Added a transparant background	2015-02-19 22:01:09 +01:00
Glowbal	ab6879845c	Merge branch 'master' into standardize_ui	2015-02-19 21:42:47 +01:00
Glowbal	a81c1fbef5	Overhauled AGM hint.	2015-02-19 21:38:51 +01:00
PabstMirror	a8e269bc18	Cleanup Escort Logic ... No more ERROR spam	2015-02-19 14:34:14 -06:00
Glowbal	2cf0ceff2a	Merge pull request #147 from KoffeinFlummi/common_cleanup ... Clean up of CSE code	2015-02-19 21:33:57 +01:00
PabstMirror	ae61dff44e	Move draw to function (wip)	2015-02-19 14:29:38 -06:00
Garth "L-H" de Wet	455d682706	Merge pull request #128 from KoffeinFlummi/IEDSupport ... IED support	2015-02-19 21:44:00 +02:00
Nicolás Badano	861a6b1775	avoid all submenus opening simultaneously by switching menu paths to use uids	2015-02-19 15:47:59 -03:00
Nicolás Badano	f7d5d615ee	allow actions to be defined for different selections	2015-02-19 15:36:27 -03:00
Glowbal	21199a4ee6	Now uses BIS_fnc_rscLayer	2015-02-19 19:32:49 +01:00
Glowbal	c8d4acfc81	Refactored displayText to no longer use spawn.	2015-02-19 19:29:54 +01:00
Glowbal	b0373de576	Tabs to spaces	2015-02-19 19:14:52 +01:00
Glowbal	612fa69c1c	Renamed string_removeWhiteSpace to stringRemoveWhiteSpace.	2015-02-19 19:12:14 +01:00
Glowbal	8488f10b92	Merge pull request #149 from KoffeinFlummi/cseMissionModules ... Port: CSE Ambiance sound module	2015-02-19 19:07:38 +01:00
Glowbal	af3709f481	Fixed forgotten missionModules.	2015-02-19 19:07:19 +01:00
Glowbal	1ea35548e0	Fixed ambiance sounds module.	2015-02-19 18:40:40 +01:00
Nicolás Badano	30943cbfd4	move the main menu actions to the right cuadrant	2015-02-19 12:03:20 -03:00
Nicolás Badano	a8797fe45a	Fix for the angular spacing of submenus	2015-02-19 12:02:48 -03:00
Nicolás Badano	db5e8bcc34	Modify the opacity of icons along with that of the text	2015-02-19 12:01:47 -03:00
Garth L-H de Wet	96404bc42a	Fixed isNull check not working. Fixed audio not being found.	2015-02-19 15:59:14 +02:00
Nicolás Badano	d055315661	interact_menu: tab to space	2015-02-19 10:49:36 -03:00
Nicolás Badano	53f632c716	Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu	2015-02-19 10:39:28 -03:00
Nicolás Badano	3b35d9d109	Make interact sub menus open as circle sectors instead of full circles	2015-02-19 10:38:09 -03:00
Nicolás Badano	8e6600d5ec	Tweak distances	2015-02-19 10:36:59 -03:00
Garth L-H de Wet	f5a6f6f404	Fixed various points raised in the PR.	2015-02-19 15:30:01 +02:00
Garth L-H de Wet	89a81dbed1	Forgotten function added.	2015-02-19 12:40:21 +02:00
Garth L-H de Wet	00643c3c83	Ensured actual fuse time is used instead of simply 1.	2015-02-19 12:39:13 +02:00
Garth L-H de Wet	8c83320675	Separated dialing phone code into separate function to neaten up the original function.	2015-02-19 12:32:41 +02:00
Garth L-H de Wet	e592f233f3	Merge branch 'master' into IEDSupport	2015-02-19 12:26:38 +02:00
PabstMirror	244d7a5572	Fix opacity fading on other render levels	2015-02-19 03:02:58 -06:00
Nicolás Badano	043987fc93	basic self actions	2015-02-18 18:58:06 -03:00
KoffeinFlummi	7e9a02089f	Merge branch 'medical-visuals' into medical-rewrite ... Conflicts: addons/medical/functions/fnc_handleDamage.sqf	2015-02-18 19:26:30 +01:00
KoffeinFlummi	3aae72aa70	Cleanup	2015-02-18 19:22:35 +01:00
KoffeinFlummi	58873e1c97	Pain Effect	2015-02-18 19:01:25 +01:00
PabstMirror	b86869d7a1	UAV-Recharge Headers	2015-02-17 22:37:04 -06:00
PabstMirror	c6c200a684	comments	2015-02-17 22:24:37 -06:00
PabstMirror	e649c8e853	Headers and formating	2015-02-17 22:07:29 -06:00
PabstMirror	c291f29702	Move model to folder	2015-02-17 22:06:37 -06:00
PabstMirror	c3b5430bc4	NVG KeyBinds	2015-02-17 22:05:52 -06:00
PabstMirror	37216d5144	Remove HandCuff animEH	2015-02-17 17:05:07 -06:00
Glowbal	bfc748fbbe	Added missionmodules.	2015-02-17 07:51:51 +01:00
Glowbal	d86e2464b3	Removed missionModules	2015-02-17 07:51:35 +01:00
Glowbal	d60081a9c3	Renamed missionModules to missionmodules.	2015-02-17 07:49:37 +01:00
PabstMirror	9cdf06383d	Back to getIn	2015-02-16 19:20:55 -06:00
PabstMirror	dc82e50d72	fix	2015-02-16 18:30:35 -06:00
PabstMirror	eee4b256cd	More Changes and add EH	2015-02-16 18:03:09 -06:00
PabstMirror	d3f4f2883f	Merge pull request #150 from KoffeinFlummi/moduleSounds ... Added UAV exchange battery sound	2015-02-16 11:58:11 -06:00
Glowbal	da19a89be8	Replaced _targetUnit for ObjNull ... Replaced _targetUnit for objNull.	2015-02-16 15:56:36 +01:00
PabstMirror	e0d1d08913	Change AnimChange EH	2015-02-15 18:19:01 -06:00
PabstMirror	a0c2a00777	Cleanup	2015-02-15 16:45:13 -06:00
PabstMirror	3c65c422b1	More Surrender Fixes ... Increase "drop hands" animation speed (now just 1/2 of normal) Use "AnimChanged" EH to watch for animation breaks while surrendering Only "crack" the hands up animation if we are in the right animation state	2015-02-15 16:42:00 -06:00
Nicolás Badano	d743006566	make vector keybinds return false so they don't block fcs keyup EH	2015-02-15 18:38:08 -03:00
Nicolás Badano	a1e5931f4e	avoid having to compute distance when it's already passed as a parameter	2015-02-15 18:06:17 -03:00
PabstMirror	dec34b4b30	Surrender Fixes ... Remove XEH GetIn and use vehicleChanged Event Handle Zeus (showHUD) Attempt to handle failed animation change	2015-02-15 14:55:17 -06:00
Nicolás Badano	2105bc18db	Fixes for the FCS; it was missing a lot of calls before FUNCs. ... That made the rangefinder only work once. The flag for preventing holding is not needed becase GVAR(enabled) serving the same purpose.	2015-02-15 17:43:57 -03:00
Nicolás Badano	08af51c4a7	Allow overpressure for static weapons	2015-02-15 17:29:54 -03:00
Nicolás Badano	cb15a7106c	Allow adding FCS to static weapons	2015-02-15 17:26:08 -03:00
Nicolás Badano	b74175ec9e	Don't allow adjusting range if only rangefinder is available	2015-02-15 17:24:24 -03:00
Nicolás Badano	25645c2ae9	mm	2015-02-15 16:25:09 -03:00
Nicolás Badano	be42738881	macros	2015-02-15 15:56:37 -03:00
Nicolás Badano	e8933d69c8	overpressure: renamed more config entries; avoid handheld launchers producing overpressure in addition to backblast.	2015-02-15 15:42:54 -03:00
commy2	618ac2f8f6	change overpressure readme.md	2015-02-15 18:44:10 +01:00
commy2	2252f82de7	rename backblast to overpressure	2015-02-15 18:11:50 +01:00
commy2	f3aa0e58aa	clean up backblast	2015-02-15 17:55:20 +01:00
commy2	3f98d1485e	author name	2015-02-15 17:17:20 +01:00
commy2	f3a94f03ed	clean up backblast	2015-02-15 17:14:09 +01:00
commy2	f460f7fce0	manual merge backblast - master	2015-02-15 15:55:00 +01:00
commy2	0d650f2fad	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-02-15 15:48:58 +01:00
commy2	44aaf3955b	some backblast cleanup	2015-02-15 15:48:40 +01:00
Nicolás Badano	7c95e33322	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-02-15 11:42:54 -03:00
Nicolás Badano	c094c10e46	visible ir strobes	2015-02-15 11:42:20 -03:00
commy2	4f5ab1f8e5	removed common as required addon for attach	2015-02-15 15:34:19 +01:00
commy2	baf9396459	cleanup attach	2015-02-15 15:31:09 +01:00
Glowbal	ac54e8dfd7	Added UAV exchange battery sound	2015-02-15 12:44:34 +01:00
Glowbal	6540158ce1	Removed left over CSE prefix	2015-02-15 10:05:48 +01:00
Glowbal	827ef91fce	Ported CSE Ambiance sound module	2015-02-15 10:03:58 +01:00
commy2	df23b44df5	oops	2015-02-14 23:13:43 +01:00
PabstMirror	1a2a9dd584	Remove support for Anthropomorphism	2015-02-14 15:51:08 -06:00
Glowbal	c3cd9d281d	Removed isHC function. #139	2015-02-14 20:31:44 +01:00
Glowbal	13c2127574	Clean up of old CSE code ... Removed all _F suffixes Reorganized the RPEP list. Removed unnecessary functions.	2015-02-14 20:29:07 +01:00
commy2	0ae41609c2	no fcs for ais	2015-02-14 20:20:03 +01:00
Glowbal	155503d4a1	Merged GUI into common. ... Removed unnecessary GUI functions. Updated displayIcon function to be more dynamic Added client side settings for displaying icons.	2015-02-14 20:06:55 +01:00
commy2	57f8595e9c	clean up aircraft weapons config	2015-02-14 12:47:33 +01:00
commy2	075556c233	author aircraft	2015-02-14 11:36:54 +01:00
commy2	f358d099e6	aircraft config cleanup	2015-02-14 10:58:10 +01:00
commy2	8a348b0024	aircraft, remove old/redundant mag configs	2015-02-14 10:26:52 +01:00
commy2	06efab0082	fix inheritance, new little bird unarmed base class in 1.38	2015-02-14 10:04:50 +01:00
commy2	3d4c43c613	replace tabs with spaces	2015-02-14 09:50:26 +01:00
commy2	b1a1c855d9	fix wrong class inheritance in laser selfdesignate	2015-02-14 09:47:03 +01:00
commy2	20f161a9da	aircraft, remove redundant config entries, documentation	2015-02-14 09:36:35 +01:00
commy2	e72742da31	add macros for transport cargo config	2015-02-14 08:26:30 +01:00
commy2	19cf05314e	fcs reset was still broken	2015-02-14 08:09:52 +01:00
commy2	b2945c34d7	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-02-14 07:51:30 +01:00
commy2	983b44c02a	air burst ammo PFH	2015-02-14 07:51:13 +01:00
PabstMirror	1a61148053	Grenades Cleanup ... Shouldn't be any change to functionality Headers Formating simplifying (waitAndExecute) exceptions/canInteract for keybind	2015-02-14 00:39:09 -06:00
PabstMirror	fb3a610649	Fix bad STR_ACE_Common_ACETeam	2015-02-14 00:39:09 -06:00
commy2	ec29bf37a8	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-02-14 06:38:33 +01:00
commy2	60a7d1d1e6	fix, fcs reset was broken	2015-02-14 06:38:01 +01:00
PabstMirror	f83d83a820	Fix from AGM FFV-holster bug	2015-02-13 22:09:37 -06:00
commy2	d4163223a9	fcs in MP	2015-02-14 05:05:02 +01:00
PabstMirror	ba2ee53804	Nametag changes ... Adds user options for showing soundwaves and default nametag color Before nametags would show effectiveCommander for cursorTarget vehicles, moved this to a module option (default off).	2015-02-13 21:23:40 -06:00
Glowbal	cd5b06da78	Added _returnDamage parameter to damageCaching.	2015-02-13 23:00:23 +01:00
Glowbal	4441b7d0a5	Added missing include	2015-02-13 22:58:48 +01:00
Glowbal	4896198ec2	Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/functions/fnc_handleDamage.sqf	2015-02-13 22:57:43 +01:00
Glowbal	5b507ed9f5	Combined medium and advanced into one, with options to turn on other features. ... Changed wounds for a more diverse variation. Added handleDamage caching for advanced.	2015-02-13 22:55:13 +01:00
PabstMirror	dbd33d5230	Missing fnc define ... Why doesn't calling a nil function throw an error?	2015-02-12 22:13:51 -06:00
PabstMirror	19f3154104	CSE Soundwaves	2015-02-12 21:53:15 -06:00
PabstMirror	d0b0a0e066	Missing =	2015-02-12 20:43:50 -06:00
commy2	a41299b05a	Merge pull request #135 from KoffeinFlummi/syncedScopeAdjustment ... Synced scope adjustment	2015-02-12 16:24:41 +01:00
Nicolás Badano	4a70d16f95	scopes: switch throttledPublicVariable by setVariablePublic	2015-02-12 12:21:46 -03:00
commy2	8b8abd640c	Merge pull request #141 from KoffeinFlummi/setVarPub ... add common_fnc_setVariablePublic	2015-02-12 16:04:11 +01:00
Nicolás Badano	a3dc1df109	scopes: moved getWeaponIndex to common	2015-02-12 11:57:55 -03:00
commy2	7c8840df56	transfer value even if it changed	2015-02-12 15:56:57 +01:00
Nicolás Badano	a4815cb8ac	scopes: reduce control numbers	2015-02-12 11:51:17 -03:00
commy2	b32849a68e	no left hand - weapon IK when swag walking (combat pace)	2015-02-12 14:18:34 +01:00
commy2	ff0348a169	add common_fnc_setVariablePublic	2015-02-12 13:23:38 +01:00
PabstMirror	444f88eb05	Merge branch 'master' into disarmingTest	2015-02-11 16:53:01 -06:00
commy2	ba80eb63eb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-02-11 23:49:58 +01:00
commy2	67b3442d17	getting the fcs to work in MP	2015-02-11 23:49:41 +01:00
Nicolás Badano	e9892f4f7b	Merge pull request #131 from KoffeinFlummi/MagRepackRedo ... Rewrite: Magazine Repack	2015-02-11 19:42:47 -03:00
PabstMirror	7545a6c3d8	Code cleanup	2015-02-11 15:43:08 -06:00
commy2	93927ac77d	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-02-11 22:39:51 +01:00
commy2	d18f470394	allow rangefinder while the fcs is active	2015-02-11 22:39:31 +01:00
Nicolás Badano	681d83f922	Merge pull request #129 from KoffeinFlummi/agmCaptivesPort ... Port: AGM Captives	2015-02-11 18:09:33 -03:00
PabstMirror	69835ec7fb	Fix HMD bug and disarm types	2015-02-11 14:37:18 -06:00
commy2	0d3e103de1	fcs work around for weaponDirection with commander turrets	2015-02-11 20:59:41 +01:00
commy2	4695376f55	fix eventhandler name	2015-02-11 18:49:14 +01:00
commy2	3568d0d72e	fix in fcs vehicleInit	2015-02-11 16:35:42 +01:00
commy2	7360277d09	fix error in canUseFCS	2015-02-11 15:29:42 +01:00
commy2	3f8f08cc8b	no holding key with fcs	2015-02-11 14:51:21 +01: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
KoffeinFlummi	89a505ea44	Remove old effects code	2015-02-10 23:14:56 +01:00
KoffeinFlummi	675b89f360	Add blinding effect to wakeup	2015-02-10 23:14:39 +01:00
KoffeinFlummi	28dbd857c2	Fix generic error	2015-02-10 23:14:11 +01:00
KoffeinFlummi	faa7e1fb63	Merge alive and Zeus conditions	2015-02-10 23:13:52 +01:00
KoffeinFlummi	4ec19429ae	Fix initial value of bloodVolume	2015-02-10 23:13:14 +01:00
bux578	5ef729ee80	small fix	2015-02-10 19:11:58 +01:00
bux578	40e422f95a	added PM's solution	2015-02-10 18:57:23 +01:00
bux578	e14d49393a	Revert "remove file and comments" ... This reverts commit 58b557bd99.	2015-02-10 18:40:06 +01:00
KoffeinFlummi	fe0eac7896	First port of AGM's visual loop.	2015-02-10 18:17:26 +01:00
KoffeinFlummi	fba44f490d	First draft of death prevention	2015-02-10 13:33:40 +01:00
PabstMirror	b3f68467bb	Wrong Actions in CfgMoves	2015-02-09 23:33:50 -06:00
Nicolás Badano	ff5c5a5bac	scopes: Code cleaned up, removed spawns, added standard headers.	2015-02-10 01:22:10 -03:00
Nicolás Badano	eadcd82366	scopes: fixed errors, throttled sync of scope adjustment to all client and local calculation of deflections.	2015-02-09 23:00:40 -03:00
Nicolás Badano	f163e307c8	ace_common: throttledPublicVariable function	2015-02-09 22:59:43 -03:00
bux578	58b557bd99	remove file and comments	2015-02-09 19:07:58 +01:00
bux578	b8fb1cb86d	SwitchUnits: remove PFH and code cleanup	2015-02-09 19:06:28 +01:00
PabstMirror	24bd515814	Commenting and some stringtables	2015-02-08 22:44:23 -06:00
PabstMirror	45c9b65bad	Merge pull request #123 from KoffeinFlummi/attachToVehicles ... Attach to vehicles	2015-02-08 22:21:38 -06:00
PabstMirror	da9fc39103	Headers and Finish Notice	2015-02-08 17:35:21 -06:00
Nicolás Badano	a2b1cf1259	g-forces: updated headers	2015-02-08 19:58:41 -03:00
Nicolás Badano	80778cf8db	overheating: updated headers	2015-02-08 19:54:12 -03:00
PabstMirror	e770a74630	Headers	2015-02-08 16:36:58 -06:00
Nicolás Badano	bedf059af5	Merge branch 'PFH_SwitchUnits' of github.com:KoffeinFlummi/ACE3 into PFH_SwitchUnits ... Conflicts: addons/switchunits/functions/fnc_module.sqf	2015-02-08 19:17:07 -03:00
Nicolás Badano	8a26fbc957	ace_settings: remove debug stuff	2015-02-08 18:36:00 -03:00
Nicolás Badano	1b9d0aa635	ACE_Settings: do not load client settings on dedi servers or HC	2015-02-08 18:29:49 -03:00
PabstMirror	3f6ffa6ac2	Mag Repack - Keep Progress prototype ... Ideas from AGM and CSE Keeps Progress While Repacking if interrupted Added sounds from CSE	2015-02-08 13:48:53 -06:00
Glowbal	a609d00730	Implemented a setDead function. Allows for interception of all kills and using a revive script instead. ... Added playInjuredSound for damaged units. Fixed some mistakes with variable names.	2015-02-08 13:18:08 +01:00
Glowbal	a3c4c60b7f	Added possibility to add unconscious conditions.	2015-02-08 13:06:44 +01:00
Glowbal	633037c1b4	Replaced injuredCollection array for separate PFH for each unit.	2015-02-08 11:34:20 +01:00
Glowbal	3be442c31a	Added initial draft of new player effects handling.	2015-02-08 11:24:36 +01:00
Glowbal	0a161319d2	Added initial draft of setUnconscious	2015-02-08 10:25:03 +01:00
Glowbal	bf762bbdf1	Updated headers to correct format ... Reorganized function names. Added unit vitals loop	2015-02-08 10:01:32 +01:00
Glowbal	35de875382	Added cardiac arrest	2015-02-08 00:08:36 +01:00
Glowbal	b8be7775bd	Updated open wounds injuries to newest CMS version.	2015-02-08 00:07:49 +01:00
Glowbal	aadb289962	Added initial rewrite of CMS vitals script for medium and advanced medical.	2015-02-07 23:55:48 +01:00
Glowbal	26527489d6	Added initial medium wounds. ... Fixed merge conflict.	2015-02-07 23:48:24 +01:00
PabstMirror	6d534e8846	#130 - Surrender Module Prototype	2015-02-07 15:20:51 -06:00
Nicolás Badano	1717d75a20	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings	2015-02-07 10:49:26 -03:00
PabstMirror	fcf39a3916	#118 Sound Effect from CSE	2015-02-06 23:23:33 -06:00
PabstMirror	ed3f28ec6d	Minor Cleanup	2015-02-06 22:24:27 -06:00
PabstMirror	c117e9bf16	Header Examples	2015-02-06 17:03:56 -06:00
PabstMirror	98564fae68	Surrendering	2015-02-06 15:54:26 -06:00
KoffeinFlummi	35386f19d6	Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite ... Conflicts: addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_handleDamage.sqf	2015-02-06 13:48:28 +01:00
KoffeinFlummi	a2ee41f01d	First draft of basic damage handling.	2015-02-06 13:47:17 +01:00
PabstMirror	7a3029b9fd	replace spawns	2015-02-06 03:38:27 -06:00
PabstMirror	82a8fc8ca3	exceptions	2015-02-05 23:11:28 -06:00
PabstMirror	122a38a6aa	More Refactoring	2015-02-05 16:39:45 -06:00
commy2	350741918b	Merge pull request #121 from KoffeinFlummi/moduleSounds ... Module sounds	2015-02-05 01:49:38 +01:00
PabstMirror	435b3b8b86	Move Code out of CfgVehicles	2015-02-04 13:16:19 -06:00
PabstMirror	11cd426b87	Redo XEH	2015-02-04 00:35:51 -06:00
PabstMirror	24ab11a1e2	More work	2015-02-03 23:56:51 -06:00
PabstMirror	4c727fbff5	remoteFncs -> events	2015-02-03 23:13:44 -06:00
commy2	49f0b79962	fcs for turrets	2015-02-04 03:20:55 +01:00
Garth L-H de Wet	4d38e19f8c	Should avoid potential conflicts of IED codes.	2015-02-04 02:19:56 +02:00
Garth L-H de Wet	749d068d2d	Added IED handling (for the player and support for AI). Can dial an IED and it will ring before exploding.	2015-02-04 02:16:47 +02:00
Garth L-H de Wet	f2ef53168b	Added the cellphone as a item.	2015-02-04 02:15:31 +02:00
Garth L-H de Wet	357927902d	Fixed incorrect variable getting in openPlaceUI function.	2015-02-04 02:14:55 +02:00
commy2	47d5befd12	fcs per turrets	2015-02-03 23:03:43 +01:00
Glowbal	596d018f45	Added function PREPs.	2015-02-03 21:48:53 +01:00
Nicolás Badano	18fa6f9850	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings	2015-02-03 17:48:24 -03:00
Glowbal	0a403ff422	Added initial advanced medical handleDamage functionality.	2015-02-03 21:48:08 +01:00
bux578	509bfefff1	fixed SwitchUnits ... needed to wait in initPlayer	2015-02-03 21:47:48 +01:00
Glowbal	a50276ddaf	Added a getTypeOfDamage function.	2015-02-03 21:47:45 +01:00
Nicolás Badano	d65a740b7a	WindDeflection using ace_settings	2015-02-03 17:47:25 -03:00
Nicolás Badano	e57a135750	Missing prep	2015-02-03 16:49:40 -03:00
bux578	903c41308c	works in singleplayer	2015-02-03 20:33:15 +01:00
KoffeinFlummi	79aa8d1c7a	Use macros, remove var assignments	2015-02-03 20:14:34 +01:00
KoffeinFlummi	930fb51a20	Medical: First Draft	2015-02-03 20:09:25 +01:00
Nicolás Badano	146e87f02e	nametags: slightly changed module options to use the new ACE_Settings	2015-02-03 15:47:17 -03:00
Nicolás Badano	b119d5246b	fix in setsettings	2015-02-03 15:46:33 -03:00
commy2	4185299efd	rename agm burst mode to ace burst mode (ai)	2015-02-03 19:38:49 +01:00
Nicolás Badano	9773f7b838	Merge pull request #124 from KoffeinFlummi/GogglesHeaderFix ... Updated headers of the goggles to be as required.	2015-02-03 15:12:30 -03:00
Nicolás Badano	91d2a8c343	Merge pull request #125 from KoffeinFlummi/agmParachutePort ... Agm parachute port	2015-02-03 15:12:12 -03:00
Nicolás Badano	eee5ff604a	Merge pull request #122 from KoffeinFlummi/ExplosivesHeaderFix ... Fixed the headers of the explosives system to be the correct style.	2015-02-03 15:12:00 -03:00
Garth L-H de Wet	9c20706c83	Added a event handler for player vehicle changing. As well as covered the canInteract in key handler.	2015-02-03 11:51:16 +02:00
Garth L-H de Wet	b4d1d6b230	Removed the PFH when the player vehicle is no longer a parachute.	2015-02-03 11:50:33 +02:00
Garth L-H de Wet	c08494cc43	Made use of time instead of diag_ticktime, to take care of time acceleration and so forth.	2015-02-03 11:50:11 +02:00
PabstMirror	4156143ecf	Captives Progress	2015-02-03 00:42:34 -06:00
Nicolás Badano	74d0ae95ff	Change ACE_Settings from modules	2015-02-03 02:53:02 -03:00
Nicolás Badano	92d21af8c6	ACE_Settings: function for updating settings from modules	2015-02-03 02:52:07 -03:00
Nicolás Badano	66045b8d51	ACE_Settings: setSettings tab to space, casting	2015-02-03 02:51:41 -03:00
Nicolás Badano	051ad00806	ACE_Settings: added function to add settings at runtime	2015-02-03 02:37:38 -03:00
Nicolás Badano	658f30b9a2	ACE_Settings: various fixes	2015-02-03 02:37:13 -03:00
Nicolás Badano	2c0d2013d4	ACE_Settings: Added a function to change settings on runtime (e.g. for modules)	2015-02-03 01:45:04 -03:00
Nicolás Badano	857b45453a	ACE_Settings: fix option to reset user setable settings to default	2015-02-03 01:03:26 -03:00
Nicolás Badano	99cf0a75ee	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into aceSettings	2015-02-03 00:45:29 -03:00
Nicolás Badano	91cfb40e6f	ACE_Settings: updated optionsmenu to use the the new system	2015-02-03 00:44:34 -03:00
Nicolás Badano	173169bc3d	Fix in goggles	2015-02-03 00:44:06 -03:00
Nicolás Badano	354b261677	ACE_Settings: added sample setting entry for documentation	2015-02-03 00:43:53 -03:00
Nicolás Badano	67f7842722	ACE_Settings: store settings data on a list	2015-02-03 00:43:23 -03:00
PabstMirror	b38bd016f5	Semicolon and bad p3d data paths ... P3d's had bad \data\ folder, Models not actually used anywhere, but pboProject complains	2015-02-02 20:15:45 -06:00
PabstMirror	982f3b230a	Captives First Pass	2015-02-02 20:04:50 -06:00
PabstMirror	3865598095	AGM_Captives	2015-02-02 19:48:33 -06:00
Nicolás Badano	37199f2ba2	Load client setable settings from profile	2015-02-02 21:14:16 -03:00
Nicolás Badano	0600a72147	Fixes	2015-02-02 21:13:31 -03:00
bux578	d339b9567d	add header & PFH ... WIP	2015-02-02 23:28:27 +01:00
Garth L-H de Wet	9e1cd9a194	Fixed headers to be more consistent with ACE.	2015-02-03 00:05:03 +02:00
Garth L-H de Wet	aca1c0c6cf	Converted to use CBA PFH's and MACROs.	2015-02-02 23:58:24 +02:00
Garth L-H de Wet	966cb6ffdf	Performed initial conversion from AGM to ACE. Added necessary boilerplate files.	2015-02-02 22:52:08 +02:00
Garth L-H de Wet	03cef93ac7	Initiated AGM_Parachute merge.	2015-02-02 22:31:48 +02:00
Garth L-H de Wet	c96882dd02	Fixed incorrect header comment for explosives.	2015-02-02 11:42:14 +02:00
Garth L-H de Wet	7acd7854b7	Updated headers of the goggles to be as required.	2015-02-02 11:04:53 +02:00
Garth L-H de Wet	2440e4fa69	Fixed incorrect indenting with headers in explosives.	2015-02-02 10:35:17 +02:00
PabstMirror	fa002b4db6	Formating and Headers	2015-02-01 14:56:19 -06:00
PabstMirror	01ee35d6c5	Geforces: Fix "Error Zero divisor" ... Adds some simple checks before dividing. Before dropping uniform or playing as a dog would throw script error.	2015-02-01 13:09:17 -06:00
Garth L-H de Wet	eafc9e659c	Fixed the headers of the explosives system to be the correct style.	2015-02-01 20:38:15 +02:00
PabstMirror	1921c73ee8	Merge pull request #99 from KoffeinFlummi/agmUAVRechargePort ... Port AGM: Logistics-UAV refuel/recharage	2015-02-01 11:59:40 -06:00
PabstMirror	42bc8eff1a	wirecutter typenames to lowercase	2015-02-01 11:56:54 -06:00
PabstMirror	58a71e6a66	Merge pull request #97 from KoffeinFlummi/agmWirecutterPort ... Port: AGM Wirecutters	2015-02-01 11:03:20 -06:00
Glowbal	0419b7cbe5	Formatting	2015-02-01 11:17:15 +01:00
Glowbal	96e0d0e758	Removed rouge debug code & dead code	2015-02-01 11:14:21 +01:00
Glowbal	3f0b6650e0	Added weapon resting & weapon jam sounds	2015-02-01 11:11:51 +01:00
PabstMirror	8ceb2aabc1	Attach Stuff	2015-01-31 11:43:58 -06:00
PabstMirror	3f9d96abd3	Placement rewrite	2015-01-31 03:05:07 -06:00
Nicolás Badano	96b7c0d30c	ACE_Settings: replace all ACE_Options	2015-01-30 19:19:45 -03:00
PabstMirror	7519fefee9	Fix Interaction	2015-01-30 16:11:16 -06:00
Nicolás Badano	981978d043	ACE_Settings: replace all ACE_Parameters	2015-01-30 19:06:25 -03:00
Nicolás Badano	e277b05aff	ace_settings: first draft	2015-01-30 18:56:45 -03:00
PabstMirror	08763b6b9f	Initial port of old pull ... Still some problem with interaction...	2015-01-30 14:32:21 -06:00
Thomas Kooi	b2b6591fdd	Merge branch 'master' into cseBasicBallisticsPort	2015-01-30 12:33:00 +01:00
Thomas Kooi	27798fbe8f	Minor optimizations ... Renamed from basic ballistics to wind deflection	2015-01-29 13:58:22 +01:00
PabstMirror	9631154926	Set ADDON variable in XEH_preInit	2015-01-29 01:38:46 -06:00
PabstMirror	aabae5a3bc	ace_interaction to required	2015-01-29 01:01:58 -06:00
PabstMirror	3581ab480c	ace_interaction to required	2015-01-29 01:01:00 -06:00
KoffeinFlummi	bb48d1234c	Merge remote-tracking branch 'origin/interact_menu'	2015-01-28 22:17:27 +01:00
PabstMirror	3bb8775bd2	readme	2015-01-28 14:39:36 -06:00
PabstMirror	9a616a85fc	VehicleSetFuel event ... setFuel says it needs to be local, so switching to event. Put event in common	2015-01-28 14:38:04 -06:00
PabstMirror	4b1e40570e	Port AGM: Logistics-UAV refuel/recharage	2015-01-28 14:29:43 -06:00
Nou	5dfa4304d3	Tweaks	2015-01-28 12:03:30 -08:00
PabstMirror	54ab834e5c	Fix stringtable	2015-01-28 12:54:14 -06:00
Nou	26f353b94d	Merge branch 'master' into interact_menu	2015-01-28 10:19:58 -08:00
Nou	984fee03ac	Merge branch 'interact_menu' of https://github.com/KoffeinFlummi/ACE3 into interact_menu	2015-01-28 10:19:30 -08:00
Nou	8e9883a111	Make sure object actions are set.	2015-01-28 10:18:19 -08:00
PabstMirror	719e308f9b	readme	2015-01-28 12:04:30 -06:00
PabstMirror	bb473f95f0	Func Headers	2015-01-28 12:01:40 -06:00
PabstMirror	d62595e76d	Added some AIA fences	2015-01-28 11:51:42 -06:00
Thomas Kooi	794379c774	Fixed incorrect classname CfgAddons	2015-01-28 18:51:27 +01:00
Thomas Kooi	2e05e5ac39	Replaced isPlayer by EFUNC(common,isPlayer)	2015-01-28 18:02:49 +01:00
Thomas Kooi	44997e1d4a	Removed bullet database concept	2015-01-28 17:58:28 +01:00
Thomas Kooi	8014da1407	Added ACE_weather dependency	2015-01-28 17:48:49 +01:00
Thomas Kooi	b092ecf280	Replaced wind by ACE_wind	2015-01-28 17:48:36 +01:00
Thomas Kooi	a5cef8da3d	Added readme file	2015-01-28 17:38:33 +01:00
Thomas Kooi	2def603a58	Finalized port of basic ballistics	2015-01-28 17:36:47 +01:00
PabstMirror	0647a80aad	Wirecutter - Self->Equipment Action	2015-01-28 03:22:39 -06:00
PabstMirror	39a4977efe	Port: Wirecutting from AGM ... by gpgpgpgp, edited by commy2 Doesn't really work as well as I'd like (some fences are uncuttable)	2015-01-27 22:42:45 -06:00
PabstMirror	3b3944b56c	ProgressBar - Check canInteract (w/ exceptions)	2015-01-27 20:51:12 -06:00
PabstMirror	c14514a3f9	VehLock - canInteract check	2015-01-27 20:11:06 -06:00
PabstMirror	5bfaf7da7d	VehLock - new progessBar	2015-01-27 19:49:21 -06:00
PabstMirror	c0e76dd3c7	Merge pull request #91 from KoffeinFlummi/agmVehicleLock ... Port: Vehicle Lock	2015-01-27 19:30:46 -06:00
PabstMirror	bf791e32c4	Merge pull request #93 from KoffeinFlummi/progresBarNew ... #87 - New Progress Bar	2015-01-27 19:28:51 -06:00
Nicolás Badano	d42be7b5f8	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-27 19:26:32 -03:00
Nicolás Badano	7a08bd3722	common: fixed fnc_addLineToDebugDraw	2015-01-27 19:26:09 -03:00
Nicolás Badano	8bc92482f3	common: function for drawing debug lines	2015-01-27 19:26:06 -03:00
Nicolás Badano	60fa6dfbe6	gforces: fixed prefix for config entries	2015-01-27 19:25:37 -03:00
Thomas Kooi	f52417cc3b	Added readme file	2015-01-27 17:10:16 +01:00
Glowbal	c57cf88965	Merge pull request #85 from KoffeinFlummi/cse_medical_port ... PORT: CSE Medical	2015-01-27 17:06:22 +01:00
bux578	f0c06beb23	fix #95 & add ADDON = bool	2015-01-27 09:01:57 +01:00
KoffeinFlummi	c407553d49	Add remaining READMEs, add helper script	2015-01-26 14:34:48 +01:00
Felix Wiegand	0f027e7e09	Create README.md	2015-01-26 13:56:37 +01:00
Felix Wiegand	7c1703ae11	Create README.md	2015-01-26 13:46:21 +01:00
Felix Wiegand	59563a934c	Create README.md	2015-01-26 13:45:24 +01:00
Felix Wiegand	91bdd36268	Create README.md	2015-01-26 13:44:05 +01:00
Felix Wiegand	bf452b2c24	Create README.md	2015-01-26 13:42:07 +01:00
Felix Wiegand	6037f8e05b	Create README.md	2015-01-26 13:40:31 +01:00
Felix Wiegand	3ed88ca17a	Create README.md	2015-01-26 13:37:41 +01:00
Felix Wiegand	8d24c9fdbd	Create README.md	2015-01-26 13:35:31 +01:00
KoffeinFlummi	3e00ebd12b	Add README for ballistics	2015-01-26 07:36:45 +01:00
PabstMirror	5e932f8c71	Replace calls to progressBar ... Mag repack Defuse Swap Barrel	2015-01-26 00:24:33 -06:00
PabstMirror	7c9dd335e7	Formating	2015-01-25 18:53:08 -06:00
PabstMirror	ce8e0fd938	New Progress Bar	2015-01-25 18:48:32 -06:00
Thomas Kooi	b28fa367cb	Fixed unconscious. Now functions properly again after move from common to medical.	2015-01-25 16:40:47 +01:00
Thomas Kooi	3c60af5a14	Fixed: Changed medicClass to isMedic.	2015-01-25 16:05:09 +01:00
Thomas Kooi	69c45cf54d	Fixed assignMedicalEquipment module	2015-01-25 16:02:49 +01:00
Thomas Kooi	5f8a00a45f	Removed last remaining spawns and sleeps in medical.	2015-01-25 15:41:29 +01:00
Thomas Kooi	8045ebb6ab	Fixed damage parsing for AI & non medical enabled units	2015-01-25 15:02:14 +01:00
Thomas Kooi	73d3869a04	Minor improvements made to handleDamage functions	2015-01-25 14:00:51 +01:00
PabstMirror	c07120c439	Fix Googles Macros	2015-01-25 00:55:35 -06:00
Nicolás Badano	30cd9a7499	me too	2015-01-25 01:16:44 -03:00
Nicolás Badano	05d209191c	common: fixed fnc_addLineToDebugDraw	2015-01-25 01:05:19 -03:00
Nicolás Badano	8d1ee8c2c2	backblast: overhaul ... - Replace firedNear by firedBIS XEH - Calculate the origin of the backblast and overpressure zones using the projectile position and direction - Handle all effects for each unit on their local machine - Posibility of drawing effect cone for debug - Simplified angle calculations	2015-01-25 00:59:20 -03:00
Nicolás Badano	8f0c6f7a1f	common: function for drawing debug lines	2015-01-25 00:56:23 -03:00
Thomas Kooi	95cfe5ce3a	Minor code refactor	2015-01-24 21:16:51 +01:00
commy2	7e4407b9f5	Merge pull request #89 from KoffeinFlummi/byebyeAgmKeys ... Remove AGM key handling routines and remaining stuff from AGM options menu	2015-01-24 20:17:57 +01:00
PabstMirror	a419587042	remove testing debug	2015-01-24 13:14:43 -06:00
PabstMirror	69893a7e99	Attach-use waitAndExecute	2015-01-24 13:14:01 -06:00
PabstMirror	0ca2cb34ea	setVariable names	2015-01-24 12:58:01 -06:00
PabstMirror	09eb5d6c65	Update readme.md	2015-01-24 12:48:28 -06:00
PabstMirror	04d4d5b9ec	Readme	2015-01-24 12:45:11 -06:00
Nicolás Badano	f3dac73fa2	interaction: removed debug info	2015-01-24 15:40:41 -03:00
Nicolás Badano	fc7f778d3e	Reverted deletion of HintConfig.hpp	2015-01-24 15:35:58 -03:00
Nicolás Badano	b8abc85051	Merge branch 'byebyeAgmKeys' of github.com:KoffeinFlummi/ACE3 into byebyeAgmKeys	2015-01-24 15:34:48 -03:00
Nicolás Badano	30b97d7b6b	common: removed commented stuff	2015-01-24 15:34:27 -03:00
Nicolás Badano	33485f6d3f	common: remove AGM key handling routines and remaining stuff from AGM options menu	2015-01-24 15:32:06 -03:00
Nicolás Badano	be550836ea	common: remove AGM key handling routines and remaining stuff from AGM options menu	2015-01-24 15:25:03 -03:00
Felix Wiegand	1c074e8096	Create README.md	2015-01-24 19:13:02 +01:00
Felix Wiegand	232420d21e	Create README.md	2015-01-24 18:53:41 +01:00
Felix Wiegand	b356e3f5ba	Create README.md	2015-01-24 18:51:43 +01:00
Felix Wiegand	bdd9532c24	Add README.md for ai	2015-01-24 18:50:42 +01:00
Nicolás Badano	8affcc0a2e	fixes	2015-01-24 14:30:30 -03:00
Nicolás Badano	dc55ea517e	interaction: cba keybinds	2015-01-24 14:02:47 -03:00
Thomas Kooi	8d34f98909	Moved relevant functions from common to medical. ... Removed unnecessary event function.	2015-01-24 17:18:38 +01:00
Thomas Kooi	e06c5010bb	Moved GUI functionality to medical	2015-01-24 16:34:39 +01:00
PabstMirror	4e31a4b57f	First Pass	2015-01-23 16:40:39 -06:00
PabstMirror	5c8614f11c	Port Vehicle Lock Inital	2015-01-23 16:14:22 -06:00
PabstMirror	47e8282d98	Movement/Climb Keybind	2015-01-23 16:05:14 -06:00
PabstMirror	75c87dfd9b	Option Menu Tweaks	2015-01-23 02:43:43 -06:00
PabstMirror	8a27a49d31	#84 - goggles option error	2015-01-22 16:58:11 -06:00
Thomas Kooi	5234bb984f	Fixed default debug values	2015-01-22 23:49:04 +01:00
Thomas Kooi	80f90751cd	Removed some spawns	2015-01-22 23:47:06 +01:00
Thomas Kooi	dce0b61d57	Added damage threshold module ... Removed debug prints	2015-01-22 23:29:18 +01:00
Thomas Kooi	dc1098233e	Added broadcast flag to addOpenWounds, so we can stack call it followed by a broadcast. ... Improvements made to assignOpenWounds, now better results for single hits.	2015-01-22 22:28:04 +01:00
Thomas Kooi	b173b21c51	Fixed advancedLocal treatment function. Now also selects primary weapon of caller when performing treatment.	2015-01-22 22:25:59 +01:00
Thomas Kooi	e7ebcbe3fb	Added new unconscious condition for bleeding	2015-01-22 22:25:24 +01:00
Thomas Kooi	8137080bbc	Minor code clean up	2015-01-22 22:00:37 +01:00
Thomas Kooi	68ab7b5143	Added AGM handleDamage caching	2015-01-22 22:00:04 +01:00
Thomas Kooi	23f8b8a9ad	Added AGM config changes	2015-01-22 21:59:34 +01:00
Thomas Kooi	183b36d55e	Menu now opens for ACE_player instead of player	2015-01-22 13:33:12 +01:00
Thomas Kooi	0c221c2912	Changed effects only display while in curator view	2015-01-22 13:28:45 +01:00
Thomas Kooi	ae5996bcd2	Fixed animations for carry/drag	2015-01-22 13:12:46 +01:00
PabstMirror	47c3ad1e5e	Remove debug config	2015-01-22 00:17:31 -06:00
Nicolás Badano	14d2a6ee69	Merge pull request #83 from KoffeinFlummi/cseOptionsMenu ... Port: CSE options menu	2015-01-22 02:57:34 -03:00
Nicolás Badano	0d24ddf994	optionsMenu: tweak columns	2015-01-22 02:56:11 -03:00
Nicolás Badano	0c3c0b0e33	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 ... Conflicts: addons/weather/XEH_postInit.sqf	2015-01-22 02:48:48 -03:00
Nicolás Badano	58db703db7	weather: small fix	2015-01-22 02:47:02 -03:00
Nicolás Badano	86e841bc64	optionsMenu: matched the size and font style of the main menu buttons	2015-01-22 02:45:27 -03:00
Nicolás Badano	96289b6395	optionsMenu: added localization to menu name	2015-01-22 02:44:45 -03:00
jaynus	0df7f86d66	Merge pull request #74 from KoffeinFlummi/lasers ... laser_selfdesginate commit for commanche	2015-01-21 21:39:17 -08:00
Nicolás Badano	f73a456fb0	optionmenu: increase size	2015-01-22 02:33:51 -03:00
jaynus	81ae9e6e8f	Javelin fixed and firing TDA terminal kill. Direct selection needs to be completed.	2015-01-21 21:31:58 -08:00
Nicolás Badano	b6f35cc015	define all sizes and offsets through macros	2015-01-22 01:48:39 -03:00
Nicolás Badano	91f066b84d	remove quotes	2015-01-22 01:40:17 -03:00
jaynus	eaa157b4c5	Fixed script error on launch missing ;	2015-01-21 20:35:27 -08:00
Nicolás Badano	ccc96eb71c	Merge branch 'cseOptionsMenu' of github.com:KoffeinFlummi/ACE3	2015-01-22 00:58:53 -03:00
PabstMirror	cb561a2d93	Convert Old Ace_Options	2015-01-21 18:19:10 -06:00
PabstMirror	d5916ced9e	Colors from config	2015-01-21 17:43:57 -06:00
PabstMirror	2b62c170fd	Read from config	2015-01-21 17:29:42 -06:00
commy2	b0e7cefb06	Merge pull request #82 from KoffeinFlummi/weather ... weather module	2015-01-22 00:23:40 +01:00
commy2	ce81f6d9f5	kestrel 360, weather	2015-01-22 00:22:09 +01:00
commy2	770a151bf5	CBA keybinding for vector	2015-01-21 23:49:16 +01:00
PabstMirror	fe4a0b9be8	Formating	2015-01-21 16:27:53 -06:00
commy2	1737e3e7fa	vector config, DONE	2015-01-21 23:05:19 +01:00
PabstMirror	a595b48d32	More Locaization	2015-01-21 16:00:54 -06:00
commy2	efb761a14c	vector settings	2015-01-21 22:52:39 +01:00
Thomas Kooi	7020a8ef30	Replaced some PFH by waitandExecute	2015-01-21 21:37:03 +01:00
PabstMirror	c29acb4c68	Localization start	2015-01-21 14:23:33 -06:00
commy2	2c4c1d7db2	add config, settings to vector	2015-01-21 21:15:51 +01:00
PabstMirror	92bbfd92d1	Color Sliders	2015-01-21 13:53:05 -06:00
Thomas Kooi	77bd8f753d	Added AGM blood volume greyness effect	2015-01-21 16:04:34 +01:00
Thomas Kooi	dcd42f55e8	Minor improvements to handleTreatment	2015-01-21 15:53:18 +01:00
Thomas Kooi	7e5806b834	Improved drag and carry actions.	2015-01-21 15:52:59 +01:00
Thomas Kooi	bbf9ce61f0	Changed QGVAR(isDead) to ACE_isDead ... Minor improvements to debug function	2015-01-21 15:52:11 +01:00
PabstMirror	0ae940fdfb	Rough Conversion ... Gut keybind stuff, redo data arrays, reset button, progress on color changer.	2015-01-21 05:43:58 -06:00
Nicolás Badano	2c34c16621	weather: weird syntax!	2015-01-21 02:28:23 -03:00
PabstMirror	09bb14d11b	Options Menu from CSE	2015-01-20 23:27:08 -06:00
Nicolás Badano	306b3250e5	Merge branch 'master' into weather	2015-01-21 02:21:07 -03:00
Nicolás Badano	3a57b477de	weather: replace agm's seasonal by cse's monthly temperatures	2015-01-21 02:12:57 -03:00
Nicolás Badano	59144e7b53	weather: only force set misc parameters on clients	2015-01-21 01:07:33 -03:00
Nicolás Badano	851db25e56	weather: add config data for A3 islands	2015-01-21 01:05:27 -03:00
Nicolás Badano	bba99d64f7	weather: added temperature simulation and air density	2015-01-21 00:14:51 -03:00
Nicolás Badano	0f790267f1	weather: more tabs to spaces	2015-01-21 00:00:32 -03:00
Nicolás Badano	b3d14987bc	weather: sync misc. parameters: lightnings, rainbow, fog	2015-01-21 00:00:06 -03:00
Nicolás Badano	a92ebf4e41	weather: fix for waves sync	2015-01-20 23:59:32 -03:00
Nicolás Badano	64649fa781	weather: tabs to spaces	2015-01-20 23:58:19 -03:00
Nicolás Badano	a35f9a2be4	weather: sync waves	2015-01-20 23:30:49 -03:00
Nicolás Badano	2f12fca967	Wind: remove debug prints	2015-01-20 23:19:57 -03:00
Nicolás Badano	a29e08ed3c	Ensure the transition time for rain is never 0	2015-01-20 23:18:17 -03:00
Nicolás Badano	6d34c310ad	Reduce intensity of initial wind	2015-01-20 23:17:32 -03:00
Nicolás Badano	4a29f6a3c3	Set wind and rain syncing. Change ACE_wind from macro to global variable	2015-01-20 23:17:09 -03:00
Nicolás Badano	71bd34234b	weather: initial port of ACE2 features. variables names changed to use macros.	2015-01-20 20:18:40 -03:00
commy2	b9551f6ad8	split mags from ballistic	2015-01-20 22:40:15 +01:00
Nicolás Badano	2255a56885	Merge remote-tracking branch 'origin/wind_deflection' into weather	2015-01-20 18:10:24 -03:00
commy2	a1432e35d7	fix missing base class	2015-01-20 20:02:43 +01:00
commy2	7071f34131	split flashhiders and uniform/vest nerfs from ballistics	2015-01-20 19:55:17 +01:00
Thomas Kooi	a92430b701	Added events to carry object.	2015-01-20 18:57:53 +01:00
Thomas Kooi	9a0b73bf3a	Changed drag/carry to event driven architecture	2015-01-20 18:57:33 +01:00
commy2	9d687b9b3e	vector: fix potential error in FOS, prep settings, config	2015-01-20 18:26:31 +01:00
commy2	65e12745d6	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-20 13:17:59 +01:00
Glowbal	8554cf7e6c	Can now also remove a medic class through setMedic	2015-01-20 11:57:16 +01:00
Glowbal	72ae6eb08f	Updated playInjured ... Removed sleep. Made use of waitUnitl execute. Changed MP sound broadcasting. No longer using the broadcastSound_F function.	2015-01-20 11:56:00 +01:00
Glowbal	1337c2c562	Made unit loop flag public	2015-01-20 11:36:52 +01:00
PabstMirror	aec687f007	#78 - targetEvent working in SP	2015-01-20 03:54:34 -06:00
Nicolás Badano	544dbb1e29	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-20 02:58:45 -03:00
Nicolás Badano	06743bef52	interaction: fix canInteract and exceptions in agm menu	2015-01-20 02:58:06 -03:00
Nicolás Badano	b6dbd8d3c4	interact_menu: add canInteract (including exceptions) and canInteractWith to condition.	2015-01-20 02:41:04 -03:00
Nicolás Badano	9e11aeb0b9	interaction: fix canInteract and exceptions in agm menu	2015-01-20 02:39:22 -03:00
PabstMirror	cb52ac18c9	Send marker configNames instead of index ... Upstream fix from AGM If CfgMarkers don't match, will throw warning: 22:46:53 [3896,74.535,0,"z\ace\addons\markers\functions\fnc_setMarkerNetwork.sqf:11","WARNING: CfgMarker not found changed to milDot"]	2015-01-19 22:49:39 -06:00
jaynus	7e621616d0	function name error.	2015-01-19 20:19:33 -08:00
jaynus	c5d03ce2c0	GBU and DAGR guidance initializations.	2015-01-19 20:16:33 -08:00
jaynus	16a296e92b	laser_selfdesginate commit for commanche	2015-01-19 20:13:12 -08:00
Nicolás Badano	a5ac89dcb1	make some key events non blocking to allow some actions to share keybinds	2015-01-20 01:12:30 -03:00
Nicolás Badano	3bdd706e5d	Merge remote-tracking branch 'origin/master' into moreCbaKeyBinds	2015-01-20 00:38:18 -03:00
Nicolás Badano	f3746d8391	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu	2015-01-19 23:56:36 -03:00
Nicolás Badano	1cb8da4c21	Merge branch 'interact_menu' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu	2015-01-19 23:56:16 -03:00
commy2	42f2270a3a	stuff	2015-01-20 02:19:31 +01:00
commy2	599dc134d8	simplify stuff	2015-01-20 01:34:26 +01:00
commy2	70b642afc0	get kestrl to work	2015-01-20 01:05:57 +01:00
Nou	ef94011cdc	Menu rendering should be done with the mission event handler for Draw3D because it executes before rendering the current frame, rather than after the current frame.	2015-01-19 15:13:41 -08:00
Nicolás Badano	b0e99ada12	Merge branch 'master' into HEAD	2015-01-19 19:03:02 -03:00
commy2	8c8e14b0ca	port kestrel	2015-01-19 21:13:56 +01:00
commy2	97ee63a349	getting PFH to work on briefing screen, review	2015-01-19 17:47:52 +01:00
commy2	87adbe9b9e	DFUNC	2015-01-19 17:30:04 +01:00
commy2	e55a85cc26	get markers to work	2015-01-19 16:59:00 +01:00
commy2	1c37c76cc6	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into agmPortMarkers	2015-01-19 14:42:25 +01:00
Garth "L-H" de Wet	3f83085aed	Merge pull request #68 from KoffeinFlummi/agmGogglesPort ... Agm goggles port	2015-01-19 13:57:08 +02:00
KoffeinFlummi	4356c0d02b	Add addon variable to FCS	2015-01-19 12:38:07 +01:00
Garth L-H de Wet	2fe155f990	Converted a couple PFHs to use the waitAndExecute function as that is what they were doing. ... Fixed a couple bugs.	2015-01-19 10:34:49 +02:00
Nou	1a2231c14a	Privatize	2015-01-18 20:13:45 -08:00
Nou	84f404ae84	Remove debug, added scripted add/remove actions.	2015-01-18 20:08:34 -08:00
Thomas Kooi	29c4676b20	Added missing variables to private array.	2015-01-19 00:59:19 +01:00
Thomas Kooi	e4b1265a84	Fixed incorrect parameter passing in treatment actions	2015-01-19 00:58:36 +01:00
Thomas Kooi	76e877067c	Fixed examine actions	2015-01-19 00:58:17 +01:00
Garth L-H de Wet	ef19ffad0c	Glasses conditions are local to each unit. No longer global scope on each client.	2015-01-19 01:38:54 +02:00
Garth L-H de Wet	b499cc9a1d	Rain effect is working as expected.	2015-01-19 01:12:45 +02:00
Garth L-H de Wet	10cdbeb4dd	Made the glasses effects slowly fade (not completely away) over 30 seconds.	2015-01-19 01:04:32 +02:00
Thomas Kooi	a890400c55	Fixed tourniquet treatment actions.	2015-01-18 23:58:10 +01:00
Garth L-H de Wet	49e19610c2	Removed a bunch of spawns and used PFH's in their place.	2015-01-19 00:57:39 +02:00
Thomas Kooi	5745408647	Added hold and release functionality for CMS menu.	2015-01-18 23:44:32 +01:00
Nicolás Badano	fc8c391596	nametags: cba keybinds	2015-01-18 19:39:15 -03:00
Nicolás Badano	058aa8d920	interaction: cba keybinds	2015-01-18 19:38:58 -03:00
commy2	9e2eaa96e1	pull master into branch	2015-01-18 23:26:41 +01:00
Garth L-H de Wet	fc18cb443f	Converted Goggles to use ACE/CBA macros.	2015-01-18 23:50:45 +02:00
Thomas Kooi	920453e150	Fixed incorrect personal aid kit model.	2015-01-18 22:37:26 +01:00
Nicolás Badano	112c9f319f	scopes: partial fix	2015-01-18 18:34:45 -03:00
Thomas Kooi	e468832324	Added initial port of CSE medical (CMS)	2015-01-18 22:16:35 +01:00
Nicolás Badano	63af6892eb	fix for safemode	2015-01-18 17:56:12 -03:00
Nicolás Badano	e38eb5c09d	fix for fcs	2015-01-18 17:56:05 -03:00
Nicolás Badano	7895173407	overheating: cba keybinds	2015-01-18 17:08:56 -03:00
Nicolás Badano	5a77e2c220	reload: cba keybinds	2015-01-18 17:05:32 -03:00
Nicolás Badano	9ed9dc916b	resting: cba keybinds	2015-01-18 17:05:17 -03:00
Nicolás Badano	dc8c5758f1	scopes: cba keybinds	2015-01-18 17:01:18 -03:00
Nicolás Badano	60649d780c	scopes: cba keybinds	2015-01-18 17:01:07 -03:00
Nicolás Badano	d8d665cc03	vehicles: cba keybinds	2015-01-18 17:00:43 -03:00
Garth L-H de Wet	0f04d0dfb1	Moved goggles to addons folder and renamed all occurances of AGM to ACE.	2015-01-18 21:43:51 +02:00
Glowbal	b80cec4c18	Merge pull request #45 from KoffeinFlummi/csePort_fixed ... Port from CSE Common.	2015-01-18 20:12:18 +01:00
Thomas Kooi	8dfdd11f3c	Changed tabs to 4 spaces	2015-01-18 20:09:19 +01:00
KoffeinFlummi	a78730d387	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-18 20:03:59 +01:00
KoffeinFlummi	8872424abe	Merge branch 'fcs-extension'	2015-01-18 20:03:40 +01:00
KoffeinFlummi	4978bb5294	Move FCS calculation to extension	2015-01-18 20:02:37 +01:00
Thomas Kooi	86663e8a8e	Changed disableUserInput_f to setDisableUserInputStatus.	2015-01-18 19:54:43 +01:00
Nou	6a04408a74	Initial nou menu commit.	2015-01-18 10:38:27 -08:00
Nicolás Badano	d532caf1a0	fix execNextFrame (#56)	2015-01-18 15:26:26 -03:00
Nicolás Badano	d299331f80	Merge branch 'weaponSelecCbaKeyBinds'	2015-01-18 15:24:15 -03:00
Nicolás Badano	1b1e5fd70d	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fcsCbaKeyBinds	2015-01-18 15:23:32 -03:00
commy2	67fcb0c7b6	Merge pull request #60 from KoffeinFlummi/vectorZoomFix ... Zoom level adjustment. fix #58	2015-01-18 17:19:59 +01:00
commy2	a545efe02c	work on port markers	2015-01-18 17:17:06 +01:00
Nicolás Badano	7bc356008c	fcs: cba keybinds	2015-01-18 12:42:33 -03:00
Nicolás Badano	84fd6de793	fcs: fix to make adjust range up/down work again	2015-01-18 12:40:41 -03:00
Thomas Kooi	63c024bc79	Fixed undefined variable script error	2015-01-18 16:31:40 +01:00
VKing	99a31f8ae8	Zoom level adjustment. Ref #58	2015-01-18 16:03:34 +01:00
Nicolás Badano	415df07af4	weaponselect: replace keybinds for cba 2	2015-01-18 11:57:23 -03:00
Nicolás Badano	b867dc04ed	weaponselect: replace keybinds for cba	2015-01-18 11:30:57 -03:00
Thomas Kooi	b76eabe1c4	Fixed incorrect parameters being given to callback function	2015-01-18 15:17:25 +01:00
Nicolás Badano	4d721418fa	Merge pull request #54 from KoffeinFlummi/laserPointerImprovements ... Laser pointer improvements	2015-01-18 10:03:16 -03:00
PabstMirror	6e8c394903	Standardize Config Version Stuff	2015-01-18 01:32:07 -06:00
commy2	cb8945a879	port markers	2015-01-18 08:20:55 +01:00
bux578	632a3f5e0a	Merge branch 'master' into agmScopesPort	2015-01-18 08:18:24 +01:00
bux578	a1c167844d	fix errors, but still no overlay ... and lots of spawns	2015-01-18 08:13:37 +01:00
commy2	14745af70b	port difficulties	2015-01-18 08:06:25 +01:00
commy2	06f39aa158	port lock backpacks	2015-01-18 07:56:09 +01:00
commy2	e67602d76e	port movement	2015-01-18 06:45:28 +01:00
Nicolás Badano	74bfc31598	laserpointer: various improvements: ... - calculate system of reference vectors to offset the laser start. - as much stuff as possible calculated in ASL, removing all conversions inside loops. - halved the distance in which men are searched. - increased the tolerance when calculating distance.	2015-01-17 23:51:31 -03:00
Nicolás Badano	e7ec905892	Cache the units near to the camera instead of the player. ... Works even when no player exists or is somehow viewing the action remotely.	2015-01-17 23:48:44 -03:00
commy2	8683667d24	add day laser pointer	2015-01-17 23:38:13 +01:00
commy2	fa2acfbb50	vector FOS mode	2015-01-17 22:49:06 +01:00
Nicolás Badano	a1cb57f4db	smallarms: port	2015-01-17 18:14:56 -03:00
Nicolás Badano	daec785600	AGM_Smallarms pre CBA	2015-01-17 18:02:03 -03:00
Nicolás Badano	9247bb3411	safemode: port	2015-01-17 17:32:34 -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	c851a14da9	common: added execNextFrame function	2015-01-17 13:56:24 -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
Nicolás Badano	7fd578326f	Merge pull request #47 from KoffeinFlummi/agmGForcesPort ... Port: AGM_GForces	2015-01-17 01:15:52 -03:00
Nicolás Badano	402156aecf	gforces: renamed function	2015-01-17 01:09:12 -03:00
PabstMirror	4cc57be48c	Cleanup debug	2015-01-16 22:07:53 -06:00
Nicolás Badano	e61b828314	gforces: moved stuff out of config.cpp	2015-01-17 01:01:56 -03:00
Nicolás Badano	43b87cda0b	gforces: tweaked based on pilot feedback (https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573)	2015-01-17 00:59:45 -03:00
Nicolás Badano	f594198eae	gforces: port from AGM	2015-01-16 23:01:41 -03:00
PabstMirror	e260ea5314	Merge branch 'master' into agmMapPort	2015-01-16 19:21:03 -06:00
Nou	82d7f4bd5c	Typo! Closes #46	2015-01-16 17:12:37 -08:00
Thomas Kooi	ef4248650e	Added CSE gui port, minus the radial and configuration menus.	2015-01-17 00:22:37 +01:00
Thomas Kooi	afc103a946	Added CSE common port.	2015-01-17 00:21:47 +01:00
PabstMirror	2483e8f8d8	Merge branch 'master' into agmMapPort	2015-01-16 17:17:48 -06:00
PabstMirror	89654a42d2	Needs Testing	2015-01-16 17:13:26 -06:00
commy2	7678193ca1	remove obsolete stuff	2015-01-16 23:49:29 +01:00
commy2	cd533abd6f	inventoryDisplayLoaded eh	2015-01-16 23:48:30 +01:00
commy2	d66b78bdd5	infoDisplayChanged via addEventHandler	2015-01-16 23:13:51 +01:00
Nicolás Badano	46b25e88c0	respawn: fixed actions and self_actions	2015-01-16 18:23:07 -03:00
Nicolás Badano	4445ec6195	nightvision: fix	2015-01-16 17:57:55 -03:00
Nicolás Badano	4a8e9a65b1	nightvision: Fix #42	2015-01-16 17:56:23 -03:00
Nicolás Badano	7c4af1dc17	nightvision: use ACE events to replace a PFH	2015-01-16 17:25:30 -03:00
Nicolás Badano	5f1a6c40e3	common: raise more local ACE events	2015-01-16 17:16:42 -03:00
Nicolás Badano	9654d3b36d	ACE events fixes	2015-01-16 16:30:48 -03:00
Nicolás Badano	26325bb943	Throw the zeusDisplayChanged ACE event	2015-01-16 15:39:38 -03:00
Nicolás Badano	223600e689	Throw the playerVisionModeChanged ACE event	2015-01-16 15:39:19 -03:00
Nicolás Badano	8b3c70a16d	Add PFH to throw the playerInventoryChanged ACE event	2015-01-16 15:28:37 -03:00
Nicolás Badano	8467013c1a	Moved getAllGear function to common module	2015-01-16 15:24:25 -03:00
Nicolás Badano	7883389a53	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into agmNightVisionPort	2015-01-16 14:35:52 -03:00
Nicolás Badano	5bea43910d	Merge pull request #38 from KoffeinFlummi/aceEvents ... Replace some AGM custom events by ACE events	2015-01-16 14:20:39 -03:00
Nicolás Badano	78cca3c539	interaction: raise "interactionMenuOpened" ACE event locally 2	2015-01-16 12:45:15 -03:00
Nicolás Badano	00e68c4540	interaction: raise "interactionMenuOpened" ACE event locally	2015-01-16 12:42:48 -03:00
Nicolás Badano	bce84d9a2d	respawn: raise "killedByFriendly" ACE event globally	2015-01-16 12:38:43 -03:00
Nicolás Badano	e1b1edc961	noradio: ace local event for playerChanged	2015-01-16 12:14:40 -03:00
Nicolás Badano	34135ffdd4	common: ACE local event for playerChanged	2015-01-16 12:14:18 -03:00
commy2	7cd2bc24c8	port magazinerepack	2015-01-16 15:37:32 +01:00
Nicolás Badano	60270d5415	Change the loop that updates ACE_player from BIS to PFH	2015-01-16 11:30:49 -03:00
Nicolás Badano	cf08d8cfa6	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-16 11:02:30 -03:00
Nicolás Badano	96d78d07b9	Merge branch 'agmNoRadio' of git@github.com:KoffeinFlummi/ACE3.git into agmPortNoRadio	2015-01-16 10:48:16 -03:00
commy2	fac9b2f4f4	menu fixes	2015-01-16 14:35:19 +01:00
commy2	9219909ec7	port vehicles	2015-01-16 14:20:41 +01:00
bux578	b13502c5f9	spaces	2015-01-16 13:20:01 +01:00
bux578	b556097896	cbafyied scopes ... still lots of spawns and waitUntils in there	2015-01-16 13:15:14 +01:00
PabstMirror	687c7e98aa	almost done	2015-01-16 02:13:29 -06:00
PabstMirror	644e61f67e	Don't always enable effects when exiting zeus	2015-01-15 22:49:46 -06:00
PabstMirror	4c7877f5a4	Fix QGVAR	2015-01-15 22:43:54 -06:00
PabstMirror	4c5912e2f1	More progress	2015-01-15 22:30:04 -06:00
Nicolás Badano	1f99a4dc4a	Merge branch 'agmHearingPort' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-16 01:18:06 -03:00
Nicolás Badano	b60dc8999d	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-15 23:38:02 -03:00
Nicolás Badano	886ffacb35	overheating: replace last spawn by a PFH	2015-01-15 23:36:58 -03:00
Nicolás Badano	c8811552c8	overheating: add function headers	2015-01-15 23:36:31 -03:00
commy2	95f550c360	spaces	2015-01-16 02:26:59 +01:00
commy2	18c9c589c8	port reload	2015-01-16 02:25:41 +01:00
Nicolás Badano	9bd5758e40	overheating: replace a spawn by a PFH	2015-01-15 22:00:01 -03:00
commy2	addc7feb40	vector, relative slope distance and relative azimuth + distance modes, spaghetti	2015-01-16 01:48:43 +01:00
Nicolás Badano	577e6c9672	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-15 20:44:53 -03:00
Nicolás Badano	cded65d9a9	resting: changed spawn for PFH, reorganized code	2015-01-15 20:42:46 -03:00
Nicolás Badano	4340becc43	Merge pull request #35 from KoffeinFlummi/agmRestingPort ... AGM resting port	2015-01-15 19:36:22 -03:00
Nicolás Badano	f9de90c6f9	resting: port	2015-01-15 19:34:35 -03:00
Nicolás Badano	e377cd0229	AGM_Resting pre CBA	2015-01-15 19:07:19 -03:00
PabstMirror	b12844f175	Converted to CBA style	2015-01-15 15:50:48 -06:00
commy2	7785a9df75	changing macros, irl vector guide	2015-01-15 22:32:45 +01:00
Nicolás Badano	9cf9733850	interaction: fixed the modifier key	2015-01-15 17:15:39 -03:00
Nicolás Badano	a4a4ca39f6	explosives: fixed timer #26	2015-01-15 17:06:38 -03:00
Nicolás Badano	f06da9a8c1	explosives: missing include	2015-01-15 16:57:27 -03:00
Nicolás Badano	2091aedcbc	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-15 16:13:53 -03:00
Nicolás Badano	1d5201c0d7	explosives: Fix #32	2015-01-15 16:13:12 -03:00
commy2	2eb547a52e	some advanced vector modes, macros	2015-01-15 19:01:27 +01:00
Nicolás Badano	d1d12804f4	Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git	2015-01-15 14:41:55 -03:00
Nicolás Badano	8f31dea752	common: various fixes. Fix #33	2015-01-15 14:41:22 -03:00
commy2	530e93414a	vector height + distance mode	2015-01-15 17:24:19 +01:00
commy2	3e9785e145	vector azimuth+inclination mode	2015-01-15 16:40:06 +01:00
commy2	79426252a1	vector distance + azmimuth mode	2015-01-15 16:21:47 +01:00
PabstMirror	f4c84182d4	Progress on Map	2015-01-15 03:51:18 -06:00
PabstMirror	e52457bfbc	AGM Map Base	2015-01-15 02:36:48 -06:00
commy2	bc43ee5136	get the vector to work, wip	2015-01-15 07:18:57 +01:00
Nou	d281caffbe	Added ACRE2's hash and hash lists.	2015-01-14 13:29:52 -08:00
Nou	5c039a4ffd	Variable misnamed for event holder!	2015-01-14 12:55:44 -08:00
PabstMirror	f352b4cdb5	Use new Event Handlers ... from 9a37538d50	2015-01-14 14:53:09 -06:00
Nou	9a37538d50	More event handler changes! Added removeEventHandler and removeAllEventHandler, changed name from addNetEventHandler to addEventHandler, and added a localEvent function.	2015-01-14 12:44:32 -08:00
PabstMirror	a91b409702	newline	2015-01-14 14:43:43 -06:00
PabstMirror	1d083aa072	Convert Spawned/Sleep	2015-01-14 14:40:37 -06:00
KoffeinFlummi	ccc3b9d076	Port AGM_Recoil	2015-01-14 21:29:35 +01:00
KoffeinFlummi	3a44b58b5f	Add PBOPREFIX to inventory	2015-01-14 21:14:53 +01:00
KoffeinFlummi	bda6afabb7	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-14 21:11:51 +01:00
KoffeinFlummi	b704ce5cba	Merge branch 'agmInventoryPort'	2015-01-14 21:11:31 +01:00
commy2	cbc71329d2	SETPVAR instead of SETGVAR	2015-01-14 21:09:33 +01:00
KoffeinFlummi	d567785518	Change FCS indentation to 4 spaces	2015-01-14 21:07:41 +01:00
KoffeinFlummi	66b33590d5	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-14 21:07:08 +01:00
KoffeinFlummi	5c5c49519a	Fix vector texture paths; Fix #21	2015-01-14 21:06:45 +01:00
PabstMirror	1927d6ba36	Script Comp Fix	2015-01-14 13:51:03 -06:00
PabstMirror	cedb05f8d9	Key Press	2015-01-14 13:48:08 -06:00
commy2	3bf0b772bb	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-01-14 20:39:18 +01:00
commy2	ddbc54b992	add getVariable, setVariable macros	2015-01-14 20:38:59 +01:00
PabstMirror	614dced0fa	DEBUG_SETTINGS in script comps	2015-01-14 12:34:24 -06:00
PabstMirror	e1c08626be	Fix Script Comp	2015-01-14 12:28:44 -06:00
PabstMirror	ad47b9a5df	fix scriptComponent.hpp	2015-01-14 12:24:09 -06:00
bux578	de8ca47e88	change some core to common	2015-01-14 14:28:04 +01:00
Nicolás Badano	c16c5e756c	explosives: fixes	2015-01-14 10:13:04 -03:00
Nicolás Badano	fcbabc1388	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git	2015-01-14 10:12:34 -03:00
Nicolás Badano	167497ec2f	small fixes for explosives and interaction	2015-01-14 10:11:46 -03:00
PabstMirror	7b49e06b0d	Fix config	2015-01-14 05:21:47 -06:00
PabstMirror	9224cd0c2a	Work on removing spawned	2015-01-14 05:07:53 -06:00
PabstMirror	19c815f779	Model and Textures	2015-01-14 03:19:25 -06:00
PabstMirror	77065afb02	First Pass	2015-01-14 03:06:47 -06:00
KoffeinFlummi	250050129b	CBAify inventory	2015-01-14 09:45:20 +01:00
KoffeinFlummi	4f4c9ab1b4	Move inventory to addons	2015-01-14 09:23:41 +01:00
PabstMirror	7ead73bc1f	AGM Grenades Base	2015-01-14 01:55:23 -06:00
PabstMirror	4a0eb2d4ef	Interaction paths	2015-01-14 00:48:06 -06:00
commy2	5636721717	try to port that vector	2015-01-14 07:24:17 +01:00
PabstMirror	ece2456773	#15 - updated model (on correct branch)	2015-01-14 00:15:08 -06:00
PabstMirror	00ecb21ad7	#15 oops	2015-01-14 00:02:44 -06:00
PabstMirror	c9e957f9ac	#15 - all agm ref in p3d fixed - still bin issues	2015-01-13 23:24:53 -06:00
Nicolás Badano	b868e9a35c	interaction: remove stuff from config. cable ties are no longer in interaction.	2015-01-14 01:47:39 -03:00
Nicolás Badano	465ae0bbfe	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git	2015-01-14 01:39:12 -03:00
Nicolás Badano	1de58631fb	Merge pull request #19 from KoffeinFlummi/agmBackblastPort ... Agm_Backblast port	2015-01-14 01:36:43 -03:00
Nicolás Badano	3209fea7db	backblast: completed port	2015-01-14 01:32:38 -03:00
Nicolás Badano	95ec952acf	backblast: initial port	2015-01-14 01:15:58 -03:00
Nicolás Badano	46cb15e831	AGM_Backblast pre CBA	2015-01-14 01:15:06 -03:00
Nicolás Badano	9408363706	Fix interaction and overheating headers	2015-01-14 01:14:47 -03:00
PabstMirror	436815fea3	Paths	2015-01-13 21:45:09 -06:00
PabstMirror	cb9b38bca2	Done I think	2015-01-13 21:36:53 -06:00
commy2	0aa348133d	fix target wall texture path	2015-01-14 04:36:33 +01:00
Nicolás Badano	c2fe2ed745	Merge pull request #8 from KoffeinFlummi/agmHearingPort ... AGM hearing port	2015-01-14 00:32:21 -03:00
Nicolás Badano	40c43944fe	hearing: make tinnitus disabable	2015-01-14 00:29:01 -03:00
jaynus	cbee108845	Merge pull request #14 from KoffeinFlummi/agmDisposablesPort ... Port: AGM Disposables	2015-01-13 19:20:09 -08:00
PabstMirror	d3f5304f62	work	2015-01-13 21:17:34 -06:00
Nicolás Badano	71879acb79	hearing: ups, wrong triangle	2015-01-14 00:13:57 -03:00
Nicolás Badano	0f4d8bc82f	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort	2015-01-14 00:09:27 -03:00
Nicolás Badano	057be50cf6	hearing: skip first execution of the PFH	2015-01-14 00:08:17 -03:00
PabstMirror	341fb7b86f	opps	2015-01-13 21:05:09 -06:00
PabstMirror	bcd4a72013	Base No Radio	2015-01-13 21:04:25 -06:00
commy2	9c99eee461	port ballistics	2015-01-14 04:02:48 +01:00
Nicolás Badano	f082242485	hearing: buggy PFH	2015-01-13 23:34:55 -03:00
Nicolás Badano	cc7d67a150	Merge branch 'agmHearingPort' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort ... Conflicts: addons/hearing/CfgSounds.hpp addons/hearing/CfgWeapons.hpp addons/hearing/script_component.hpp	2015-01-13 23:19:00 -03:00
Nicolás Badano	5e4a78a1bc	hearing: replaced spawn by PFH	2015-01-13 23:16:55 -03:00
Nicolás Badano	319e772832	hearing: tweaks	2015-01-13 23:07:50 -03:00
PabstMirror	a78f508551	compiling, still need to test	2015-01-13 20:07:31 -06:00
Nicolás Badano	b9c2af8dfe	hearing: final fixes	2015-01-13 23:00:48 -03:00
PabstMirror	2df8f4f1fb	Cleanup old AGM	2015-01-13 19:57:15 -06:00
Nicolás Badano	e7c3b0db18	hearing: various fixes	2015-01-13 22:41:53 -03:00
jaynus	01f16be76b	Merge pull request #4 from KoffeinFlummi/agmExplosivesPort ... Ported AGM_Explosives to ace.	2015-01-13 17:41:32 -08:00
PabstMirror	c550d5dab6	remove debug and add sanity checks	2015-01-13 19:38:00 -06:00
jaynus	c85cc6a15e	Merge remote-tracking branch 'origin/agmRespawnPort'	2015-01-13 17:33:08 -08:00
jaynus	7622f3daea	Fixed and working.	2015-01-13 17:32:27 -08:00
Nicolás Badano	5af4f1ed53	Merge branch 'master' into agmHearingPort	2015-01-13 22:31:06 -03:00
PabstMirror	de51a61180	convert spawn to perFrame	2015-01-13 19:30:25 -06:00
Nicolás Badano	99925a1ef0	Merge branch 'agmOverheatingPort'	2015-01-13 22:29:55 -03:00
Nicolás Badano	0ceefd893a	Merge pull request #7 from KoffeinFlummi/agmOverheatingPort ... AGM Overheating port	2015-01-13 22:28:38 -03:00
Nicolás Badano	d0f56f44ab	overheating: final fixes	2015-01-13 22:26:55 -03:00
jaynus	6966700a06	Remove jav debug	2015-01-13 17:21:14 -08:00
jaynus	1f8eac7b11	Merge branch 'master' into agmRespawnPort	2015-01-13 17:12:18 -08:00
jaynus	e1dd6e54c3	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-01-13 16:51:17 -08:00
jaynus	db4f88261d	nametags fixed.	2015-01-13 16:47:23 -08:00
commy2	fa4a591fbe	add some missing pboprefix	2015-01-14 01:40:11 +01:00
Nicolás Badano	81e603bf35	Merge branch 'master' into agmOverheatingPort	2015-01-13 21:38:57 -03:00