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

Merging PRs into Robocup 2023 #2954

Conversation

nimazareian
Copy link
Contributor

@nimazareian nimazareian commented Jul 3, 2023

Please fill out the following before requesting review on this PR

Description

Merging
#2946
#2940 (Turned off all pop up messages which freeze UI)
#2945
#2912
#2953

Testing Done

Resolved Issues

Length Justification and Key Files to Review

Review Checklist

It is the reviewers responsibility to also make sure every item here has been covered

  • Function & Class comments: All function definitions (usually in the .h file) should have a javadoc style comment at the start of them. For examples, see the functions defined in thunderbots/software/geom. Similarly, all classes should have an associated Javadoc comment explaining the purpose of the class.
  • Remove all commented out code
  • Remove extra print statements: for example, those just used for testing
  • Resolve all TODO's: All TODO (or similar) statements should either be completed or associated with a github issue

jJames Chuang and others added 30 commits October 4, 2022 17:35
Co-authored-by: itsarune <42703774+itsarune@users.noreply.github.com>
…g2002/Software into james/er_force_realism_toggle
Co-authored-by: itsarune <42703774+itsarune@users.noreply.github.com>
…g2002/Software into james/er_force_realism_toggle
…anna/Thunderbots-Software into merging_codys_prs_and_tbotspy

# Conflicts:
#	src/software/field_tests/field_test_fixture.py
#	src/software/thunderscope/thunderscope_main.py
@nimazareian nimazareian changed the title Merging Cody's PRs into Robocup 2023 Merging PRs into Robocup 2023 Jul 3, 2023
@LiCody
Copy link
Contributor

LiCody commented Jul 4, 2023

cab0c84 Add this to fix CI

LiCody
LiCody previously approved these changes Jul 4, 2023
@nimazareian nimazareian merged commit 30ec31d into UBC-Thunderbots:robocup_2023 Jul 5, 2023
3 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.

None yet

6 participants