-
- Downloads
Merge branch 'main' into 'lorenz_author'
# Conflicts: # README.md # src/game/level/Level.cpp # src/game/level/Level.hpp # src/game/ui/modals/UnitInfoMenu.cpp # src/game/ui/modals/UnitInfoMenu.hpp
No related branches found
No related tags found
Showing
- src/game/ui/context/ContextMenu.hpp 1 addition, 0 deletionssrc/game/ui/context/ContextMenu.hpp
- src/game/ui/context/RecruitingMenu.cpp 1 addition, 0 deletionssrc/game/ui/context/RecruitingMenu.cpp
- src/game/ui/context/RecruitingMenu.hpp 1 addition, 0 deletionssrc/game/ui/context/RecruitingMenu.hpp
- src/game/ui/menu/EndScreen.cpp 4 additions, 0 deletionssrc/game/ui/menu/EndScreen.cpp
- src/game/ui/menu/EndScreen.hpp 4 additions, 0 deletionssrc/game/ui/menu/EndScreen.hpp
- src/game/ui/menu/PauseMenu.cpp 4 additions, 0 deletionssrc/game/ui/menu/PauseMenu.cpp
- src/game/ui/menu/PauseMenu.hpp 4 additions, 0 deletionssrc/game/ui/menu/PauseMenu.hpp
- src/game/ui/modals/HelpMenu.cpp 2 additions, 0 deletionssrc/game/ui/modals/HelpMenu.cpp
- src/game/ui/modals/HelpMenu.hpp 1 addition, 0 deletionssrc/game/ui/modals/HelpMenu.hpp
- src/game/ui/modals/UnitInfoMenu.cpp 1 addition, 0 deletionssrc/game/ui/modals/UnitInfoMenu.cpp
- src/game/ui/modals/UnitInfoMenu.hpp 1 addition, 0 deletionssrc/game/ui/modals/UnitInfoMenu.hpp
Please register or sign in to comment