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
esteldunedain
765ae4ee64
Merge branch 'master' into tabCleanup
...
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
bux578
9ce2e38814
removed <orignal> language entry
2015-04-07 09:27:26 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
ulteq
93eaaeb8e2
Added new advanced_ballistics module
2015-04-05 21:08:55 +02:00
Glowbal
8226edc6cb
Fixed module function call
...
Wind deflection module was using the incorrect function name,
2015-04-03 09:43:06 +02:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
PabstMirror
3febb1e770
WindDef - Convert to use FiredBIS
2015-03-12 00:28:33 -05:00
PabstMirror
86441ce6c5
WindDef - Enable Eventhandler
2015-03-12 00:18:18 -05:00
PabstMirror
fb3a610649
Fix bad STR_ACE_Common_ACETeam
2015-02-14 00:39:09 -06:00
Nicolás Badano
d65a740b7a
WindDeflection using ace_settings
2015-02-03 17:47:25 -03:00
Nicolás Badano
74d0ae95ff
Change ACE_Settings from modules
2015-02-03 02:53:02 -03:00
Thomas Kooi
27798fbe8f
Minor optimizations
...
Renamed from basic ballistics to wind deflection
2015-01-29 13:58:22 +01:00
Thomas Kooi
794379c774
Fixed incorrect classname CfgAddons
2015-01-28 18:51:27 +01:00
Thomas Kooi
2e05e5ac39
Replaced isPlayer by EFUNC(common,isPlayer)
2015-01-28 18:02:49 +01:00
Thomas Kooi
44997e1d4a
Removed bullet database concept
2015-01-28 17:58:28 +01:00
Thomas Kooi
8014da1407
Added ACE_weather dependency
2015-01-28 17:48:49 +01:00
Thomas Kooi
b092ecf280
Replaced wind by ACE_wind
2015-01-28 17:48:36 +01:00
Thomas Kooi
a5cef8da3d
Added readme file
2015-01-28 17:38:33 +01:00
Thomas Kooi
2def603a58
Finalized port of basic ballistics
2015-01-28 17:36:47 +01:00
