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,620 Commits 73 Branches 88 Tags 752 MiB
883006c420
Commit Graph

205 Commits

Author SHA1 Message Date
commy2
6d9943ff2e fix wrong macro, missing ; 2015-09-26 16:45:39 +02:00
commy2
b1fb7befe8 remove wrong isServer check 2015-09-26 16:32:29 +02:00
commy2
5425836e47 cleanup respawn module, close #2184 2015-09-26 16:28:18 +02:00
Grzegorz
1848ea6325 fixez 2015-09-22 14:58:59 +02:00
Grzegorz
55eae90484 tabz 2015-09-22 02:35:06 +02:00
gienkov
b05f0c62ff missing english respawn strings 2015-09-22 00:36:10 +02:00
Grzegorz
89a1495534 Add missing english string 2015-09-21 00:42:08 +02:00
commy2
30ba4f5586 this append should've been pushBack 2015-09-18 23:34:49 +02:00
commy2
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros 
Feature/switch to log macros
 2015-09-15 14:51:23 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02: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
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
 2015-09-09 02:55:12 +02:00
[OMCB]kaban
6c48a4a0de Fix due to review 2015-09-05 05:07:18 +03:00
bux578
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
bux578
3d9b0d527c fix indentation 
atom needed the editorconfig package
 2015-08-15 18:58:31 +02:00
bux578
675cfc2da7 after respawn select last weapon, muzzle and mode 
#2138
 2015-08-15 18:54:39 +02:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
PabstMirror
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding 
Should fix #1500
 2015-06-05 15:38:45 -05:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR 
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
 2015-06-04 17:13:09 +02:00
bux578
ee85aab791 fix #1439 2015-06-04 14:30:38 +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
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules 
Delay initialization of modules until settings are properly setup
 2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
esteldunedain
9d29aa2107 - Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing. 
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
 2015-05-30 01:37:41 -03:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6f6f2a55f0 Stringtable fixes except medical 2015-05-27 21:43:30 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736 added spansih translate 
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
 2015-05-27 15:27:04 +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
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
GieNkoV
ed1acd8c15 Some small errors fixed #2 
Mainly tabs and wrong italian strings (got those from newest master)
 2015-05-12 19:42:35 +02:00
Grzegorz Sikora
44466e8be8 Remove tabs and repair errors @Glowbal found 
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
ViperMaul
e75c4594e6 Added missing $PBOPREFIX$ for respawn 2015-05-11 15:17:44 -07:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095 
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
 2015-05-10 16:19:46 +02:00
Alessandro Foresi
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
Glowbal
a49feee76b should have been defaultValue 2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2 lets use proper module config for this 2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1 Make certain that GVAR(BodyRemoveTimer) exists 2015-05-05 19:44:44 +02:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f More more translations 
Stope.
 2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
FreeZbe
6f5e64b4a5 French : update / fix stringtable 2015-05-01 23:10:06 +02:00
KoffeinFlummi
d8299332e4 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86 Merge branch 'master' into spanish-merge 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
licht-im-Norden87
d12c7ff048 Update Stringtable: Rallypoint 
Angleichung
 2015-05-01 21:25:39 +02:00
KoffeinFlummi
c9ff497c83 Merge branch 'master' into polish-merge 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 21:13:36 +02:00
Felix Wiegand
90275b272e Merge pull request #950 from Tachii/patch-19 
Added few missing ru strings
 2015-05-01 21:11:37 +02:00
Lubomír Blažek
dcb3196e58 Czech strings 2015-05-01 20:52:41 +02:00
Tachii
bed298d5b3 Update stringtable.xml 2015-05-01 21:38:05 +03:00
Grzegorz
7e87c3a250 Update stringtable.xml 2015-05-01 19:32:59 +02:00
Grzegorz Sikora
4668869959 PL translation 2015-05-01 19:30:30 +02:00
Tachii
889275091e Update stringtable.xml 2015-05-01 20:24:13 +03:00
Tachii
1771b61578 added 2 missing ru strings 2015-05-01 20:23:05 +03:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 17:30:59 +02:00
esteldunedain
a0923aa5c3 Tweak the position for rally point actions. Fix #837 2015-05-01 01:57:37 -03:00
commy2
2ae5538df5 change wrong strings 2015-04-30 22:46:08 +02:00
Harakhti
4e165e2572 Update Hungarian translations 
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
 2015-04-30 13:25:25 +02:00
ulteq
2c97b20781 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/vehiclelock/stringtable.xml
 2015-04-30 13:20:31 +02:00
NukeDev
d4dc5e6d85 Other Fixes 2 2015-04-29 17:22:20 +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
commy2
aabe532829 manual merge 2015-04-26 21:26:57 +02:00
VyMajoris
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
commy2
9cb27c8fb2 fix: error when getting killed with FF-messages module, fix #745 2015-04-19 07:08:57 +02: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
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
Grzegorz Sikora
7489e514ce PL translation 2015-04-17 21:48:04 +02:00
EpMAK
31a2f1b279 Russian translations 
Again, filling strings, fixing errors
 2015-04-17 19:36:07 +03:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
EpMAK
c2214efeb1 Russian stringtables finished 
Filled all the missing lines, little errors fixed.
 2015-04-17 14:54:28 +03:00
Ivan Navarro Cabello
61d1e6854e added spanish translation 
added spanish translation to ballistics and respawn
 2015-04-16 19:03:15 +02:00
Marco
13de953aab Update stringtable.xml 
IT
 2015-04-16 10:23:34 +02:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
commy2
9c1b40f5a3 preparing for improved positions of action points 2015-04-15 16:40:20 +02:00
commy2
bf8f9b4818 all I need is a $ 2015-04-15 15:34:01 +02:00
commy2
e3d1946924 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 14:37:49 +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
commy2
09289fbf48 only on server though 2015-04-15 08:34:30 +02:00
commy2
6c4e50a98d localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot 2015-04-15 08:31:40 +02:00
Niko Lehtovirta
df8a958c42 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-15 06:45:42 +03:00