3244 Commits

Author	SHA1	Message	Date
ruPaladin	a4980a91e1	inventory (semantic correction)	2015-04-17 16:04:26 +03:00
ruPaladin	a6e0cac734	interact_menu (fixes to prevent text overlapping)	2015-04-17 16:02:46 +03:00
ruPaladin	766321224b	hearing	2015-04-17 15:59:29 +03:00
ruPaladin	b80ec3f790	ballistics russian fixes + multilanguage fix	2015-04-17 15:57:25 +03:00
Lex Rivera	163ac7bd4a	[realisticnames] Adjust MK-I. Enable actual names	2015-04-17 15:28:30 +03:00
ruPaladin	af876e3370	attach	2015-04-17 15:27:53 +03:00
EpMAK	c2214efeb1	Russian stringtables finished ... Filled all the missing lines, little errors fixed.	2015-04-17 14:54:28 +03:00
Lex Rivera	2ca20f740e	[realisticnames] adjust M14	2015-04-17 14:53:55 +03:00
Lex Rivera	8fc2e96367	[realisticnames] Adjust SPMG name, fix some russian	2015-04-17 14:49:43 +03:00
commy2	26944ea84e	make altimeter actually usable with parachutes	2015-04-17 13:01:38 +02:00
commy2	73fd9ac62e	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix	2015-04-17 12:55:07 +02:00
commy2	558a4fb363	Merge pull request #461 from Tenga/altimeter-fix ... Altimeter fix, division by zero when no time has passed (game paused, etc.)	2015-04-17 12:49:06 +02:00
commy2	45d639b395	disposable cleanup, fix #696	2015-04-17 12:28:06 +02:00
nomisum	d865e9c038	fixed typo	2015-04-17 11:42:47 +02:00
nomisum	8813315f36	added missing translations german	2015-04-17 11:40:31 +02:00
ulteq	e04a0c438a	Fixed deprecated delete_gun function	2015-04-17 11:05:24 +02:00
commy2	20565e8b02	hide height / velocity while parachuting, freefallig in expert mode, fix 692	2015-04-17 11:02:01 +02:00
ruPaladin	e38a6fc62b	one more russian fix	2015-04-17 12:01:01 +03:00
esteldunedain	54daa02aa4	Weather: headers + privates	2015-04-17 01:44:38 -03:00
PabstMirror	7d5a70246b	Remove unnecessary cfgSounds	2015-04-16 22:10:33 -05:00
esteldunedain	9de834e156	Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate).	2015-04-17 00:04:27 -03:00
esteldunedain	bdd3422150	Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc	2015-04-16 23:53:54 -03:00
PabstMirror	1729c781bd	Cleanup / private vars	2015-04-16 19:46:42 -05:00
PabstMirror	53af014eab	Fix Localization in value[] array	2015-04-16 19:29:39 -05:00
PabstMirror	4e5c2ef187	option menu ui scaling	2015-04-16 19:11:42 -05:00
simon84	ff0fb12ca3	minor FCS changes (privatized variables, unnecessary counters) ... - added some variables to the private statement - removed an iteration counter, which was only used for debugging	2015-04-16 23:05:48 +02:00
simon84	e7f9bc09df	German translations ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:52:49 +02:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
PabstMirror	e12831bee4	#678 - Missing Text Height in settingMenu	2015-04-16 15:17:56 -05:00
simon84	c18284d964	German translation	2015-04-16 22:04:24 +02:00
bux578	5764310833	german translation ... double checked by bw medic	2015-04-16 21:58:39 +02:00
jaynus	ce4a9c3676	Apply javelin guidance to static titans.	2015-04-16 11:32:47 -07:00
ulteq	4ef80ab3a3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 20:14:33 +02:00
PabstMirror	fa6cb3e75c	#672 - Don't show speaking icon for unconc players	2015-04-16 12:58:54 -05:00
ulteq	a7507fefef	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 19:55:48 +02:00
ulteq	1794606304	Got rid of the __DSP macro	2015-04-16 19:52:20 +02:00
PabstMirror	638433614c	Some missing private defines.	2015-04-16 12:36:16 -05:00
Nicolás Badano	95cab9d0e7	Merge pull request #671 from Legolasindar/master ... added spanish translation	2015-04-16 14:18:41 -03:00
jaynus	3d7ae5e3a1	Merge branch 'master' of github.com:acemod/ACE3	2015-04-16 10:10:31 -07:00
jaynus	6a942ac820	Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670	2015-04-16 10:10:24 -07:00
jaynus	8837355d29	Merge remote-tracking branch 'origin/master' into guidanceHandoff	2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello	61d1e6854e	added spanish translation ... added spanish translation to ballistics and respawn	2015-04-16 19:03:15 +02:00
ulteq	668888de81	Fixed constant name not following the coding-guideline	2015-04-16 19:00:37 +02:00
ulteq	aeffc55859	Added missing privates	2015-04-16 18:52:48 +02:00
jaynus	bce4f14cc8	Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff	2015-04-16 09:40:47 -07:00
jaynus	6d93fe45a6	Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability.	2015-04-16 09:35:21 -07:00
KoffeinFlummi	bf0aa6f344	Merge branch 'spanish-merge'	2015-04-16 18:32:37 +02:00
KoffeinFlummi	11f9478035	Merge https://github.com/Legolasindar/ACE3 into spanish-merge ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laserpointer/stringtable.xml addons/medical/stringtable.xml addons/scopes/stringtable.xml addons/weather/stringtable.xml	2015-04-16 18:31:31 +02:00
ulteq	4e4dee18df	Added missing privates / Removed unused privates	2015-04-16 18:21:19 +02:00
ulteq	fa39e8f001	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-04-16 18:14:42 +02:00