Commit Graph

3180 Commits

Author SHA1 Message Date
Tachii
bd3ef35c88 Update stringtable.xml 2015-04-18 02:07:49 +03:00
Tachii
1e446fb060 Update stringtable.xml 2015-04-18 02:01:09 +03:00
ulteq
b32a2b7495 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 00:12:04 +02:00
ulteq
314b0d23d6 ATragMX Feature Expansion:
*Added Gun and Ammo Data Screen
*Added Atomospheric and Environmental Data Screen
*Added Target Data Screen
*Added support for coriolis- and spin drift
*Added a second option (AT) to enter atmospheric data
*Target data is now saved/restored in/from the profileNamespace
*Atmosphere data is now saved/restored in/from the profileNamespace
*Selected gun profile is now saved/restored in/from the profileNamespace
*Fixed several bugs in the dual-/imperial unit systems
*Minor bug fixes in the target range assist screen
*Minor bug fix in the target speed assist screen
2015-04-18 00:11:53 +02:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
bux578
9c054b7f35 Merge pull request #720 from gienkov/master
PL translation
2015-04-17 22:38:04 +02:00
Grzegorz Sikora
7489e514ce PL translation 2015-04-17 21:48:04 +02:00
commy2
0e90199e23 remove debug message 2015-04-17 20:29:01 +02:00
Felix Wiegand
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
PabstMirror
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
PabstMirror
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
PabstMirror
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
jaynus
e83ab4049f Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
jaynus
3a94753645 tab 2015-04-17 07:28:59 -07:00
jaynus
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
jaynus
469dafd0c0 tab 2015-04-17 07:25:49 -07:00
KoffeinFlummi
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
commy2
f8f2748d28 Merge pull request #646 from acemod/wireCuttersSoundEffect
Wire cutters sound effect
2015-04-17 15:40:42 +02:00
commy2
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
commy2
77b057e188 Merge pull request #698 from acemod/dispofix
disposable cleanup, fix #696
2015-04-17 15:40:28 +02:00
bux578
a9008437aa Merge pull request #703 from EpMAK/master
Russian stringtables finished
2015-04-17 14:00:13 +02:00
EpMAK
c2214efeb1 Russian stringtables finished
Filled all the missing lines, little errors fixed.
2015-04-17 14:54:28 +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
bux578
5c2a44e5c4 Merge pull request #694 from ruPaladin/patch-3
One more russian translation fix
2015-04-17 11:12:30 +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
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
PabstMirror
e12831bee4 #678 - Missing Text Height in settingMenu 2015-04-16 15:17:56 -05: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
KoffeinFlummi
3d14b171a6 Make make.py itself support 32-&64-bit systems ...
... because having two different files is dumb.
2015-04-16 19:38:07 +02:00
jaynus
4a1dd6a957 Merge pull request #661 from rlex/master
Add link for issue report details
2015-04-16 10:37:39 -07: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
PabstMirror
3dfcbe42b8 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-16 12:10:44 -05:00
PabstMirror
e06fd7350e DEFAULT_PARAM KEY_PARAM private check 2015-04-16 12:10:40 -05:00