Commit Graph

479 Commits

Author SHA1 Message Date
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
54a70f26b1 Moved to own function. 2015-04-18 20:06:01 +02:00
85e5293c37 Fix settings localization is done by the server instead of client #744 2015-04-18 19:59:41 +02:00
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff
Option menu stuff
2015-04-17 23:49:37 -05:00
71e62711c6 #731 - stop error if target offscreen 2015-04-17 22:02:23 -05:00
93d03b404f JIP Sync events complete. 2015-04-17 19:26:27 -07:00
da09b74fe4 Don't JIP check server side, but still have it fire for HC. 2015-04-17 18:27:35 -07:00
8fa0c91632 Added PlayerJIP event, handled full requests on JIP. 2015-04-17 18:23:26 -07:00
708a2aa374 check if ddls are present on mission start 2015-04-18 01:44:53 +02:00
3ec5acbdb0 stuff 2015-04-18 01:05:30 +02:00
25d8c6c93e function to show error message box 2015-04-17 23:24:43 +02:00
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
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
6a942ac820 Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670 2015-04-16 10:10:24 -07:00
2466d83cac Update stringtable.xml 2015-04-16 18:19:11 +03:00
8d8ae3dadb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 02:00:55 +02:00
4169351b1a fix addActionEH didn't work after respawn 2015-04-16 02:00:37 +02:00
361efe4147 Missing NoVoice words
Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp
/ UnderFireE
2015-04-15 17:04:03 -05:00
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
10b1587453 Merge pull request #592 from gienkov/master
PL translation
2015-04-14 20:36:25 -03:00
3543b9c806 PL Translation
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
3c3f6ba4c3 Translation: A to I
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
0e6eb46bb4 Merge pull request #560 from gienkov/master
Further PL translation fixes
2015-04-13 19:18:54 +02:00
fa64225e55 Merge pull request #505 from acemod/muteunit
Muteunit framework, fix #473
2015-04-13 19:18:45 +02:00
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
74967910a3 opps 2015-04-12 18:27:55 -05:00
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -05:00
8d79fd242a Update stringtable.xml
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
2015-04-12 18:18:52 +02:00
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
45ff6c7ce9 French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00