Commit Graph

3434 Commits

Author SHA1 Message Date
f7de809c67 Merge pull request #673 from acemod/64bit-tools-merge
Make make.py itself support 32-&64-bit systems ...
2015-04-17 19:25:38 +02:00
2f1ee94d91 Update stringtable.xml 2015-04-17 20:24:32 +03:00
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
3b04e990a7 Merge pull request #713 from acemod/medicalGetVarDefaults
Medical - Use default value instead of 0 for getVar
2015-04-17 12:19:58 -05:00
bf7a7b5bc9 Update stringtable.xml 2015-04-17 20:18:41 +03:00
6e077de829 Medical - Use default value instead of 0 for getVar
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
2015-04-17 12:13:23 -05:00
9cede7cf85 Module name Interact_Menu -> Interaction in documentation 2015-04-17 19:10:41 +02:00
c88bda487b Merge remote-tracking branch 'upstream/master'
Conflicts:
	addons/weaponselect/stringtable.xml
2015-04-17 19:48:01 +03:00
31a2f1b279 Russian translations
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
2d5b10fb60 Module names 2015-04-17 17:45:10 +02:00
ba576c5763 Capitalized Visual Studio, Corrected togglable spelling 2015-04-17 17:42:03 +02:00
38f32cad0d bracket -> brace 2015-04-17 17:40:13 +02:00
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
2698490569 medical (patient status semantic fixes) 2015-04-17 17:49:03 +03:00
e83ab4049f Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
3a94753645 tab 2015-04-17 07:28:59 -07:00
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
469dafd0c0 tab 2015-04-17 07:25:49 -07:00
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
f8f2748d28 Merge pull request #646 from acemod/wireCuttersSoundEffect
Wire cutters sound effect
2015-04-17 15:40:42 +02:00
7e275a43f4 Merge pull request #693 from acemod/parafix
hide height / velocity while parachuting, freefallig in expert mode, fix #692
2015-04-17 15:40:34 +02:00
77b057e188 Merge pull request #698 from acemod/dispofix
disposable cleanup, fix #696
2015-04-17 15:40:28 +02:00
874cc75271 medical (semantic correction) 2015-04-17 16:22:02 +03:00
52dc5d66a4 nametags (fix text overlapping, semantic correct) 2015-04-17 16:09:17 +03:00
a4980a91e1 inventory (semantic correction) 2015-04-17 16:04:26 +03:00
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
766321224b hearing 2015-04-17 15:59:29 +03:00
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
af876e3370 attach 2015-04-17 15:27:53 +03:00
a9008437aa Merge pull request #703 from EpMAK/master
Russian stringtables finished
2015-04-17 14:00:13 +02:00
c2214efeb1 Russian stringtables finished
Filled all the missing lines, little errors fixed.
2015-04-17 14:54:28 +03:00
26944ea84e make altimeter actually usable with parachutes 2015-04-17 13:01:38 +02:00
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
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
45d639b395 disposable cleanup, fix #696 2015-04-17 12:28:06 +02:00
d865e9c038 fixed typo 2015-04-17 11:42:47 +02:00
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
5c2a44e5c4 Merge pull request #694 from ruPaladin/patch-3
One more russian translation fix
2015-04-17 11:12:30 +02:00
e04a0c438a Fixed deprecated delete_gun function 2015-04-17 11:05:24 +02:00
20565e8b02 hide height / velocity while parachuting, freefallig in expert mode, fix 692 2015-04-17 11:02:01 +02:00
e38a6fc62b one more russian fix 2015-04-17 12:01:01 +03:00
54daa02aa4 Weather: headers + privates 2015-04-17 01:44:38 -03:00
7d5a70246b Remove unnecessary cfgSounds 2015-04-16 22:10:33 -05:00
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
1729c781bd Cleanup / private vars 2015-04-16 19:46:42 -05:00
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
4e5c2ef187 option menu ui scaling 2015-04-16 19:11:42 -05:00
e12831bee4 #678 - Missing Text Height in settingMenu 2015-04-16 15:17:56 -05:00
ce4a9c3676 Apply javelin guidance to static titans. 2015-04-16 11:32:47 -07:00