-
Notifications
You must be signed in to change notification settings - Fork 14
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
2025 soccer draft rules global rules #125
Merged
dbscoach
merged 5 commits into
2025-soccer-draft-rules
from
2025-soccer-draft-rules-global-rules
Nov 27, 2024
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
37c42e0
add: Include general-rules via submodule
mrshu 476d849
update: Discrete the General Rules
mrshu 9903532
chore: bump the general-ruels
mrshu c92bf80
fixes: Swap the stray 2025 and General Rules
mrshu 4b48d50
preamble: Show the logos on the first page
mrshu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "general-rules"] | ||
path = general-rules | ||
url = [email protected]:robocup-junior/general-rules.git |
Submodule general-rules
added at
b188a0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ endif::basebackend-html[] | |
:icons: font | ||
:numbered: | ||
|
||
These are the Soccer rules for RoboCupJunior 2024. They are released | ||
These are the Soccer rules for RoboCupJunior 2025. They are released | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @javier687 thanks a bunch for pointing this out! |
||
by the RoboCupJunior Soccer League Committee. The English version of these | ||
rules has priority over any translations. | ||
|
||
|
@@ -78,6 +78,9 @@ organizer of your regional RoboCupJunior competition and ask them about_ <<entry | |
Unless specified otherwise, all parts of these rules are released under the | ||
terms of the Creative Commons Attribution-ShareAlike License. | ||
|
||
[[general-rules]] | ||
include::general-rules/general-rules.adoc[] | ||
|
||
[discrete] | ||
=== Changes from the 2024 RoboCupJunior Soccer Rules | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dbscoach @Adman I took the liberty of bumping this up to both make sure the
submodules
part works and that we don't get notified about it being deprecated.