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,654 Commits 73 Branches 88 Tags 752 MiB
e0d4583be9
Commit Graph

169 Commits

Author SHA1 Message Date
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
0b84bb514b fix Cfg capitalization 2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
SilentSpike
c731d83642 Merge pull request #2848 from acemod/fixForEachDeleteAt 
fix Issue with forEach Loops and deleteAt Index
 2015-11-25 14:00:37 +00:00
SilentSpike
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
SilentSpike
a718c82780 Implement nice index deletion iteration solution 
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
 2015-11-17 16:02:56 +00:00
jokoho48
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE 
Fix that PPEffects Throw a error on HC
 2015-09-15 21:04:37 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +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
[OMCB]kaban
ce49f752f1 Fix due to review 2015-09-05 05:14:34 +03: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
commy2
5e68486233 high command module breaks ace, fix #2134 2015-09-01 10:06:01 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
Michael Braun
f5a497332a Updated parameterization in Winddeflection module. 2015-08-04 23:52:16 +02:00
PabstMirror
52130d5a45 Switch to some already translated CSTRINGs 2015-08-03 15:52:35 -05:00
Harakhti
b2aa5eee45 Row 3 
BINGO FUEL
 2015-07-30 16:28:50 +02:00
Harakhti
2b23958fd1 Row 2 
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
 2015-07-30 16:06:32 +02:00
PabstMirror
ffc5615abd Merge pull request #1886 from acemod/windDeflectionSinglePFEH 
Wind deflection single pfeh
 2015-07-25 14:01:45 -05:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
4d7a2888eb Remove Debug 2015-07-22 03:27:40 -05:00
PabstMirror
8f18fd7eaa Single PFEH for wind deflection 2015-07-22 03:04:54 -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
Macusercom
09f7473d7b Added German translations 2015-06-16 03:06:47 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05: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
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
Macusercom
5cb0953094 Fixed German translations 
Fixed some typos and phrases
 2015-05-27 19:11:32 +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
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07: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
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
ulteq
0b3d3b8793 Added missing PBOPREFIX files 2015-05-11 17:37:08 +02: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
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
Alessandro Foresi
7e7c3ed053 Added: More italian translations 2015-05-10 00:04:42 +02:00
ulteq
b80602fbae Fixed a typo 2015-05-09 18:55:00 +02:00
ulteq
30ff90453b wind deflection has wrong version number macro setup 2015-05-09 18:32:19 +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
ulteq
9bd32f5797 Fixed an incorrect module setting description 2015-04-26 22:33:11 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +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
bux578
fa8e954d27 Merge pull request #757 from Tachii/patch-12 
Update stringtable.xml
 2015-04-19 07:10:45 +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
Tachii
560646e1e1 Update stringtable.xml 2015-04-19 01:18:53 +03:00
ulteq
d8b461db91 Enabled wind deflection for grenades and vehicle gunners: 
*Added a new module option to disable WD for vehicle gunners
*Fixed enabled setting not being initialized
 2015-04-18 21:17:37 +02:00
ulteq
9057edb1e2 Added a new module option for wind deflection: 
*enabled - true/false
 2015-04-18 11:10:05 +02:00
EpMAK
c88bda487b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	addons/weaponselect/stringtable.xml
 2015-04-17 19:48:01 +03: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
simon84
e7f9bc09df German translations 
Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-16 22:52:49 +02:00
simon84
cc75928cc0 Merge remote-tracking branch 'acemod/master' 
Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-16 22:47:51 +02:00
ulteq
aeffc55859 Added missing privates 2015-04-16 18:52:48 +02:00
ulteq
defe46b769 Added new PFH abort condition (velocity < 100 m/s) 2015-04-16 17:30:50 +02:00
Marco
a129f18a2a Update stringtable.xml 
Italian
 2015-04-16 10:13:50 +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
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
Harakhti
e7e46b3b59 Translation: S to W 
That's all I've found so far.
 2015-04-14 00:05:39 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
 2015-04-13 21:35:53 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
ulteq
c8aa3032fe Added some sanity checks to the module setting initialization 2015-04-13 12:54:06 +02:00
Anthariel
8339d15087 Update stringtable.xml 
Added: French translations (note, I've already removed a % at the line 30
 2015-04-13 02:21:57 +02:00
simon84
51bc7208bc German translation 
Some german translations and corrections
 2015-04-12 20:52:15 +02:00
ulteq
8f2261acdd Removed debug output 2015-04-12 16:19:39 +02:00
ulteq
ebb34a4f21 New default simulation interval of 0.05s 2015-04-12 16:19:32 +02:00
licht-im-Norden87
dbc7026d94 ..... 2015-04-12 14:38:04 +02:00
licht-im-Norden87
b144a42e63 Update stringtable.xml 2015-04-12 14:30:40 +02:00
KoffeinFlummi
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge 
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/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/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations 
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
 2015-04-12 14:15:45 +02:00
ulteq
9fd19563a3 Fixed several syntax errors 2015-04-12 12:52:13 +02:00
ulteq
85a7bea42b Added wind deflection module settings: 
*simulationInterval
*simulationRadius
 2015-04-12 12:33:09 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
ulteq
2c4c6763c3 Removed deprecated CSE code (EnableForAI module option) 2015-04-10 19:02:32 +02:00
EpMAK
17a552bb80 Russian Translation 
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
 2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation" 
This reverts commit fab5605ad5.
 2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
ulteq
ad8e6450eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-10 15:44:33 +02:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
c7d3618d79 Update stringtable.xml 
fix spanish term
 2015-04-10 13:43:39 +02:00
ulteq
ab238cf404 Removed isDedicated checks 2015-04-09 20:39:38 +02:00
ulteq
5ff54f7d1c Implemented a new logic that decides when to use AB. 
*Added a new global variable ace_advanced_ballistics_enabled
*Added an updateTrajectoryPFH to the winddeflection (WD) module
*WD is now automatically disabled when AB is enabled
*The new updateTrajectoryPFH is called whenever AB aborts

-> Wind deflection is now always present (either through AB or WD)
-> AB no longer runs for non local units (unless they use high power optics)
 2015-04-09 20:27:10 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
ulteq
e3626eca00 The winddeflection firedEH will now exit automatically, when the advanced_ballistics module is present. 2015-04-08 12:42:56 +02:00
ulteq
96ba28afa3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 20:34:21 +02:00