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

Get 1.19 branch going #47

Merged
merged 99 commits into from
Jan 29, 2025
Merged

Get 1.19 branch going #47

merged 99 commits into from
Jan 29, 2025

Conversation

cooljeanius
Copy link
Owner

@cooljeanius cooljeanius commented Jan 22, 2025

Just getting this started; it can come out of draft mode once it's ready...

Closes #11 upon merge.

MadMax3947 and others added 30 commits June 16, 2024 21:59
S14: Malakar no longer comments on gargoyles if player completed S6B
also ignore map-diff stuff in `_server.ign`
@cooljeanius
Copy link
Owner Author

Looks like one of us might need to start our 1.19 branch over...

@MadMax3947 MadMax3947 marked this pull request as ready for review January 29, 2025 04:12
macros/magi.cfg Outdated Show resolved Hide resolved
# team_name=evil
# user_team_name= _ "Wesnoth Expeditionary Force"
# hidden=yes
#[/side]
Copy link
Owner Author

Choose a reason for hiding this comment

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

Generally I prefer ifdef-ing unused code out, instead of commenting it out... or, just removing it would be fine, too...

units.cfg Outdated
# ignore_global_traits=yes
# {TRAIT_MECHANICAL}
# {HUMAN_NAMES}
#[/race]
Copy link
Owner Author

Choose a reason for hiding this comment

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

Again, I'd prefer ifdef-ing this out, or removing it entirely, instead of commenting it out.

Copy link
Owner Author

@cooljeanius cooljeanius left a comment

Choose a reason for hiding this comment

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

Just a few comments/questions, but other than that, OK (looks like I can't approve myself since I opened this myself, even though it's technically your PR, lol)

@cooljeanius cooljeanius merged commit a9f978f into cooljeanius:1.19 Jan 29, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants