Commit Graph

168 Commits

Author SHA1 Message Date
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
291f4df072 Update German Stringtables
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
2015-12-04 22:06:44 -06:00
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
42ce11cfee Merge pull request #2679 from acemod/340missingmags
fix missing magazines after certain scenarios
2015-10-04 11:46:36 +02:00
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
6d9943ff2e fix wrong macro, missing ; 2015-09-26 16:45:39 +02:00
b1fb7befe8 remove wrong isServer check 2015-09-26 16:32:29 +02:00
5425836e47 cleanup respawn module, close #2184 2015-09-26 16:28:18 +02:00
1848ea6325 fixez 2015-09-22 14:58:59 +02:00
55eae90484 tabz 2015-09-22 02:35:06 +02:00
b05f0c62ff missing english respawn strings 2015-09-22 00:36:10 +02:00
89a1495534 Add missing english string 2015-09-21 00:42:08 +02:00
30ba4f5586 this append should've been pushBack 2015-09-18 23:34:49 +02:00
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
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
6c48a4a0de Fix due to review 2015-09-05 05:07:18 +03:00
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
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
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
3d9b0d527c fix indentation
atom needed the editorconfig package
2015-08-15 18:58:31 +02:00
675cfc2da7 after respawn select last weapon, muzzle and mode
#2138
2015-08-15 18:54:39 +02:00
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
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
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
4e8fc49b5e Always remove fakeWeapon after adding
Should fix #1500
2015-06-05 15:38:45 -05:00
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
ee85aab791 fix #1439 2015-06-04 14:30:38 +02:00
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
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
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
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
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00