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
12,396 Commits 73 Branches 88 Tags 752 MiB
3bbc1d21e4
Commit Graph

300 Commits

Author SHA1 Message Date
jonpas
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
gienkov
b5eb39291c Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-06-04 00:52:35 +02:00
ulteq
f0849e70ff Slightly increased the alpha value of the bullet trace effect. 2015-06-02 23:11:44 +02:00
ulteq
16f6650486 Decreased the velocity threshold for the bullet trace effect 2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13 Removed newline brackets 2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9 Increased the protractor size 2015-06-02 22:37:27 +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
Glowbal
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
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
gienkov
a173b5b048 TABS 2015-05-31 22:46:32 +02:00
gienkov
212862a401 Merge remote-tracking branch 'origin' into pl-translation-1 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
 2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12 German 1 correction for Advanced Ballistics 2015-05-31 20:31:38 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
Macusercom
489751f5aa More German string fixed 
As recommended...
 2015-05-28 16:21:53 +02:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +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
esteldunedain
bb99d5a860 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
 2015-05-27 12:08:47 -03: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
Grzegorz
d96873b8a0 Fix line ending 2015-05-23 21:16:36 +02:00
gienkov
8ef41b7523 Translate missing frag and adv. ball. strings to PL 2015-05-23 21:16:34 +02:00
jonpas
030b509ec5 Fixed missing close tag in Advanced Ballistics stringtable 2015-05-23 03:34:11 +02:00
ulteq
9536423f2e Merge pull request #1353 from acemod/cleanup_ATragMX_AB 
Removed a deprecated function and fixed some typos.
 2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2 Removed a deprecated function and fixed some typos. 2015-05-22 18:42:09 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
ulteq
7d3bb526dd Merge pull request #1263 from acemod/bulletTraceTweak 
Slightly increased the bullet trace effect size
 2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0 Slightly decreased the visibility of the bullet trace effect. 2015-05-20 22:12:02 +02:00
Grzegorz
96322fe689 PL translation for new advanced ballistics option 2015-05-20 17:17:08 +02:00
ulteq
c81446400c Grammar 2015-05-20 10:14:10 +02:00
ulteq
28c8aba9bd Added missing ! 2015-05-19 20:46:55 +02:00
ulteq
57c37ecb9a Reorder/Rewrite of some advanced ballistics module options: 
* alwaysSimulateForSnipers -> simulateForSnipers
* alwaysSimulateForGroupMembers -> simulateForGroupMembers
* onlyActiveForLocalPlayers -> simulateForEveryone
 2015-05-19 20:46:13 +02:00
Grzegorz
e3aabe2c42 PL translation for new advanced ballistics option 2015-05-19 18:52:17 +02:00
ulteq
8eaf754fdd Further increased the visibility of the bullet trace effect. 2015-05-18 10:56:34 +02:00
ulteq
4513b02c10 Experiment with the bullet trace effect size 2015-05-17 12:57:55 +02:00
ulteq
96b92ac172 Added a new module option for advanced ballistics: 
* alwaysSimulateForGroupMembers
 2015-05-17 11:45:55 +02:00
ulteq
7474d7f313 Merge pull request #1193 from acemod/getTemperatureAtHeight 
Moved all temperature calculations into the weather module.
 2015-05-14 16:41:16 +02:00
ulteq
cf487b544e Moved all temperature calculations into the weather module. 2015-05-14 16:07:41 +02:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +02:00
ulteq
26843dad88 Merge pull request #1057 from acemod/abConfigCaching 
Config caching (advanced ballistics)
 2015-05-13 11:30:21 +02:00
ulteq
d04ebef519 Merge pull request #1106 from acemod/refactorCalcWindSpeed 
Moved all wind calculations into the weather module
 2015-05-13 11:23:32 +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
