Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Weather - Winter Terrain Temperatures #9943

Merged
merged 26 commits into from
Apr 10, 2024
Merged

Weather - Winter Terrain Temperatures #9943

merged 26 commits into from
Apr 10, 2024

Conversation

OverlordZorn
Copy link
Contributor

@OverlordZorn OverlordZorn commented Apr 9, 2024 •
edited
Loading

When merged this pull request will:
If a terrain isnt defined otherwise, it will check:

winter in worldName or
"snow" in rain texture or
rain param snow != 0

If yes, provide generic winter appropriate temperature and humidity.

OverlordZorn and others added 21 commits May 8, 2023 17:06
@OverlordZorn
a -> an
a211f70
@OverlordZorn
Merge branch 'master' of https://github.com/PulsarNeutronStar/ACE3
1b492a9
@OverlordZorn
Merge branch 'acemod:master' into master
09b48e9
@OverlordZorn
Added last resort catch for winter maps to define suitable temps
282d008
@OverlordZorn
removed debug line
9ef5250
@OverlordZorn
purge 🧼
38ca7dc
@OverlordZorn
added check for "snow" in raintexture
58a6a90
@OverlordZorn
cleaned up conditions
e4d7c06
@OverlordZorn
Update arma-3-scheduler-and-our-practices.md
fd05bcd
@OverlordZorn
isNull && {}
8ce140c
@OverlordZorn
Merge branch 'weather-more-mapdata-winter' of https://github.com/Over…
84a1e37 
…lordZorn/ACE3 into weather-more-mapdata-winter
@OverlordZorn
Update fnc_getMapData.sqf
df8e0b4
@OverlordZorn
Update fnc_getMapData.sqf
ee272ef
@OverlordZorn
Update fnc_getMapData.sqf
0271dc1
@OverlordZorn
changed order in condition checks and indentation
5ab66bf
@OverlordZorn
not so lazy
62471c9
@OverlordZorn
deep config lookup -> _cfg
41cff48
@OverlordZorn
comment
07439e4
@OverlordZorn
removed accidental empty line
4908b6e
@OverlordZorn
🎢
8fb4423
@OverlordZorn
Update fnc_getMapData.sqf
a57d114
johnb432
johnb432 requested changes Apr 9, 2024
View reviewed changes
addons/weather/functions/fnc_getMapData.sqf Outdated Show resolved Hide resolved
addons/weather/functions/fnc_getMapData.sqf Outdated Show resolved Hide resolved
addons/weather/functions/fnc_getMapData.sqf Outdated Show resolved Hide resolved
addons/weather/functions/fnc_getMapData.sqf Outdated Show resolved Hide resolved
OverlordZorn and others added 4 commits April 9, 2024 17:12
@OverlordZorn
Revert "Update fnc_getMapData.sqf"
cf5a2bb 
This reverts commit a57d114.
@OverlordZorn @johnb432
Update addons/weather/functions/fnc_getMapData.sqf
f173097 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@OverlordZorn @johnb432
Update addons/weather/functions/fnc_getMapData.sqf
de28754 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@OverlordZorn @johnb432
Update addons/weather/functions/fnc_getMapData.sqf
5fa9309 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@OverlordZorn OverlordZorn requested a review from johnb432 April 9, 2024 15:20
johnb432
johnb432 approved these changes Apr 9, 2024
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Tested with Korsac (adds its own values, was all good), Ihantala and Summa, both Winter versions.

@johnb432 johnb432 added the kind/enhancement Release Notes: **IMPROVED:** label Apr 9, 2024
@johnb432 johnb432 added this to the 3.17.1 milestone Apr 9, 2024
@LinkIsGrim LinkIsGrim merged commit 2b5ea16 into acemod:master Apr 10, 2024
5 checks passed
@OverlordZorn OverlordZorn deleted the weather-more-mapdata-winter branch October 29, 2024 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

@johnb432 johnb432 johnb432 approved these changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.17.1
Development

Successfully merging this pull request may close these issues.
3 participants
@OverlordZorn @johnb432 @LinkIsGrim