There was an error fetching the commit references. Please try again later.
Merge branch 'main' into 'Simulation'
# Conflicts: # .gitignore # pom.xml # src/test/java/UnitTest.java
No related branches found
No related tags found
Showing
- .idea/.gitignore 8 additions, 0 deletions.idea/.gitignore
- .idea/compiler.xml 13 additions, 0 deletions.idea/compiler.xml
- .idea/encodings.xml 7 additions, 0 deletions.idea/encodings.xml
- .idea/inspectionProfiles/Project_Default.xml 10 additions, 0 deletions.idea/inspectionProfiles/Project_Default.xml
- .idea/jarRepositories.xml 20 additions, 0 deletions.idea/jarRepositories.xml
- .idea/misc.xml 14 additions, 0 deletions.idea/misc.xml
- .idea/runConfigurations.xml 10 additions, 0 deletions.idea/runConfigurations.xml
- .idea/uiDesigner.xml 124 additions, 0 deletions.idea/uiDesigner.xml
- .idea/vcs.xml 6 additions, 0 deletions.idea/vcs.xml
- src/main/java/BattleSimulation/Army.java 182 additions, 0 deletionssrc/main/java/BattleSimulation/Army.java
- src/main/java/BattleSimulation/Battle.java 90 additions, 0 deletionssrc/main/java/BattleSimulation/Battle.java
- src/main/java/BattleSimulation/armyFiles.java 119 additions, 0 deletionssrc/main/java/BattleSimulation/armyFiles.java
- src/main/java/GameHub.java 228 additions, 0 deletionssrc/main/java/GameHub.java
- src/main/java/SpecificUnits/CavalryUnit.java 58 additions, 0 deletionssrc/main/java/SpecificUnits/CavalryUnit.java
- src/main/java/SpecificUnits/CommanderUnit.java 50 additions, 0 deletionssrc/main/java/SpecificUnits/CommanderUnit.java
- src/main/java/SpecificUnits/InfantryUnit.java 48 additions, 0 deletionssrc/main/java/SpecificUnits/InfantryUnit.java
- src/main/java/SpecificUnits/RangedUnit.java 59 additions, 0 deletionssrc/main/java/SpecificUnits/RangedUnit.java
- src/main/java/SpecificUnits/Unit.java 134 additions, 0 deletionssrc/main/java/SpecificUnits/Unit.java
- src/main/resources/WarGames_del2/IDATx2001 - Wargames - Del 2.pdf 0 additions, 0 deletions.../resources/WarGames_del2/IDATx2001 - Wargames - Del 2.pdf
- src/main/resources/Wargame_del1/IDATx2001 - Wargames - Del 1.pdf 0 additions, 0 deletions...n/resources/Wargame_del1/IDATx2001 - Wargames - Del 1.pdf
.idea/.gitignore
0 → 100644
.idea/compiler.xml
0 → 100644
.idea/encodings.xml
0 → 100644
.idea/inspectionProfiles/Project_Default.xml
0 → 100644
.idea/jarRepositories.xml
0 → 100644
.idea/misc.xml
0 → 100644
.idea/runConfigurations.xml
0 → 100644
.idea/uiDesigner.xml
0 → 100644
.idea/vcs.xml
0 → 100644
src/main/java/BattleSimulation/Army.java
0 → 100644
src/main/java/BattleSimulation/Battle.java
0 → 100644
src/main/java/GameHub.java
0 → 100644
src/main/java/SpecificUnits/CavalryUnit.java
0 → 100644
src/main/java/SpecificUnits/RangedUnit.java
0 → 100644
src/main/java/SpecificUnits/Unit.java
0 → 100644
File added
File added
Please register or sign in to comment