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.

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

Additional changes to windows terrain #39527

Merged
merged 54 commits into from
Apr 16, 2020
Merged

Additional changes to windows terrain #39527

merged 54 commits into from
Apr 16, 2020

Conversation

TheGoatGod
Copy link
Contributor

@TheGoatGod TheGoatGod commented Apr 13, 2020

Summary
SUMMARY: Content "Additional changes to windows terrain"

Purpose of change
there were a few things out of place

Describe the solution
I fixed windows allowing you to be able to see through them when the curtain was closed, added an extra metal grate window to allow building on no glass windows and framed windows. fixed up skylight frame there 1 entry instead of 8 there all still there. moved windows category because I feel it should be above other and lastly I fixed some lower case spelling to upper case.

Describe alternatives you've considered
don't merge

Testing
I have tested and everything I changed is how it should be

TheGoatGod and others added 30 commits March 1, 2020 01:26
@TheGoatGod
Copy link
Contributor Author

TheGoatGod commented Apr 13, 2020

not sure why there is rakes of commits but when I compared there wasn't any conflicts or file changes just what ive done to fix my addition

@Night-Pryanik
Copy link

As you add curtains examine action to many new types of windows, you need to update this examine action in iexamine.cpp - there is a hardcoded set of types of windows which will change to another types of windows after tearing down the curtains.

TheGoatGod and others added 4 commits April 13, 2020 19:16
Co-Authored-By: Anton Burmistrov <[email protected]>
Co-Authored-By: Anton Burmistrov <[email protected]>
Co-Authored-By: Anton Burmistrov <[email protected]>
Co-Authored-By: Anton Burmistrov <[email protected]>
@TheGoatGod
Copy link
Contributor Author

I don't know what I'm doing in that kinda code.

@mlangsdorf mlangsdorf added the Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. label Apr 14, 2020
@mlangsdorf mlangsdorf changed the title More windows update Additional changes to windows terrain Apr 14, 2020
@ZhilkinSerg ZhilkinSerg merged commit 8786b2b into CleverRaven:master Apr 16, 2020
@souricelle souricelle mentioned this pull request Apr 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fields / Furniture / Terrain / Traps Objects that are part of the map or its features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants