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

1.16 variations 20220129 #6477

Merged
merged 2 commits into from Jan 31, 2022
Merged

Conversation

doofus-01
Copy link
Member

I'm not completely sure these can go into 1.16. They only change the appearance slightly and won't break anything outright, but new transition behavior between terrain codes Xos and Aa might be too much for stable?

@github-actions github-actions bot added Graphics Issues that involve the graphics engine or assets. Terrain Issues that involve terrain definitions or their implementation in the engine. labels Jan 31, 2022
@Pentarctagon
Copy link
Member

So the transition looks different, but there's no functionality change anywhere?

@Wedge009 Wedge009 added the Fwdport A reminder of a bugfix that was added to the stable branch that needs to be duplicated on master. label Jan 31, 2022
@doofus-01
Copy link
Member Author

Right. Here's a screenshot. It affects the appearance of Xos when it is next to frozen terrain. Other Xo* aren't affected, and I can't think of a reason anyone would want the default Xos on snow/ice. It's got an issue or two with corner cases (lower-right in the screenshot), but I think it's an improvement for most cases.
Screenshot_20220130

@Pentarctagon
Copy link
Member

Alright, that sounds fine for 1.16.

@doofus-01 doofus-01 merged commit b23ddde into wesnoth:1.16 Jan 31, 2022
doofus-01 added a commit that referenced this pull request Feb 7, 2022
* icy stone walls variation for Xos, based on adjacent terrain, not new code

* more variations for rocks, rubble, and snowbits
Asheviere pushed a commit to Asheviere/wesnoth that referenced this pull request Feb 18, 2022
* icy stone walls variation for Xos, based on adjacent terrain, not new code

* more variations for rocks, rubble, and snowbits
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fwdport A reminder of a bugfix that was added to the stable branch that needs to be duplicated on master. Graphics Issues that involve the graphics engine or assets. Terrain Issues that involve terrain definitions or their implementation in the engine.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants