PabstMirror
5f43cffecd
Sort for mag repack
2015-05-05 20:35:08 -05:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/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/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Glowbal
0146439925
increasing the text box height #834
...
Temporary solution until we get something properly done.
Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.
2015-04-24 07:46:01 +02:00
Grzegorz
485fd7078f
Update stringtable.xml
2015-04-22 00:22:44 +02:00
Grzegorz Sikora
222aceaf56
PL fix
2015-04-20 17:11:22 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
PabstMirror
caef5c105f
More Privates
2015-04-17 22:40:37 -05:00
KoffeinFlummi
1b67b2df26
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
KoffeinFlummi
8b915380b7
Merge branch 'hungarian-merge'
2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
Marco
5238647021
Update stringtable.xml
...
Italian
2015-04-15 11:12:15 +02:00
esteldunedain
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
Harakhti
1b60a335a5
Translation: J to M
...
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
Grzegorz Sikora
ac886828b0
Fixes
2015-04-13 18:02:48 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
KoffeinFlummi
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
FreeZbe
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
esteldunedain
0565eb6c74
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
...
Conflicts:
addons/laser_selfdesignate/stringtable.xml
2015-04-12 01:26:55 -03:00
esteldunedain
7b797d906f
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03:00
KoffeinFlummi
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +02:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
VyMajoris
9d326ce9a5
Added - Portuguese translation to magazineRepack
2015-04-11 03:10:39 -03:00
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Anthariel
0c851a6d9a
Update stringtable.xml
...
Added: French Translations (100%)
2015-04-10 06:22:26 +02:00
Grzegorz
685d21169d
magazinerepack PL translation
...
Had to make some shifts in lines 70 and 93 to make it sound good in PL
2015-04-10 03:03:03 +02:00
Legolasindar
2a5e416dfc
Update stringtable.xml
...
fixed spanish terms
2015-04-10 01:40:22 +02:00
esteldunedain
a658cafb4e
Remove line breaks from actions
2015-04-04 01:45:03 -03:00
PabstMirror
6cd7ab2f7d
Fix getChildren - condition/only show inv mags
2015-04-03 22:37:48 -05:00
PabstMirror
a92a541234
Headers
2015-04-01 23:05:41 -05:00
PabstMirror
c9352e1970
And This
2015-04-01 15:18:39 -05:00
PabstMirror
4e66aea25d
Make it work
2015-04-01 15:09:05 -05:00
PabstMirror
1303f59cd8
opps
2015-04-01 13:09:22 -05:00
PabstMirror
0d27806571
Repack Mag Child Actions
2015-04-01 13:09:03 -05:00
PabstMirror
43a9e7bfc8
#176 - Belt Repacking
2015-04-01 11:21:30 -05:00
commy2
772551cbb3
fix broken hungarian string
2015-03-28 07:39:23 +01:00
commy2
5f1201d75a
fix unexpected stringtable format
2015-03-27 19:08:01 +01:00
Nicolás Badano
8b3648cf8d
Configure exceptions for self actions inside vehicles
2015-03-24 15:43:49 -03:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
Nicolás Badano
a823fb2dca
Tweaks on action names to:
...
- Remove >> for submenus
- Split long action names in two lines
2015-03-24 00:16:32 -03:00
Nicolás Badano
2b0cfac8e4
Removed obsolote code from ace_interaction ( #109 )
2015-02-28 23:00:24 -03:00
PabstMirror
7545a6c3d8
Code cleanup
2015-02-11 15:43:08 -06:00
PabstMirror
24bd515814
Commenting and some stringtables
2015-02-08 22:44:23 -06:00
PabstMirror
da9fc39103
Headers and Finish Notice
2015-02-08 17:35:21 -06:00
PabstMirror
e770a74630
Headers
2015-02-08 16:36:58 -06:00
PabstMirror
3f6ffa6ac2
Mag Repack - Keep Progress prototype
...
Ideas from AGM and CSE
Keeps Progress While Repacking if interrupted
Added sounds from CSE
2015-02-08 13:48:53 -06:00
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
PabstMirror
bf791e32c4
Merge pull request #93 from KoffeinFlummi/progresBarNew
...
#87 - New Progress Bar
2015-01-27 19:28:51 -06:00
KoffeinFlummi
c407553d49
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
PabstMirror
5e932f8c71
Replace calls to progressBar
...
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
commy2
7cd2bc24c8
port magazinerepack
2015-01-16 15:37:32 +01:00
