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

fixed faulty message id #2040

Merged
merged 1 commit into from Jan 25, 2020
Merged

fixed faulty message id #2040

merged 1 commit into from Jan 25, 2020

Conversation

ChillerDragon
Copy link
Contributor

(cherry picked from commit teeworlds/teeworlds@9023796)

@Learath2
Copy link
Member

Learath2 commented Jan 19, 2020 via email

@ChillerDragon
Copy link
Contributor Author

ChillerDragon commented Jan 19, 2020

@Learath2 tbh I have no clue. But I tested it and the client can still connect to ddnet and non ddnet servers and works fine as far as I know. Also tested with dummy.

But yes please take a look. Im scared.

I am especially unsure about this part because I improvised there:
0d8622c#diff-d08eba1b93de48d2287381ebd907306bR21

@ChillerDragon
Copy link
Contributor Author

ChillerDragon commented Jan 19, 2020

Ok here is everything I tested (all worked fine)

Client:

  • connect to ddnet server (with this patch)
  • connect to ddnet server (without this patch)
  • connect to non ddnet server
  • connect dummy to ddnet server
  • connect dummy to non ddnet server
  • download map ddnet server
  • download map non ddnet server
  • used emotes

Server:

  • connect with ddnet client (without this patch)
  • connect with ddnet client (with this patch)

@Learath2
Copy link
Member

@heinrich5991 if you have a couple minutes can you take a look at this? I'm not completely familiar with the entire thing

@heinrich5991
Copy link
Member

Looks good to me.

Thanks.

bors r+

bors bot added a commit that referenced this pull request Jan 24, 2020
2040: fixed faulty message id r=heinrich5991 a=ChillerDragon

(cherry picked from commit teeworlds/teeworlds@9023796)

Co-authored-by: oy <Tom_Adams@web.de>
@bors
Copy link
Contributor

bors bot commented Jan 24, 2020

Build failed

  • build-cmake (macOS-latest)
  • build-cmake (ubuntu-16.04)
  • build-cmake (ubuntu-latest)
  • build-cmake (windows-latest)

@heinrich5991
Copy link
Member

bors retry

bors bot added a commit that referenced this pull request Jan 24, 2020
2040: fixed faulty message id r=heinrich5991 a=ChillerDragon

(cherry picked from commit teeworlds/teeworlds@9023796)

Co-authored-by: oy <Tom_Adams@web.de>
@bors
Copy link
Contributor

bors bot commented Jan 24, 2020

Build failed

  • build-cmake (macOS-latest)
  • build-cmake (ubuntu-16.04)
  • build-cmake (ubuntu-latest)
  • build-cmake (windows-latest)

@Learath2
Copy link
Member

bors retry

bors bot added a commit that referenced this pull request Jan 24, 2020
2040: fixed faulty message id r=heinrich5991 a=ChillerDragon

(cherry picked from commit teeworlds/teeworlds@9023796)

Co-authored-by: oy <Tom_Adams@web.de>
@bors
Copy link
Contributor

bors bot commented Jan 24, 2020

Build failed

  • build-cmake (macOS-latest)
  • build-cmake (ubuntu-16.04)
  • build-cmake (ubuntu-latest)
  • build-cmake (windows-latest)

@Learath2
Copy link
Member

New day, lets hope Microsoft fixed their repository.

bors retry

bors bot added a commit that referenced this pull request Jan 25, 2020
2040: fixed faulty message id r=heinrich5991 a=ChillerDragon

(cherry picked from commit teeworlds/teeworlds@9023796)

Co-authored-by: oy <Tom_Adams@web.de>
@bors
Copy link
Contributor

bors bot commented Jan 25, 2020

Build succeeded

  • build-cmake (macOS-latest)
  • build-cmake (ubuntu-16.04)
  • build-cmake (ubuntu-latest)
  • build-cmake (windows-latest)

@bors bors bot merged commit 1b4131a into ddnet:master Jan 25, 2020
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.

None yet

4 participants