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
13,445 Commits 73 Branches 88 Tags 752 MiB
5ae0ef6bbe
Commit Graph

247 Commits

Author SHA1 Message Date
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02: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
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace 
Cleaned up excessive whitespace
 2016-05-04 11:46:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
PabstMirror
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
Thomas Kooi
ff7dbfa9f2 Merge pull request #3305 from GitHawk/dagr_fix 
Disable ACE_Laser for choppers (aka Changes to DAGR)
 2016-02-20 17:17:46 +01:00
Githawk
9619fc7fb5 Changes to DAGR 
Allow laserLock, set weaponLockSystem to Laser and move class ADDON to
ACE_Hydra70_DAGR
 2016-02-11 16:39:53 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -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
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
IngoKauffmann
1804215dbb Readded caliber for ACE_Hydra70_DAGR 2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599 Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 
Conflicts:
	addons/missileguidance/CfgAmmo.hpp
 2015-10-18 13:19:27 +02:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02:00
Glowbal
3682a1710b Merge pull request #2527 from alef/issues/titan_miss 
Fix: Titan hitting ground instead of vehicle
 2015-10-18 12:11:09 +02:00
Alessandro Foresi
22ac16ead5 Changed: Seeker to aimPoint instead of ASL position 2015-09-19 16:22:36 +02:00
PabstMirror
db41512dc0 #2349 - Don't disable locking for base RocketPods 2015-09-14 22:11:12 -05: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
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
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
jonpas
387aad4204 Removed 3rd party config, Moved ACE Hydra to rearm config to missileguidance 2015-08-18 03:18:38 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
PabstMirror
ab2ebf5fcf MissleGuidance - Move PARAMS up to top 2015-07-03 21:06:13 -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
PabstMirror
ce2a617c7b #1709 - Remove ACE_Comanche_Test from zeus 2015-06-21 13:00:51 -05:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +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
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +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
PabstMirror
0452270380 Add Javelin CfgAmmo 
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
 2015-05-25 05:34:07 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55 fixed some spanish translation 
I fixed some spanish translation.
 2015-05-14 14:32:35 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
GieNkoV
5bbf875ef2 Tabs removed 
Conflicts:
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:02 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
PabstMirror
21552caee7 Opps- Not the same as javelin 2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d MissleGuidance - fix Inheritance check 2015-05-04 22:46:58 -05:00
Lukas
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
licht-im-Norden87
5e8096f29c Update Stringtable: missileguidance 2015-05-01 21:29:49 +02:00
jaynus
c1ba4966f9 Test confirm no bouncy. 2015-05-01 11:53:55 -07:00
jaynus
5bf763a08e quote, not var. 2015-05-01 11:47:49 -07:00
jaynus
2ed05ed469 Merge remote-tracking branch 'origin/master' into laserCodeSelection 2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e Resolved. Conflicts: 
addons/missileguidance/functions/fnc_onFired.sqf
 2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2 Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751 2015-05-01 11:31:37 -07: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
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-01 16:51:20 +02:00
jaynus
e4567fb59f Merge remote-tracking branch 'origin/master' into guidanceClassFixes 
Conflicts:
	addons/javelin/functions/fnc_onOpticDraw.sqf
 2015-05-01 06:59:28 -07:00
commy2
b255d1040b scope 1 for ACE_Comanche_Test, #943 2015-05-01 15:30:11 +02:00
jaynus
21cc0db28f Correctly look up configs. 2015-04-30 09:04:29 -07: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
Dimaslg
864c3ea03b Conflicts resolve again 
Conflicts resolve again
 2015-04-29 21:23:32 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1 Other Fixes 2015-04-29 16:44:42 +02:00
jaynus
283e34779f Don't inherit 2015-04-29 07:05:48 -07:00
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
Josuan Albin
b5524fb3ee French pass 
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
 2015-04-28 18:00:09 +02:00
simon84
8ac6f61fcf added some translations 
added some translations
 2015-04-28 00:36:37 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments. 
sed is awesome.
 2015-04-26 21:05:41 +02:00
Dimaslg
4b7daaa840 Spanish translation 
Minor fixes and spelling mistakes.
 2015-04-25 19:18:04 +02:00
Dimaslg
274663e1b9 Spanish Translation 
Minor fixes and spelling mistakes.
 2015-04-25 18:53:45 +02:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
Nicolás Badano
ce3cc71869 Merge pull request #795 from acemod/fixAuthor 
remove author from items inheriting ACE_ItemCore
 2015-04-21 15:08:53 -03:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +02:00
Ivan Navarro Cabello
55887b7cfe updated stringtable for spanish 
added some spanish translate
 2015-04-21 19:03:55 +02:00
bux578
0d86374bee Merge pull request #754 from gienkov/master 
PL translation
 2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569 isNull 2015-04-18 22:23:19 -05: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
jaynus
2fe7122b3e Disable handoff until completed. 2015-04-18 15:44:07 -07:00
Grzegorz Sikora
c08125e0f3 PL translation 2015-04-18 22:00:37 +02:00
bux578
0f2e4c22b7 Merge pull request #749 from FreeZbe/master 
French: updates / fixes stringtable
 2015-04-18 21:16:07 +02:00
jaynus
953faf3d4b ace_missileguidance privates. 2015-04-18 10:53:21 -07:00
jaynus
11336cdade Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-18 10:37:16 -07:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
jaynus
d1e03d8e7a Slight tweaks. 2015-04-18 09:40:46 -07:00
jaynus
e14ee45249 debug checking. 2015-04-18 09:29:58 -07:00
jaynus
d1993836ae Cleanup. missing string. 2015-04-18 08:40:28 -07:00
EpMAK
31a2f1b279 Russian translations 
Again, filling strings, fixing errors
 2015-04-17 19:36:07 +03:00
jaynus
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
jaynus
ce4a9c3676 Apply javelin guidance to static titans. 2015-04-16 11:32:47 -07:00
jaynus
6d93fe45a6 Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability. 2015-04-16 09:35:21 -07: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