Commit Graph

101 Commits

Author SHA1 Message Date
aa8d3a3fd0 Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis
Unified ellipsis
2016-02-23 08:27:28 +01:00
74ea79e2cc Unified ellipsis 2016-02-22 23:51:47 +01:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
683e727cb4 Readded items 2015-08-19 04:22:39 +02:00
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
965b024bfa Code Cleanup Logistic UAV Battery. 2015-08-16 00:07:17 +02:00
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
fd4d4abb73 Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
240b26b9ac Add IRStrobe 3D Object to attach
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
d934c25b78 Merge branch 'master' into macroSTR
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +02:00
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
3daec7d98d Fix UAV and Interaction Compile Inheritance 2015-05-17 13:51:59 -05:00
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
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
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
060dc22ad5 Merge pull request #721 from acemod/privatesPass1
Privates Var Fixing
2015-04-17 23:51:23 -05:00
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
7f942a06f8 Update stringtable.xml 2015-04-18 02:11:16 +03:00
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +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
1b60a335a5 Translation: J to M
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
ac886828b0 Fixes 2015-04-13 18:02:48 +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
6b39edbddf Update stringtable.xml 2015-04-12 13:58:02 +02:00
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
0805d5b640 Update UAV battery icon from AGM 2015-04-11 16:48:49 -05:00
21abff3713 Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
2015-04-11 21:33:34 +03:00
ea04f4ab3e Revert "Russian Translation"
This reverts commit 17a552bb80.
2015-04-11 21:33:07 +03:00
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
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
68d08b8c7b Revert "Translation"
This reverts commit fab5605ad5.
2015-04-10 19:46:18 +03:00
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
baf015ff5a Added - Portuguese Translation to logistics_uavbattery
The correct translation of "UAV" to Portuguese is indeed "VANT", but this term is not used as "UAV" is. In reality, most Portuguese speaking people knows what an "UAV" is but if you use the Portuguese translation they have no idea of what you are talking about.

Another alternative is to use the word "Drone". Everyone knows what a drone its, however, I find that the "UAV" is more in terms with the authenticity aspect of ACE3, since it the military uses the word "UAV" instead of "Drone"


Also, it seems that somebody wrote  "UAV's" instead of "UAVs". If you intentd to use the plural, you should not use the Apostrophe. I am not correcting this since I am not sure if indeed this was intended for plural or not.
2015-04-10 05:22:46 -03:00
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
669568cafe Merge pull request #157 from KoffeinFlummi/selfInteractionMenu
Self action menu and Action menu on selections
2015-02-23 14:24:43 -03:00
f7d5d615ee allow actions to be defined for different selections 2015-02-19 15:36:27 -03:00
b86869d7a1 UAV-Recharge Headers 2015-02-17 22:37:04 -06:00
ac54e8dfd7 Added UAV exchange battery sound 2015-02-15 12:44:34 +01:00
3581ab480c ace_interaction to required 2015-01-29 01:01:00 -06:00
3bb8775bd2 readme 2015-01-28 14:39:36 -06:00
9a616a85fc VehicleSetFuel event
setFuel says it needs to be local, so switching to event.
Put event in common
2015-01-28 14:38:04 -06:00