ulteq
b03333c9e8 Moved all wind calculations into the weather module 2015-05-11 10:59:07 +02:00
ulteq
d32e1024d3 Fixed a typo 2015-05-10 11:09:14 +02:00
ulteq
0a9dbfba87 Privates cleanup 2015-05-08 18:47:17 +02:00
ulteq
03fd740f8e Config caching is now done in the uiNamespace 2015-05-08 18:43:26 +02:00
ulteq
9a0fcd4fec AB config read caching 2015-05-08 17:20:56 +02:00
ulteq
1f15e68c30 Global variable cleanup 2015-05-08 16:00:41 +02:00
ulteq
fd0ca58fe6 Fixes broken bullet trace effect (caliber is now in mm, not inches) 2015-05-08 15:25:32 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
ulteq
fa07110311 The stability factor calculation is all metric now 2015-05-08 10:46:59 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
ulteq
4239772ce9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-02 00:36:34 +02:00
ulteq
884da7742e Disabled AB terrain init, if AB is not enabled 2015-05-02 00:36:23 +02:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
debfe990e8 Fix duplicates 2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language 
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
 2015-05-01 22:23:03 +02:00
Lubomír Blažek
dcb3196e58 Czech strings 2015-05-01 20:52:41 +02: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
ulteq
723ffc21d1 Removed unneeded TODO 2015-05-01 10:26:37 +02:00
ulteq
2219339e24 Fixed a typo 2015-05-01 10:25:59 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02: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
af2dc62705 Improved a module setting description 2015-04-26 22:44:18 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments. 
sed is awesome.
 2015-04-26 21:05:41 +02:00
ulteq
4a8153b757 Replaced EXPLODE_4_PVT macro inside of ABs PFH 2015-04-25 17:19:43 +02:00
ulteq
eca7657ffa Removed a bunch of obsolete code: 
*Obsolete, as of: 6fdaf4c400
 2015-04-25 13:34:47 +02:00
ulteq
b053a641d9 Improved bullet trace visibility check 2015-04-25 13:15:54 +02:00
ulteq
d8eee168aa Improved onlyActiveForLocalPlayers abort condition check: 
*Fixed alwaysSimulateForSnipers abort condition
 2015-04-25 12:59:26 +02:00
ulteq
2d14ae61f9 Simplified muzzle velocity shift calculation: 
*Also added some missing privates
 2015-04-25 12:36:04 +02:00
ulteq
d414e5a3a1 Removed unused define 2015-04-25 12:08:31 +02:00
ulteq
6fdaf4c400 Completely removed the SQF version of the advanced ballistics PFH 2015-04-25 10:59:48 +02:00
ulteq
f645672281 At least set GVAR(extensionAvailable) to true 2015-04-25 10:38:28 +02:00
ulteq
6361bda3e9 Removed unused function 2015-04-24 13:01:11 +02:00
ulteq
eb88f94cf7 Removed unused privates 2015-04-24 11:53:06 +02:00
jaynus
b2c5e5e9f1 Remove AB verison check until versioning is complete. 2015-04-21 17:04:16 -07:00
commy2
ea368511b7 ace extensions class for modularity 2015-04-20 18:48:58 +02:00
ulteq
89e33dc177 Refactored the weather module: 
* No changes in functionality
 2015-04-20 13:54:22 +02:00
ulteq
6c2982548f Fixed incorrect function header 2015-04-20 12:35:08 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
nomisum
d865e9c038 fixed typo 2015-04-17 11:42:47 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
KoffeinFlummi
bf0aa6f344 Merge branch 'spanish-merge' 2015-04-16 18:32:37 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-16 18:31:31 +02:00
ulteq
4e4dee18df Added missing privates / Removed unused privates 2015-04-16 18:21:19 +02:00
ulteq
5117595ecc Minor performance improvement 2015-04-16 17:52:21 +02:00
ulteq
defe46b769 Added new PFH abort condition (velocity < 100 m/s) 2015-04-16 17:30:50 +02:00
ulteq
15240ac87c Minor code change in the extension detection logic 2015-04-16 13:42:28 +02:00
FreeZbe
5a7ad82170 French : update stringtable 2015-04-15 21:26:12 +02:00
ruPaladin
fe72eef3da Update stringtable.xml 2015-04-15 20:02:41 +03:00
Legolasindar
bbc24b6d02 Update stringtable.xml 
added spanish translate
 2015-04-15 16:49:43 +02:00
Nicolás Badano
527385e6e1 Merge pull request #609 from ramius86/patch-2 
Update stringtable.xml
 2015-04-15 09:57:15 -03:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers: 
*Wind info
*Protractor
 2015-04-15 12:53:02 +02:00
Marco
532ee16411 Update stringtable.xml 
Italian translation
 2015-04-15 10:30:56 +02:00
