Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,491 Commits 73 Branches 88 Tags 752 MiB
6e99e8a951
Commit Graph

87 Commits

Author SHA1 Message Date
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
Josuan Albin
19da369887 Add back missing portuguese strings in inventory 2016-06-19 13:27:26 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
Josuan Albin
7c9dcf6bdb Merge branch 'pr/3480' 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/cargo/stringtable.xml
	addons/flashlights/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/main/stringtable.xml
	addons/map/stringtable.xml
 2016-06-18 16:26:46 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
commy2
8603f2062a simplify 2016-03-06 07:14:43 +01:00
commy2
f43b287093 use namespace for cargo filters, fixes problem with save games 2016-03-06 06:53:59 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
NorXAengell
772c4cc100 Another batch of translations and corrections (Fr) 2016-03-01 02:27:19 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
4335bfbfcf replace inventoryDisplayLoaded with DisplayLoad event 2016-02-21 21:24:39 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
bux
49f565f541 fix merging errors 2016-02-18 20:05:30 +01:00
bux578
93e655588b Merge pull request #3294 from gienkov/pltranslations 
pl translation
 2016-02-18 19:38:43 +01:00
licht-im-Norden87
03b4a0e8fb Update German Stringtable 2016-02-10 16:24:18 +01:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
commy2
0a9048815b simlify some select CODE statements 2016-02-06 14:59:31 +01:00
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
commy2
ecad63e34d integrate filters pbo into inventory pbo 2016-01-03 14:47:37 +01:00
PabstMirror
e81dd0729e Inventory Resize UI - changes for 154 GL-Mags 2015-11-19 15:54:43 -06:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
jonpas
541f1010a7 Merge branch 'master' into macroSTR 
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
 2015-06-02 22:14:32 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Macusercom
7eeddfbd65 German translations 
Added a lot of German translations and fixed even more typos.
 2015-05-26 17:04:53 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
SAM
021679208b First batch of settings files 
Separating ACE_Settings.hpp from config.cpp
 2015-05-14 20:46:35 +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
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
ruPaladin
a4980a91e1 inventory (semantic correction) 2015-04-17 16:04:26 +03:00
PabstMirror
1729c781bd Cleanup / private vars 2015-04-16 19:46:42 -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