375 Commits

Author	SHA1	Message	Date
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
licht-im-Norden87	a01c4a0e0b	Update stringtable.xml	2015-04-12 13:55:55 +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	0420a94938	Streamline Team management actions	2015-04-12 01:19:38 -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
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	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +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
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02: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
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
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
FreeZbe	3541500947	Translation changes	2015-04-10 16:41:51 +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
Anthariel	b5841f8f09	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 06:28:59 +02:00
Grzegorz	2984aa2e8c	interaction PL translation	2015-04-10 03:26:03 +02:00
Legolasindar	2542f994d6	Update stringtable.xml ... added spanish translation	2015-04-10 01:29:52 +02:00
Clon1998	d7bdb48547	Update stringtable.xml	2015-04-10 01:15:20 +02:00
licht-im-Norden87	852f939430	whoops	2015-04-10 01:00:35 +02:00
licht-im-Norden87	7994441968	Update stringtable.xml	2015-04-09 23:48:21 +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
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07: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
PabstMirror	75351f2a5b	TapShoulder - fix hint message	2015-04-04 17:54:15 -05:00
commy2	2fa7624815	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair	2015-04-04 20:03:33 +02:00
esteldunedain	a658cafb4e	Remove line breaks from actions	2015-04-04 01:45:03 -03: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
commy2	f231b2b14c	removing wheels logic, carryable wheels	2015-03-29 03:35:55 +02: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	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01: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	a823fb2dca	Tweaks on action names to: ... - Remove >> for submenus - Split long action names in two lines	2015-03-24 00:16:32 -03:00
bux578	ba42ec831b	second batch of icons	2015-03-23 20:02:35 +01: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	f8ea603977	Added dynamic actions to unload patients (unconscious) from vehicles	2015-03-21 15:32:32 -03:00
Nicolás Badano	d7363a6dab	Move main interactions to pelvis; leave torso for medical	2015-03-21 11:01:38 -03: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	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
Nicolás Badano	b3aa7c8970	Make collectActiveActionTree follow mounts correctly	2015-03-20 22:44:25 -03:00
PabstMirror	7e383dc10e	#198 canInteractWith EGVAR -> EFUNC	2015-03-20 17:55:39 -05:00
Nicolás Badano	66731c9cdd	First rough implementation of the passengers menu, with mounted main actions	2015-03-20 00:53:58 -03:00
commy2	ab39608e4d	change height when carrying, fix most cases of floating objects	2015-03-18 01:36:56 +01:00
commy2	ad181de578	main me ... nu for reammo_box	2015-03-16 15:41:55 +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	4dab0b73d5	add conditions on post init	2015-03-15 09:26:16 +01:00
PabstMirror	bed312dcee	Use MACRO_ADDITEM from main instead of redefining	2015-03-11 17:36:40 -05:00
PabstMirror	1dd270812d	Finish keybind conversion for old interact	2015-03-10 12:47:58 -05:00
PabstMirror	e191105200	Merge Changes	2015-03-07 10:36:01 -06:00
Nicolás Badano	9010f7a926	Change main action point for static weapons to the gunnerview selection	2015-03-06 01:35:12 -03:00
PabstMirror	0919e59719	Key Bind Redo (except vector)	2015-03-05 01:32:26 -06:00
Nicolás Badano	cd00eda8c0	Fix interactions with civilians	2015-03-02 23:30:11 -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	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	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
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	dd92c5e845	Tap on either shoulder. "Tap" animation	2015-02-19 19:45:46 -03:00
Nicolás Badano	f7d5d615ee	allow actions to be defined for different selections	2015-02-19 15:36:27 -03:00
Nicolás Badano	043987fc93	basic self actions	2015-02-18 18:58:06 -03:00
Nicolás Badano	681d83f922	Merge pull request #129 from KoffeinFlummi/agmCaptivesPort ... Port: AGM Captives	2015-02-11 18:09:33 -03:00
PabstMirror	98564fae68	Surrendering	2015-02-06 15:54:26 -06:00
PabstMirror	82a8fc8ca3	exceptions	2015-02-05 23:11:28 -06:00
PabstMirror	435b3b8b86	Move Code out of CfgVehicles	2015-02-04 13:16:19 -06:00
Nicolás Badano	74d0ae95ff	Change ACE_Settings from modules	2015-02-03 02:53:02 -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
PabstMirror	58a71e6a66	Merge pull request #97 from KoffeinFlummi/agmWirecutterPort ... Port: AGM Wirecutters	2015-02-01 11:03:20 -06:00
Nicolás Badano	96b7c0d30c	ACE_Settings: replace all ACE_Options	2015-01-30 19:19:45 -03:00
Nicolás Badano	981978d043	ACE_Settings: replace all ACE_Parameters	2015-01-30 19:06:25 -03:00
PabstMirror	9631154926	Set ADDON variable in XEH_preInit	2015-01-29 01:38:46 -06:00
Nou	26f353b94d	Merge branch 'master' into interact_menu	2015-01-28 10:19:58 -08: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
KoffeinFlummi	c407553d49	Add remaining READMEs, add helper script	2015-01-26 14:34:48 +01:00
Nicolás Badano	f3dac73fa2	interaction: removed debug info	2015-01-24 15:40:41 -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	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
Nicolás Badano	06743bef52	interaction: fix canInteract and exceptions in agm menu	2015-01-20 02:58:06 -03:00
Nicolás Badano	9e11aeb0b9	interaction: fix canInteract and exceptions in agm menu	2015-01-20 02:39:22 -03: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	058aa8d920	interaction: cba keybinds	2015-01-18 19:38:58 -03:00
Nou	6a04408a74	Initial nou menu commit.	2015-01-18 10:38:27 -08:00
PabstMirror	6e8c394903	Standardize Config Version Stuff	2015-01-18 01:32:07 -06:00
commy2	7a6d0eefe3	port weapon select	2015-01-17 18:26:51 +01: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	9cf9733850	interaction: fixed the modifier key	2015-01-15 17:15:39 -03:00
Nicolás Badano	1d5201c0d7	explosives: Fix #32	2015-01-15 16:13:12 -03:00
bux578	de8ca47e88	change some core to common	2015-01-14 14:28:04 +01: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	4a0eb2d4ef	Interaction paths	2015-01-14 00:48:06 -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	9408363706	Fix interaction and overheating headers	2015-01-14 01:14:47 -03:00
Nicolás Badano	e53ed960dd	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git	2015-01-13 20:00:36 -03:00
Nicolás Badano	e24d6aa42f	Fix in interaction menu for attaching	2015-01-13 19:59:16 -03:00
commy2	ee7ae79f15	fix key release issues	2015-01-13 23:54:21 +01:00
commy2	e071b2f684	fix macros in common' config	2015-01-13 20:56:02 +01:00
commy2	270ff5535a	fix interaction menu	2015-01-13 19:14:34 +01:00
commy2	039ae01594	fix some sqf errors	2015-01-13 17:08:49 +01:00
commy2	9efc1f9547	fix script errors	2015-01-13 16:38:21 +01:00
jaynus	3fb2a8e245	big code clean up	2015-01-12 21:14:27 -08:00
commy2	35703f3920	inheritance	2015-01-12 21:35:18 +01:00
Nicolás Badano	9ce4f585ca	Change PREPF to PREP for interaction	2015-01-12 01:26:07 -03:00
Nicolás Badano	f99f1a2791	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmInteractionPort	2015-01-12 01:20:39 -03:00
Nicolás Badano	1aa862bc3b	Change stringtables and main variables prefixes to ACE	2015-01-12 01:20:02 -03:00
Nou	b3e3a7b926	PBOPREFIX fixes.	2015-01-11 17:28:39 -08:00
Nicolás Badano	6025fc5c57	Macros for the rest of interaction	2015-01-11 20:13:47 -03:00
Nicolás Badano	8d1bdd88ff	Finish macro work for config	2015-01-11 18:22:47 -03:00
Nicolás Badano	d405d5920a	Macros for interaction keys and conditions	2015-01-11 17:41:04 -03:00
Nicolás Badano	e823e60224	Remove unused code	2015-01-11 17:40:17 -03:00
Nicolás Badano	8bff5f6ef4	interaction: add script_component, initial CBAfication of config.	2015-01-11 16:50:29 -03:00
Nicolás Badano	6769189e7c	AGM_Interaction pre CBA	2015-01-11 16:32:51 -03:00