esteldunedain
c827c72412 AB and Kestrel: Move macros from defines.h to script_component 2015-04-14 10:22:26 -03:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
ea78a6325f Changed the module setting defaults 2015-04-13 21:20:07 +02:00
ulteq
d8c23c2a64 Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp 2015-04-13 14:46:21 +02:00
ulteq
5354d6578b Simplified the AB PFH massively 2015-04-13 12:56:53 +02:00
ulteq
63760acc4f Added an error message when the ab extension is missing 2015-04-13 12:56:18 +02:00
ulteq
c8aa3032fe Added some sanity checks to the module setting initialization 2015-04-13 12:54:06 +02:00
ulteq
6b44a3f3f9 Updated the module settings init script 2015-04-12 16:31:12 +02:00
ulteq
e003db2454 Fixed a typo 2015-04-12 16:27:24 +02:00
ulteq
e99fb398ae Added simulation interval setting to the ab module 2015-04-12 16:25:01 +02:00
ulteq
aff9d7c554 Fixed a syntax error / Removed debug output 2015-04-12 16:17:49 +02:00
ulteq
9f0a2c8b80 The terrain init script now aborts if no extension is found 2015-04-12 16:10:45 +02:00
ulteq
9fd19563a3 Fixed several syntax errors 2015-04-12 12:52:13 +02:00
ulteq
fd737f3f95 Minor code optimization 2015-04-12 12:36:05 +02:00
ulteq
cf88adb794 Replaced wind with ACE_wind 2015-04-12 12:34:42 +02:00
ulteq
85a7bea42b Added wind deflection module settings: 
*simulationInterval
*simulationRadius
 2015-04-12 12:33:09 +02:00
ulteq
a993f2d5f1 Minor code optimization 2015-04-12 12:15:39 +02:00
ulteq
cb0df8783a Fixed a calculation error 2015-04-12 12:09:55 +02:00
ulteq
1c8da72716 Removed debug output 2015-04-12 11:59:45 +02:00
ulteq
879c6b42b9 Finished the advanced ballistics module settings 2015-04-12 11:59:02 +02:00
ulteq
c532742a5b Overworked the module settings (WIP) 2015-04-12 11:48:21 +02:00
ulteq
05f14d6242 Added AdvancedBallistics module options 2015-04-11 22:34:19 +02:00
ulteq
5c5f41cf5b AB is now disable by default 2015-04-11 19:51:58 +02:00
ulteq
2b0a0145c5 Removed the last spawn/sleep commands from AB 2015-04-11 18:39:15 +02:00
ulteq
44198b18d7 Rewrite of the terrain initialization: 
*Replaced spawn/sleep with a PFH
 2015-04-11 18:18:38 +02:00
ulteq
23733263ea Updated the extension file name 2015-04-11 15:06:30 +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
ulteq
6626379a25 Added new 1.42 config data 2015-04-08 23:07:26 +02:00
ulteq
c1c5711e8d Fixed a typo 2015-04-08 13:58:22 +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
4a469de0f8 Deleted an unused function 2015-04-08 11:01:53 +02:00
ulteq
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +02:00
ulteq
ef3205e078 Replaced all <floats> with <NUMBER> 2015-04-07 21:54:29 +02:00
ulteq
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02:00
ulteq
a8cbcb14d3 Replaced tabs with spaces 2015-04-07 21:27:04 +02:00
ulteq
650c9592c8 Updated the readme 2015-04-07 21:24:09 +02:00
ulteq
26c8f9588a AdvancedBallistics is now always using the dll extension 2015-04-07 21:22:58 +02:00
ulteq
9fb640195a Removed weather hack 2015-04-07 21:02:57 +02:00
esteldunedain
7a1e905c79 Move Latitude and Altitude parameters to weather 2015-04-06 00:19:48 -03:00
esteldunedain
caf52e8a2f Move wind display resources to weather 2015-04-06 00:12:22 -03:00
esteldunedain
6f89233e12 Move wind info display to weather 2015-04-06 00:02:34 -03:00
esteldunedain
100686d34a Move ballistic data outside the advance_ballistics pbo, so: 
- it can be used by other pbos like overheating without it requiring ab.
- the tweaks to airfriction are available to basic wind_deflection too if ab is not present.
 2015-04-05 20:05:04 -03:00
ulteq
93eaaeb8e2 Added new advanced_ballistics module 2015-04-05 21:08:55 +02:00