47 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
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
licht-im-Norden87	a30eabfb1d	Update stringtable.xml	2015-04-12 03:30:11 +02: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
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
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
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Legolasindar	470a12ed46	Update stringtable.xml ... added spanish translation	2015-04-10 13:19:26 +02:00
licht-im-Norden87	fb5189be9a	Overheating	2015-04-10 00:38:51 +02:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
Nicolás Badano	8b3648cf8d	Configure exceptions for self actions inside vehicles	2015-03-24 15:43:49 -03: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
PabstMirror	7e383dc10e	#198 canInteractWith EGVAR -> EFUNC	2015-03-20 17:55:39 -05:00
commy2	b5f307919e	replace canInteract with canInteractWith	2015-03-15 13:00:10 +01:00
PabstMirror	bed312dcee	Use MACRO_ADDITEM from main instead of redefining	2015-03-11 17:36:40 -05: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
PabstMirror	4018742f26	Return False on keyUp Code	2015-03-05 02:51:24 -06:00
PabstMirror	0919e59719	Key Bind Redo (except vector)	2015-03-05 01:32:26 -06:00
Nicolás Badano	80778cf8db	overheating: updated headers	2015-02-08 19:54:12 -03:00
Glowbal	0419b7cbe5	Formatting	2015-02-01 11:17:15 +01:00
Glowbal	3f0b6650e0	Added weapon resting & weapon jam sounds	2015-02-01 11:11:51 +01:00
PabstMirror	9631154926	Set ADDON variable in XEH_preInit	2015-01-29 01:38:46 -06:00
PabstMirror	bf791e32c4	Merge pull request #93 from KoffeinFlummi/progresBarNew ... #87 - New Progress Bar	2015-01-27 19:28:51 -06:00
KoffeinFlummi	c407553d49	Add remaining READMEs, add helper script	2015-01-26 14:34:48 +01:00
PabstMirror	5e932f8c71	Replace calls to progressBar ... Mag repack Defuse Swap Barrel	2015-01-26 00:24:33 -06:00
Nicolás Badano	7895173407	overheating: cba keybinds	2015-01-18 17:08:56 -03:00
Nicolás Badano	a7e016fa8f	overheating: change addPerFrameHandler to waitAndExecute	2015-01-17 03:13:05 -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
Nicolás Badano	9bd5758e40	overheating: replace a spawn by a PFH	2015-01-15 22:00:01 -03:00
Nicolás Badano	9408363706	Fix interaction and overheating headers	2015-01-14 01:14:47 -03:00
Nicolás Badano	d0f56f44ab	overheating: final fixes	2015-01-13 22:26:55 -03:00
Nicolás Badano	a97b767283	overheating: ironing out bugs	2015-01-13 21:07:32 -03:00
Nicolás Badano	2a2eb38de7	overheating: hard code path to parent script_components	2015-01-13 00:37:53 -03:00
Nicolás Badano	a53a265117	overheating: Replace calls to core for calls to common	2015-01-13 00:30:39 -03:00
Nicolás Badano	1db298722b	CBAfy AGM_Overheating	2015-01-13 00:23:14 -03:00
Nicolás Badano	c0df8b7f54	Pre CBA AGM_Overheating	2015-01-12 23:43:38 -03:00