Commit Graph

270 Commits

Author SHA1 Message Date
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193)
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05:00
PabstMirror
bfd3695868 SQF Lint Cleanup Pass (#5157)
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
2017-05-14 14:48:05 -05:00
11RDP-LoupVert
bcd73edaba French localization complete (#5079)
* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.
2017-04-12 10:39:41 +02:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988)
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
2017-04-11 10:06:29 -05:00
jonpas
b7f36ffd12 Add orange map chemlight entry (#4839) 2017-01-18 18:18:28 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821)
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
2017-01-17 15:33:22 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794)
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
2017-01-02 17:52:01 -06:00
markooff
0c069a6bd2 polish translations (#4734)
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
2017-01-02 13:21:47 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
classicarma
d33219b9ba Japanese translations (#4553) 2016-10-18 20:19:27 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
4c2692c2ba translate map 2016-09-28 01:14:38 +09:00
commy2
c1ead851cb Add 3den attribute to disable bft (#4452)
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer)
Use short circuit for loadout change and add note
2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00
freghar
9fa247398f add BlueForceTracking filtering via an object variable (#4196)
There's no good workaround for this:

 * creating a dummy unit on [0,0,0] and making it leader prevents
   grp members from entering vehicles
 * joining group of a different side prevents grp members from seeing
   blueforce tracking markers of their original side

Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames):

  _obj setVariable ["ACE_map_hideBlueForceMarker", true];

The inverse, hiding of markers of other groups/units for a particular
player, can be already done by 'ace_map_BFT_Enabled = false' locally,
as the Update function checks for it every time.

Signed-off-by: freghar <freghcz@gmail.com>
2016-08-16 19:28:21 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
commy2
08886f413c change remaining ace events to CBA 'addPlayerEventHandler' 2016-06-22 11:16:55 +02:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +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
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
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
voiper
d5b3b03c1c Make flashlight on/off + glow a PVAR.
Clean up all privates.
Change glow proxies to not inherit from chemlight_base, to avoid ammo detection issues.
Make handleDisconnect glow deletion dedi server compatible (was only listen server compatible).
Clean up determineMapLight: faster when no chemlights nearby, a tad slower when chemlights nearby, however sources the colour settings directly from the chemlight's config.
2016-06-17 17:18:06 -07:00
voiper
a20629066a Further cleanup. Checked some privates. 2016-06-15 16:27:46 -07:00
voiper
2158d39e8a Used QPATHTOF. Reverted config names.
Optimised fnc_getUnitFlashlights.
2016-06-15 14:58:07 -07:00
voiper
01c335d13a More cleanup + a bug fix. 2016-06-13 19:23:14 -07:00
voiper
69c3dd5cfb Remove extra bracket. 2016-06-13 18:42:45 -07:00
voiper
1ffd9d58ab Revert postInit. 2016-06-12 15:39:16 -07:00
voiper
f3fc99f3b8 Housekeeping of ace_flashlights and ace_map.
ace_map now handles flashlights independently of ace_flashlights.
ace_map searches for flashlight beam textures directly from weapon configs.
ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).
2016-06-12 15:31:11 -07:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -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
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
voiperr
52ea640c4b ace_map: More realistic flashlight glow + minor fix (#3824)
* -Converted flashlight glow object to chemlight type (emits light without sprite)
-Fixed issue where glow object was being deleted without being first detached

* Cleanup of temp classes.

* Spaces before and after =

* Moved effects into Effects.hpp.
2016-05-27 19:16:15 +02:00
jonpas
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
looterz
b86e5d8ad6 Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer 2016-03-01 18:23:33 -06: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
Thomas Kooi
ae136af2d6 Merge pull request #3415 from looterz/bftplayernames
Added Show Player Names option to Blue Force Tracking Module
2016-02-27 12:43:15 +01:00
looterz
8b534bb4bf Fixed ACE_Settings.hpp GVAR's missing category 2016-02-26 19:00:55 -06:00
looterz
859a4321c6 Actually, nevermind that last commit 2016-02-25 09:03:30 -06:00
looterz
e6314eb114 Wrapped _groupsToDrawMarkers filtering with a condition check 2016-02-25 09:00:47 -06:00
looterz
b354fed39a Moved _playersToDrawMarkers into BFT_ShowPlayerNames code region 2016-02-25 08:35:33 -06:00
looterz
00f06f81d1 Added Show Player Names option to Blue Force Tracking Module 2016-02-25 07:57:32 -06:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
commy2
0a9048815b simlify some select CODE statements 2016-02-06 14:59:31 +01:00
commy2
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval
As per @alganthe's comment on #3114
2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master
Fixed and added French Translation
2016-02-04 20:28:00 +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
Luigi
7f9c766770 Fixed and added French Translation 2016-01-04 16:47:15 +01:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
5f74daec42 Fix dupe german stringtable entry 2015-12-31 22:28:35 -06:00
licht-im-Norden87
2d64d54d98 Update German Stringtable
Iam sure there was a translation some time ago. Someone must have deleted it.

spelling mistake

Update Stringtable

100% some of them already existed in german language

Update stringtable.xml

spelling mistake

Update stringtable.xml

Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.

Update stringtable.xml
2015-12-31 14:17:13 -06:00
freghar
a383da5b2d fix inverted isTurnedOut for map lighting
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).

Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
PabstMirror
575fabb69d #2872-Map time support for subclasses of ItemWatch 2015-11-24 16:17:06 -06:00
PabstMirror
7981faad64 private -> local 2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d Merge branch 'master' into fixFlashlightPrivates 2015-11-23 17:45:41 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
kaban
f8481ae5f2 Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
Conflicts:
	addons/captives/stringtable.xml
2015-11-18 06:39:58 +03:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
PabstMirror
e72c1d874a Merge branch 'master' into fixFlashlightPrivates
Conflicts:
	addons/map/functions/fnc_determineMapLight.sqf
2015-11-10 21:21:06 -06:00
PabstMirror
01d679c5dc #2810 - Delete map glow light from DC players 2015-11-07 14:33:41 -06:00
PabstMirror
ff60cdcfa3 #2828 - Fix empty flashlightProxy model 2015-11-07 11:44:31 -06:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Jonathan Pereira
ce5364d7af Added PT-BR translations
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
PabstMirror
acc3504d7b Merge branch 'master' into fixFlashlightPrivates
Conflicts:
	addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
Glowbal
843eb16837 Merge pull request #2650 from acemod/setDefaultChannel
Set Default Channel at mission start
2015-10-18 12:28:13 +02:00
PabstMirror
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00