Merge pull request #31 from RoboTeamTwente/undoAccidentalMerge

Undo accidental merge
RoboTeamTwente · Jan 14, 2022 · ce79e8a · ce79e8a
2 parents dc90e16 + 6888321
commit ce79e8a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/roboteam_ai b/roboteam_ai
diff --git a/roboteam_proto b/roboteam_proto
+3 −0		CMakeLists.txt
+2 −10		include/roboteam_ai/ApplicationManager.h
+1 −1		include/roboteam_ai/control/ControlModule.h
+4 −4		include/roboteam_ai/control/ControlUtils.h
+1 −1		include/roboteam_ai/control/RobotCommand.h
+2 −0		include/roboteam_ai/control/positionControl/BBTrajectories/BBTrajectory2D.h
+2 −0		include/roboteam_ai/control/positionControl/pathTracking/PathTrackingAlgorithm.h
+1 −1		include/roboteam_ai/manual/JoystickHandler.h
+1 −1		include/roboteam_ai/stp/Skill.h
+1 −0		include/roboteam_ai/stp/constants/GeneralizationConstants.h
+2 −1		include/roboteam_ai/utilities/Constants.h
+1 −1		include/roboteam_ai/utilities/GameStateManager.hpp
+15 −15		include/roboteam_ai/utilities/IOManager.h
+1 −1		include/roboteam_ai/utilities/Pause.h
+4 −3		include/roboteam_ai/utilities/Settings.h
+1 −1		include/roboteam_ai/utilities/StrategyManager.h
+87 −0		include/roboteam_ai/utilities/normalize.h
+1 −1		include/roboteam_ai/world/Ball.hpp
+2 −2		include/roboteam_ai/world/Field.h
+2 −2		include/roboteam_ai/world/FieldComputations.h
+2 −2		include/roboteam_ai/world/Robot.hpp
+1 −1		include/roboteam_ai/world/World.hpp
+3 −3		include/roboteam_ai/world/WorldData.hpp
+10 −13		src/ApplicationManager.cpp
+1 −1		src/control/ControlModule.cpp
+25 −21		src/roboteam_ai.cpp
+2 −4		src/stp/computations/PositionComputations.cpp
+1 −1		src/stp/constants/ControlConstants.cpp
+2 −1		src/stp/evaluations/global/GoalVisionFromBallGlobalEvaluation.cpp
+3 −2		src/stp/evaluations/global/GoalVisionGlobalEvaluation.cpp
+2 −1		src/stp/evaluations/global/NoGoalVisionFromBallGlobalEvaluation.cpp
+4 −2		src/stp/plays/defensive/DefendShot.cpp
+2 −1		src/stp/plays/offensive/AttackingPass.cpp
+2 −1		src/stp/plays/offensive/GenericPass.cpp
+1 −1		src/stp/tactics/KeeperBlockBall.cpp
+1 −1		src/stp/tactics/active/DriveWithBall.cpp
+0 −2		src/stp/tactics/active/KickAtPos.cpp
+1 −2		src/utilities/Dealer.cpp
+30 −30		src/utilities/GameStateManager.cpp
+67 −23		src/utilities/IOManager.cpp
+18 −1		src/utilities/Settings.cpp
+90 −0		src/utilities/normalize.cpp
+4 −2		src/world/Ball.cpp
+7 −5		src/world/Field.cpp
+1 −2		src/world/FieldComputations.cpp
+2 −2		src/world/Robot.cpp
+4 −4		test/ControlTests/ControlUtilsTest.cpp