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

Asterisk AI Update 2 #2325

Merged
merged 3 commits into from
Nov 30, 2024
Merged

Asterisk AI Update 2 #2325

merged 3 commits into from
Nov 30, 2024

Conversation

Colin-Tel
Copy link
Contributor

@Colin-Tel Colin-Tel commented Nov 30, 2024 •
edited
Loading

About the PR

I fucked up #2049 and I'm not recovering it.

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Map size/L 256-1023 lines labels Nov 30, 2024
@Bonktrauma
Copy link
Contributor

Wth did you do to the old one

@Colin-Tel Colin-Tel marked this pull request as ready for review November 30, 2024 15:22
@Colin-Tel Colin-Tel requested a review from a team as a code owner November 30, 2024 15:22
@Colin-Tel Colin-Tel mentioned this pull request Nov 30, 2024
Merged
12 tasks
@IamVelcroboy
Copy link
Member

Add StationAi to proto too and it's good to merge

IamVelcroboy
IamVelcroboy approved these changes Nov 30, 2024
View reviewed changes
Copy link
Member

@IamVelcroboy IamVelcroboy left a comment

Choose a reason for hiding this comment

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

Ready for merge

@Colin-Tel
Copy link
Contributor Author

btw I can't test this, as the game throws this error when I attempt to load any map.
image

@IamVelcroboy
Copy link
Member

I've seen this before....

@deltanedas deltanedas merged commit 1d38ee6 into DeltaV-Station:master Nov 30, 2024
11 of 13 checks passed
@IamVelcroboy
Copy link
Member

btw I can't test this, as the game throws this error when I attempt to load any map.

Pulled master after merge and it's loading in fine for me

@Colin-Tel Colin-Tel deleted the AsteriskAI2-The-Squeakuel branch November 30, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy IamVelcroboy approved these changes

Assignees
No one assigned
Labels
Changes: Map Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Colin-Tel @Bonktrauma @IamVelcroboy @deltanedas