75 Commits

Author	SHA1	Message	Date
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +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
PabstMirror	7111cdd8ff	#540 - remove debug spam	2015-04-13 03:16:33 -05:00
Anthariel	3db8f4ad44	Update stringtable.xml ... Added: Some missing french translation.	2015-04-12 18:10:41 +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
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
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
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
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
Grzegorz	37be4f9e53	captives PL translation	2015-04-10 03:56:24 +02:00
Legolasindar	1dcbebc04c	Update stringtable.xml ... Updated spanish terms	2015-04-10 00:10:47 +02:00
licht-im-Norden87	2c7df9da6a	Stringtable: German additions	2015-04-09 23:02:28 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
Glowbal	89015c94d4	Removed rouge system chat and diag_log messages	2015-04-05 19:42:55 +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
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
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
Glowbal	244bac8562	Merge branch 'master' into medicalAdvanced	2015-04-03 22:42:09 +02:00
Glowbal	ffcc01ef74	Removed rouge systemChat message on unconsciousness #292	2015-04-03 08:45:02 +02:00
PabstMirror	7c121e6a80	Missing, unused stringtable	2015-04-02 22:32:16 -05:00
PabstMirror	209bdc8dfd	Merge pull request #257 from KoffeinFlummi/captivesFixRespawn ... Captives fix respawn Fix #230	2015-03-29 11:23:33 -05:00
PabstMirror	40ccf7b241	Captives - Should disable reloading	2015-03-28 01:46:13 -05:00
PabstMirror	14cbceef97	Rerun set func when respawn into captive unit	2015-03-26 14:21:26 -05: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
bux578	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01:00
PabstMirror	20362e8dc9	Cleanup exception names	2015-03-23 15:22:26 -05:00
bux578	ba42ec831b	second batch of icons	2015-03-23 20:02:35 +01:00
commy2	2744f46bd2	spelling	2015-03-15 16:12:37 +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
PabstMirror	93262f3b92	Use ace_isUnconscious in anim changed EH	2015-03-13 00:45:12 -05:00
PabstMirror	55fcc60453	Merge branch 'master' into captivesMedicalInegration	2015-03-12 22:44:24 -05:00
PabstMirror	bed312dcee	Use MACRO_ADDITEM from main instead of redefining	2015-03-11 17:36:40 -05:00
PabstMirror	3f32627d61	Implement Unconc Event Handler	2015-03-10 11:08:15 -05:00
Nicolás Badano	8e0158209c	Merge branch 'master' into ace_interactionCleanup	2015-03-01 17:15:24 -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
PabstMirror	80ac6d83de	Zeus Module Messages	2015-02-24 12:44:54 -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
PabstMirror	85c568a061	Comments	2015-02-24 10:27:53 -06: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
PabstMirror	a8e269bc18	Cleanup Escort Logic ... No more ERROR spam	2015-02-19 14:34:14 -06:00