Commit Graph

155 Commits

Author SHA1 Message Date
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
ulteq
f9b7e3c6f7 Fixed clashing MACRO names 2015-05-16 21:10:34 +02:00
ulteq
03b478aeee Reworked dew point, heat index and wind chill calculations 2015-05-16 12:39:52 +02:00
ulteq
0377526a7c Finished heat index and wet bulb functions 2015-05-16 11:12:29 +02:00
ulteq
8b878552cb Fixed several typos in the heat index coefficients 2015-05-16 00:51:53 +02:00
ulteq
56eecfda03 Fixed heat index coefficients syntax 2015-05-15 21:41:07 +02:00
ulteq
7f966de28c Added wet bulb calculation, fixed macros 2015-05-15 21:10:46 +02:00
ulteq
2f7d7ece56 Added utility function to calculate the dew point 2015-05-15 19:58:24 +02:00
ulteq
e6ed1e5dbd Added utility functions to calculate heat index and wind chill 2015-05-15 19:00:11 +02:00
ulteq
7a95e2a7bd Weather module macro cleanup 2015-05-15 14:20:18 +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
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
ulteq
b03333c9e8 Moved all wind calculations into the weather module 2015-05-11 10:59:07 +02:00
PabstMirror
4733818e9b Fix weather array for zargabad 2015-05-09 15:10:01 -05:00
ulteq
05f34e5d6a Attempt to fix https://github.com/acemod/ACE3/issues/1025 2015-05-05 22:21:29 +02:00
ulteq
19864d5be6 Fixed a bug in the humidity calculation 2015-05-05 10:37:51 +02:00
ulteq
4f44bcdf46 Added wind data for Chernarus (Prag) 2015-05-05 10:36:12 +02:00
ulteq
f81e53bb33 Added wind data for Takistan (Kabul) 2015-05-04 22:17:26 +02:00
ulteq
be7391bf47 Added wind data for F.A.T.A 2015-05-04 21:28:12 +02:00
ulteq
76eaa5ded1 Added wind data for Bornholm 2015-05-04 20:35:39 +02:00
ulteq
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
ulteq
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21: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
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
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +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
commy2
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +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
1b5756d33c Added weather update interval module setting 2015-04-27 12:47:26 +02:00
ulteq
04d3a31b5b Fixed a typo 2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3 Added ace/module settings for ace_weather:
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
2015-04-27 12:28:56 +02:00
ulteq
78eba4e703 Moved weather randomization back to postInit 2015-04-25 18:56:55 +02:00
ulteq
eb88f94cf7 Removed unused privates 2015-04-24 11:53:06 +02:00
ulteq
b3bf44fa1e Code cleanup 2015-04-24 10:58:55 +02:00
ulteq
b3f4bf306d Moved the global weather controls into preInit 2015-04-24 10:46:33 +02:00
ulteq
062aeae6e6 Fixed several bugs in the rain simulation:
*Added missing rain initialization based on overcast value
*Added proper fade out when the overcast changes from >=0.7 to <0.7
*Removed duplicate code
2015-04-24 10:25:31 +02:00
ulteq
50546646fa Added missing rain_period_count reset to 0 2015-04-24 10:05:13 +02:00
ulteq
5a90ef6207 Added global variables (syncRain, syncWind, syncMisc) which give some control over the weather module:
*Removed duplicate debug output
2015-04-24 10:03:48 +02:00
ulteq
ddf62b6db4 Added missing privates 2015-04-23 16:08:02 +02:00
ulteq
be595d9c9e Made the wind speed change less often during good weather 2015-04-23 11:54:24 +02:00
ulteq
09ff217e93 Improved the init process 2015-04-22 21:16:01 +02:00
ulteq
a9726d2b60 Simplified the wind direction change calculation 2015-04-22 19:46:27 +02:00
ulteq
caf2f12eb9 Improved the wind direction selection based on the probability array 2015-04-22 19:46:09 +02:00
ulteq
ac5d593271 Switched to an improved version of the old getWind function 2015-04-22 12:56:07 +02:00
ulteq
d7f67970a4 Fixed a bug in the wind direction init code 2015-04-21 20:55:04 +02:00
ulteq
1db9f055e2 Removed debug output 2015-04-21 20:54:47 +02:00
ulteq
428baefc2c Added random temperatureShift, badWeatherShift, humidityShift 2015-04-21 20:41:50 +02:00
ulteq
30d1b1b5e5 Fixed a typo in the updateTemperature function 2015-04-21 20:20:22 +02:00
ulteq
af4fdda477 Continued work on the new wind system:
* Moved the wind data into CfgWorlds.hpp
* Modified the contents of ACE_WIND_PARAMS
* new getWind function for the clients
* new wind init based on the real world weather data
2015-04-21 20:20:05 +02:00
ulteq
ac74e6c611 More WIP 2015-04-20 16:33:36 +02:00
ulteq
8aa69663d6 More WIP 2015-04-20 16:01:13 +02:00
ulteq
9155056a50 Proof of concept wind code (custom debug output enabled) 2015-04-20 15:11:14 +02:00
ulteq
89e33dc177 Refactored the weather module:
* No changes in functionality
2015-04-20 13:54:22 +02:00
bux578
5ed0dfe463 Merge pull request #758 from Tachii/patch-13
Update stringtable.xml
2015-04-19 07:10:55 +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
Tachii
a9d38f5970 Update stringtable.xml 2015-04-19 01:19:32 +03:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
esteldunedain
54daa02aa4 Weather: headers + privates 2015-04-17 01:44:38 -03: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
Marco
b3d4e2f48f Update stringtable.xml
IT
2015-04-16 10:14:18 +02:00
FreeZbe
56f6c60e1a French : update stringtable 2015-04-15 21:17:35 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable
added spanish translate
2015-04-15 17:41:10 +02:00
ruPaladin
9caba1e3a3 addons/weather/ translation to Russian 2015-04-15 18:29:38 +03:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers:
*Wind info
*Protractor
2015-04-15 12:53:02 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
2b0a0145c5 Removed the last spawn/sleep commands from AB 2015-04-11 18:39:15 +02:00
ulteq
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +02:00
ulteq
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02:00
ulteq
2a458f2e3d Removed Altitude and Latitude negation 2015-04-07 21:03:17 +02:00
ulteq
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
ulteq
5443d46f7b Default Altitude and Latitude are now read from the config 2015-04-07 20:59:05 +02:00
ulteq
ab5518c35d Fixed a typo 2015-04-07 20:53:14 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
esteldunedain
5a0faf720f EFUNC(advanced_ballistics,calculateWindSpeed) 2015-04-06 00:27:33 -03:00
esteldunedain
7a1e905c79 Move Latitude and Altitude parameters to weather 2015-04-06 00:19:48 -03:00
esteldunedain
c73aff03bd displayWindInfo tab to space 2015-04-06 00:13:43 -03:00
esteldunedain
2d770eb355 Make wind in displayWindInfo dependant on wether AB is used or not 2015-04-06 00:12:50 -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
33a87b0488 Reenable weather (disabled in 076c5abf88) 2015-04-05 23:56:24 -03:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Glowbal
076c5abf88 Added a displayName for the wounds 2015-03-01 18:02:56 +01:00
Nicolás Badano
981978d043 ACE_Settings: replace all ACE_Parameters 2015-01-30 19:06:25 -03:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Nicolás Badano
58db703db7 weather: small fix 2015-01-22 02:47:02 -03:00
Nicolás Badano
2c34c16621 weather: weird syntax! 2015-01-21 02:28:23 -03:00
Nicolás Badano
3a57b477de weather: replace agm's seasonal by cse's monthly temperatures 2015-01-21 02:12:57 -03:00
Nicolás Badano
59144e7b53 weather: only force set misc parameters on clients 2015-01-21 01:07:33 -03:00
Nicolás Badano
851db25e56 weather: add config data for A3 islands 2015-01-21 01:05:27 -03:00
Nicolás Badano
bba99d64f7 weather: added temperature simulation and air density 2015-01-21 00:14:51 -03:00
Nicolás Badano
0f790267f1 weather: more tabs to spaces 2015-01-21 00:00:32 -03:00
Nicolás Badano
b3d14987bc weather: sync misc. parameters: lightnings, rainbow, fog 2015-01-21 00:00:06 -03:00
Nicolás Badano
a92ebf4e41 weather: fix for waves sync 2015-01-20 23:59:32 -03:00
Nicolás Badano
64649fa781 weather: tabs to spaces 2015-01-20 23:58:19 -03:00
Nicolás Badano
a35f9a2be4 weather: sync waves 2015-01-20 23:30:49 -03:00