Glowbal
f6bbeb6bd6
switched back to old init method
2015-04-19 17:28:47 +02:00
Glowbal
d1fabf9733
Merge branch 'master' into medicalFixes
2015-04-19 17:26:10 +02:00
Grzegorz Sikora
4283e07942
PL fix
2015-04-19 13:50:08 +02:00
Glowbal
8a7b3a1b33
Removed damage thresholds from basic medical
2015-04-19 13:08:28 +02:00
ulteq
a73c0bc429
Sord is now able to transmit the direction of fire
2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e
Removed unused RscControlsGroup
2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b
Overworked the scope click feature:
...
*TODO: Add the "Setting Up a Solution for Your Scope" screen
2015-04-19 12:07:27 +02:00
Glowbal
b71ac1485d
Merge branch 'master' into medicalFixes
2015-04-19 12:06:54 +02:00
ulteq
874858ebb4
Added a sanity check to the cycle gun list function
...
*Top/Down buttons only cycle the gun list in the main/gun list menu
2015-04-19 11:43:20 +02:00
ulteq
5195271894
Fixes: https://github.com/acemod/ACE3/commit/4235163
...
*The asterix needs to be shown on distances shown in meters not yards
2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee
Increased the minimum barometric pressure value that is accepted
2015-04-19 11:18:37 +02:00
ulteq
4235163801
Added asterix (*) prefix to distances in yards on the main page
2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0
Moved a private declaration out of the hot path
2015-04-19 11:02:25 +02:00
ulteq
8f20303a08
Fixed a bug in the atmosphere unit conversion
2015-04-19 11:02:06 +02:00
ulteq
336a192302
The range card setup data is now also restored on mission start
2015-04-19 10:57:55 +02:00
ulteq
51590d39ad
Cleaned up the ATragMX postInit routine
2015-04-19 10:47:43 +02:00
ruPaladin
d8b96066e6
Rus translation (nametags)
2015-04-19 11:01:41 +03:00
ruPaladin
45fd90c6e0
Rus translation (medical)
2015-04-19 10:49:06 +03:00
commy2
c9a2505031
Merge pull request #755 from acemod/fixoptics2
...
Fix for PIP scopes, fix #547
2015-04-19 07:46:41 +02:00
bux578
2dfbd0a5cd
Merge pull request #761 from Tachii/patch-16
...
Update stringtable.xml
2015-04-19 07:11:39 +02:00
bux578
daf2fbb906
Merge pull request #760 from Tachii/patch-15
...
Update stringtable.xml
2015-04-19 07:11:27 +02:00
bux578
25ac90ef8b
Merge pull request #759 from Tachii/patch-14
...
Update stringtable.xml
2015-04-19 07:11:06 +02:00
bux578
5ed0dfe463
Merge pull request #758 from Tachii/patch-13
...
Update stringtable.xml
2015-04-19 07:10:55 +02:00
bux578
fa8e954d27
Merge pull request #757 from Tachii/patch-12
...
Update stringtable.xml
2015-04-19 07:10:45 +02:00
commy2
275da6f40a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-19 07:09:21 +02:00
commy2
9cb27c8fb2
fix: error when getting killed with FF-messages module, fix #745
2015-04-19 07:08:57 +02:00
bux578
0d86374bee
Merge pull request #754 from gienkov/master
...
PL translation
2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569
isNull
2015-04-18 22:23:19 -05:00
jaynus
dccc869a6a
Merge pull request #753 from acemod/fixSettingsLocalization
...
Fix settings localization is done by the server instead of client
2015-04-18 20:09:56 -07:00
KoffeinFlummi
65fd6b0937
Merge https://github.com/EpMAK/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
2015-04-19 01:04:32 +02:00
KoffeinFlummi
46bd51ffdf
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-19 00:51:33 +02:00
KoffeinFlummi
592e0d2dd3
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
jaynus
14faabb677
Merge branch 'master' of github.com:acemod/ACE3
2015-04-18 15:44:25 -07:00
jaynus
2fe7122b3e
Disable handoff until completed.
2015-04-18 15:44:07 -07:00
commy2
5558a6491d
remove weapon select in favor of the new controls from bi
2015-04-19 00:40:29 +02:00
KoffeinFlummi
8015aca0c3
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-19 00:40:18 +02:00
KoffeinFlummi
3aafa2082d
Merge https://github.com/nomisum/ACE3 into german-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
2015-04-19 00:39:44 +02:00
Tachii
e62a476a90
Update stringtable.xml
2015-04-19 01:37:08 +03:00
Tachii
dc2c3e246e
Update stringtable.xml
2015-04-19 01:25:30 +03:00
Tachii
8f9796f488
Update stringtable.xml
2015-04-19 01:23:37 +03:00
Tachii
a9d38f5970
Update stringtable.xml
2015-04-19 01:19:32 +03:00
Tachii
560646e1e1
Update stringtable.xml
2015-04-19 01:18:53 +03:00
commy2
ae80da7492
fix cameras breaking pip scope camera r2t texture, reenable PIP scopes in arsenal
2015-04-19 00:05:54 +02:00
esteldunedain
8b389949bc
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-18 18:42:11 -03:00
esteldunedain
bce0d84989
Fix interact menu object ordering
2015-04-18 18:41:36 -03:00
jaynus
9618fefa67
Merge pull request #384 from acemod/fixmass
...
fix falling over static weapons
2015-04-18 14:36:20 -07:00
ulteq
21c772aa8d
Fixed scope adjustment conflicting with vehicle weapon zeroing
2015-04-18 23:14:40 +02:00
ulteq
454c6dfbfe
Added more GUI elements to structure the ATragMX main page
2015-04-18 22:58:23 +02:00
ulteq
ae3dad4f36
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-18 22:12:45 +02:00
ulteq
283388eb7c
Fixed a small calculation error in the wind speed output
2015-04-18 22:12:37 +02:00
commy2
7ac7bc3f29
eventhandler for creating and deleting cameras
2015-04-18 22:06:42 +02:00
Grzegorz
8dac6d3f3d
Update stringtable.xml
2015-04-18 22:03:36 +02:00
Grzegorz Sikora
0629b59184
Merge branch 'master' of https://github.com/gienkov/ACE3
...
Conflicts:
addons/optionsmenu/stringtable.xml
2015-04-18 22:02:44 +02:00
Grzegorz Sikora
c08125e0f3
PL translation
2015-04-18 22:00:37 +02:00
Glowbal
9825d030e3
Merge pull request #714 from acemod/localMedicalGarbage
...
ACE JIP data and event synchronization (Tested with Litter change)
2015-04-18 21:25:53 +02:00
ulteq
c950324c75
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-18 21:18:18 +02:00
ulteq
d8b461db91
Enabled wind deflection for grenades and vehicle gunners:
...
*Added a new module option to disable WD for vehicle gunners
*Fixed enabled setting not being initialized
2015-04-18 21:17:37 +02:00
bux578
0f2e4c22b7
Merge pull request #749 from FreeZbe/master
...
French: updates / fixes stringtable
2015-04-18 21:16:07 +02:00
bux578
1cbd854412
Merge pull request #748 from gienkov/patch-6
...
PL translation fix
2015-04-18 21:15:30 +02:00
jaynus
f5705a91e6
oops.
2015-04-18 12:04:48 -07:00
jaynus
ca74ce721d
Use cleanup settings, and force server TTL on the events.
2015-04-18 11:48:44 -07:00
jaynus
e54c68f7f9
handle cleanup
2015-04-18 11:37:06 -07:00
jaynus
852b4df61d
Settings changes. createVehicleLocal derp.
2015-04-18 11:16:18 -07:00
jaynus
c438d9e790
Merge remote-tracking branch 'origin/master' into localMedicalGarbage
2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1
Moved to own function.
2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37
Fix settings localization is done by the server instead of client #744
2015-04-18 19:59:41 +02:00
jaynus
dea95f7947
ace_laser_selfdesignate
2015-04-18 10:57:35 -07:00
jaynus
8361ec3812
ace_lasers
2015-04-18 10:57:11 -07:00
jaynus
953faf3d4b
ace_missileguidance privates.
2015-04-18 10:53:21 -07:00
jaynus
87337bcb7a
ace_javelin privates
2015-04-18 10:50:22 -07:00
Glowbal
22456a4301
use pain instead
2015-04-18 19:49:29 +02:00
jaynus
11336cdade
Merge remote-tracking branch 'origin/master' into guidanceHandoff
2015-04-18 10:37:16 -07:00
jaynus
26e2917f79
Merge remote-tracking branch 'origin/master' into laserCodes
...
Conflicts:
addons/javelin/CfgWeapons.hpp
2015-04-18 10:36:07 -07:00
jaynus
1d908c2f70
Merge pull request #677 from acemod/titanCompat
...
Titan static & variant compatability with missile guidance
2015-04-18 10:32:57 -07:00
ulteq
c1ee623808
Added a few static gui elements
2015-04-18 19:22:24 +02:00
jaynus
9c076364ec
Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff.
2015-04-18 10:18:33 -07:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
Grzegorz
34cf11e022
PL translation fix
...
Did not saw that one
2015-04-18 18:48:56 +02:00
jaynus
d1e03d8e7a
Slight tweaks.
2015-04-18 09:40:46 -07:00
jaynus
e14ee45249
debug checking.
2015-04-18 09:29:58 -07:00
ulteq
1b578b8835
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-18 17:45:39 +02:00
ulteq
fc39b81c95
*Fixed a minor bug in the dual inclination calculation
...
*Added a profile namespace format version
*The profileNamespace data is now automatically reset on version mismatch
2015-04-18 17:45:32 +02:00
commy2
370e6bd9a7
maybe fix for #741 , Speedlimiter locking vehicle controls
2015-04-18 17:42:13 +02:00
jaynus
d1993836ae
Cleanup. missing string.
2015-04-18 08:40:28 -07:00
jaynus
c5f5b11d31
strings.
2015-04-18 08:37:21 -07:00
jaynus
f31e3c1fd4
litter simulation createVehicleLocal /w temporal network sync.
2015-04-18 08:31:03 -07:00
Nicolás Badano
4a76b0e5c9
Merge pull request #686 from acemod/modifiableActions
...
Allow to dynamically modify actions at runtime.
2015-04-18 11:24:01 -03:00
Grzegorz Sikora
170a8d0641
PL translation
2015-04-18 16:01:07 +02:00
ulteq
5e45734cf4
Implemented the dual inclination angle input method
2015-04-18 15:52:06 +02:00
ulteq
422e175f09
Implemented the dual wind speed feature
2015-04-18 15:08:54 +02:00
ulteq
4449c99eba
Removed debug output
2015-04-18 12:13:27 +02:00
ulteq
2a6dcbfbcb
Added automatic unit conversion for the target data
2015-04-18 12:12:19 +02:00
ulteq
9057edb1e2
Added a new module option for wind deflection:
...
*enabled - true/false
2015-04-18 11:10:05 +02:00
commy2
4264f78128
player has to put weapon on back before climbing, check if still can climb
2015-04-18 10:16:10 +02:00
commy2
fd821de353
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-18 09:27:07 +02:00
commy2
9633547d6b
tweak ability to climb
2015-04-18 09:26:47 +02:00
PabstMirror
060dc22ad5
Merge pull request #721 from acemod/privatesPass1
...
Privates Var Fixing
2015-04-17 23:51:23 -05:00
PabstMirror
d7da259c11
Merge pull request #688 from acemod/optionMenuStuff
...
Option menu stuff
2015-04-17 23:49:37 -05:00
bux578
e2185d2d4a
Merge pull request #725 from Tachii/patch-9
...
Update stringtable.xml
2015-04-18 06:44:37 +02:00
bux578
a610872863
Merge pull request #724 from Tachii/patch-8
...
Update stringtable.xml
2015-04-18 06:44:20 +02:00
bux578
55cd6536a8
Merge pull request #727 from Tachii/patch-11
...
Update stringtable.xml
2015-04-18 06:44:05 +02:00
bux578
386802cc16
Merge pull request #726 from Tachii/patch-10
...
Update stringtable.xml
2015-04-18 06:42:48 +02:00
bux578
ed242fdea4
Merge pull request #723 from Tachii/patch-7
...
Update stringtable.xml
2015-04-18 06:42:39 +02:00
PabstMirror
caef5c105f
More Privates
2015-04-17 22:40:37 -05:00
PabstMirror
71e62711c6
#731 - stop error if target offscreen
2015-04-17 22:02:23 -05:00
jaynus
c952a97de8
Revert "synced events implemented into litter."
...
This reverts commit 32df4a2adc
2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc
synced events implemented into litter.
2015-04-17 19:33:07 -07:00
jaynus
93d03b404f
JIP Sync events complete.
2015-04-17 19:26:27 -07:00
jaynus
da09b74fe4
Don't JIP check server side, but still have it fire for HC.
2015-04-17 18:27:35 -07:00
jaynus
8fa0c91632
Added PlayerJIP event, handled full requests on JIP.
2015-04-17 18:23:26 -07:00
Tachii
ad61557557
Update stringtable.xml
2015-04-18 03:10:28 +03:00
Tachii
711be038fc
Update stringtable.xml
2015-04-18 03:09:51 +03:00
Tachii
b7c7d2ff15
Update stringtable.xml
2015-04-18 03:04:14 +03:00
commy2
708a2aa374
check if ddls are present on mission start
2015-04-18 01:44:53 +02:00
Tachii
04858bb673
Update stringtable.xml
2015-04-18 02:19:09 +03:00
PabstMirror
ed2e847247
More Privates
2015-04-17 18:13:09 -05:00
Tachii
7f942a06f8
Update stringtable.xml
2015-04-18 02:11:16 +03:00
Tachii
0bb3238db1
Update stringtable.xml
2015-04-18 02:09:59 +03:00
Tachii
bd3ef35c88
Update stringtable.xml
2015-04-18 02:07:49 +03:00
commy2
ad287d3d23
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into error
2015-04-18 01:05:42 +02:00
commy2
3ec5acbdb0
stuff
2015-04-18 01:05:30 +02: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
commy2
25d8c6c93e
function to show error message box
2015-04-17 23:24:43 +02:00
Glowbal
d1a09ae7fc
fixed vehicle crashes for adv
2015-04-17 23:15:41 +02:00
PabstMirror
00f26144ec
More Privates
2015-04-17 15:45:00 -05:00
Glowbal
bc4d102d08
changed variable initialization - everything is now done local
2015-04-17 22:43:31 +02:00
Glowbal
cbc3584f9d
removed duplicate condition attribute
2015-04-17 22:24:42 +02:00
Glowbal
9670267d20
Fixed wrong classnames for IV treatments
2015-04-17 22:21:54 +02:00
Glowbal
f5effca216
fixed handleDamage basic
2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1
Cache condition for target instead of caller
2015-04-17 22:02:43 +02:00
Glowbal
0e858be1b1
Changed conditions for body parts are now always true.
...
This way the medical information is always available, and should help a bit with performance as well.
2015-04-17 22:00:07 +02:00
Grzegorz Sikora
7489e514ce
PL translation
2015-04-17 21:48:04 +02:00
Glowbal
fa7bb5f9c6
Added unconscious state check
2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76
fixes #699
2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169
fixes #653
2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3
fixed AI standing up before being killed
...
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00
Glowbal
9b4435827e
Added setting for unconscious animations on treatment
2015-04-17 20:51:57 +02:00
Glowbal
80139521bc
fixes #691
2015-04-17 20:49:24 +02:00
Glowbal
b333e6e662
Keep units longer unconscious, instead of quickly fading in/out
2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229
Moved unconscious event, so it won't conflict in case the unit is still being carried
2015-04-17 20:38:02 +02:00
Glowbal
0234eedd54
Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit
2015-04-17 20:33:13 +02:00
commy2
0e90199e23
remove debug message
2015-04-17 20:29:01 +02:00
Glowbal
8b7e46c45f
fixes #656
2015-04-17 20:26:28 +02:00
Glowbal
c86be12668
fixes #599
2015-04-17 20:24:05 +02:00
Glowbal
111a350a84
Merge branch 'master' into advMedicalEventSync
2015-04-17 20:11:53 +02:00
Aleksey Yermakov
8a669c390a
Update stringtable.xml
2015-04-17 20:35:34 +03:00
Aleksey Yermakov
2f1ee94d91
Update stringtable.xml
2015-04-17 20:24:32 +03:00
jaynus
2be38c493c
ACE JIP synchronized event infastructure.
2015-04-17 10:21:41 -07:00
Aleksey Yermakov
bf7a7b5bc9
Update stringtable.xml
2015-04-17 20:18:41 +03: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
EpMAK
c88bda487b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
addons/weaponselect/stringtable.xml
2015-04-17 19:48:01 +03:00
EpMAK
31a2f1b279
Russian translations
...
Again, filling strings, fixing errors
2015-04-17 19:36:07 +03:00
PabstMirror
bb2383cffd
#700 - ProgressBar Visual Improvement
2015-04-17 09:51:47 -05:00
ruPaladin
2698490569
medical (patient status semantic fixes)
2015-04-17 17:49:03 +03: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
ruPaladin
874cc75271
medical (semantic correction)
2015-04-17 16:22:02 +03:00
ruPaladin
52dc5d66a4
nametags (fix text overlapping, semantic correct)
2015-04-17 16:09:17 +03:00
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
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
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
