Skip to content

Commit 3fe2b25

Browse files
committed
git subrepo pull src/lib/game_controller_hsl --force
subrepo: subdir: "src/lib/game_controller_hsl" merged: "2fa5731b6" upstream: origin: "git@github.com:bit-bots/game_controller_hsl.git" branch: "rolling" commit: "2fa5731b6" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "ea10886"
1 parent ce9beaf commit 3fe2b25

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/lib/game_controller_hsl/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = git@github.com:bit-bots/game_controller_hsl.git
88
branch = rolling
9-
commit = d55ef420ed7d4e4dfc0d88d5db2ef573038284c0
10-
parent = 215848ae8d261ddade8c6555bacd92d37f2862bb
9+
commit = 2fa5731b60e701e2f3500b94c892c708cc900a88
10+
parent = ce9beaf34b84227710e578505a629f0d1cf089f0
1111
method = merge
1212
cmdver = 0.4.9

src/lib/game_controller_hsl/game_controller_hsl/scripts/sim_gamestate.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
class SimGamestate(Node):
2222
msg = """Setting the GameState by entering a number:
2323
24-
0: GAMESTATE_INITIAL = 0
25-
1: GAMESTATE_READY = 1
26-
2: GAMESTATE_SET = 2
27-
3: GAMESTATE_PLAYING =3
28-
4: GAMESTATE_FINISHED = 4
24+
0: STATE_INITIAL = 0
25+
1: STATE_READY = 1
26+
2: STATE_SET = 2
27+
3: STATE_PLAYING =3
28+
4: STATE_FINISHED = 4
2929
3030
5: COMPETITION_TYPE_SMALL = 0
3131
6: COMPETITION_TYPE_MIDDLE = 1

0 commit comments

Comments
 (0)