|
|
10e31033e0
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-16 18:40:49 +01:00 |
|
|
|
369cf740f9
|
Gjør om bytting til kortutvelgingsskjermen
|
2020-03-16 18:40:37 +01:00 |
|
|
|
80d0c954de
|
Legger til en uferdig skjerm for velging av programmeringskort
|
2020-03-16 18:34:40 +01:00 |
|
torlunjen
|
204b9c5585
|
Makes tile lists in RoboRallyGame private
|
2020-03-16 17:55:38 +01:00 |
|
torlunjen
|
df180bf372
|
Adds helper method for conveyor belt method
|
2020-03-16 17:51:06 +01:00 |
|
torlunjen
|
62d887fa76
|
Optimized imports
|
2020-03-16 17:35:53 +01:00 |
|
torlunjen
|
84a605efc4
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
Conflicts:
src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
|
2020-03-16 17:35:01 +01:00 |
|
torlunjen
|
816f502f12
|
Adds partial functionality that moves robots standing on conveyor belts.
|
2020-03-16 17:31:54 +01:00 |
|
GabrielMagnus
|
d27a050611
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
Conflicts:
src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
|
2020-03-16 16:54:41 +01:00 |
|
GabrielMagnus
|
14dfbea630
|
Endret metodenavn for mer lesbarhet
|
2020-03-16 16:46:22 +01:00 |
|
GabrielMagnus
|
f01576d34e
|
Laget tester for getPositionsOfWallOnBoard og getPositionsOfTileOnBoard
|
2020-03-16 16:45:45 +01:00 |
|
|
|
5fcfab5b01
|
Forenkler testShuffleIntegrity
|
2020-03-16 16:06:54 +01:00 |
|
Steinar Aalstad Lillesund
|
c43798dfab
|
Parprogrammering med tobydrama - Laget Tester for registrering av flagg.
|
2020-03-16 15:52:50 +01:00 |
|
Steinar Aalstad Lillesund
|
31bef9fe0b
|
Parprogrammering med tobydrama - Laget funksjonalitet for flagg registrering
Lagt inn metoder og hjelpemetoder for å få til registrering av flagg.
|
2020-03-16 15:52:18 +01:00 |
|
Steinar Aalstad Lillesund
|
7bd59902e2
|
Referat fra møte.
|
2020-03-16 14:33:22 +01:00 |
|
Tobydrama
|
d864e60f24
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 12:38:40 +01:00 |
|
Tobydrama
|
7bc24ff03e
|
added and altered some test in PlayerTest
|
2020-03-12 12:38:33 +01:00 |
|
Tobydrama
|
bbfbdb0539
|
fixed some methods in player
|
2020-03-12 12:38:00 +01:00 |
|
|
|
1c1c9bfd35
|
Merge remote-tracking branch 'origin/master'
|
2020-03-12 12:21:52 +01:00 |
|
|
|
4b731cb062
|
Fikser og forbedrer rotateCogwheels
|
2020-03-12 12:21:31 +01:00 |
|
GabrielMagnus
|
c931f459af
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 12:08:48 +01:00 |
|
GabrielMagnus
|
9c47ed5cfe
|
Laget tester for BoardElementContainer
|
2020-03-12 12:06:09 +01:00 |
|
torlunjen
|
f3fa78c107
|
Legger til referat fra parprogrammeringsøkt/møte
|
2020-03-12 12:01:01 +01:00 |
|
torlunjen
|
aa5b5bdb81
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 11:58:02 +01:00 |
|
torlunjen
|
9ebd5e3af0
|
Adds method to rotate robots standing cogwheels
|
2020-03-12 11:49:14 +01:00 |
|
Tobydrama
|
a2f861077b
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 11:24:25 +01:00 |
|
Tobydrama
|
4f9d58152c
|
Added comments to Player
|
2020-03-12 11:24:20 +01:00 |
|
Tobydrama
|
9c5a50d74a
|
Added more comments to deck
|
2020-03-12 11:24:04 +01:00 |
|
Tobydrama
|
bf63d608a7
|
Added more test to PlayerTest
|
2020-03-12 11:23:27 +01:00 |
|
|
|
d5d87d11dd
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 11:21:14 +01:00 |
|
|
|
08e2a61457
|
Legger til en test server i RoboRallyWrapper
|
2020-03-12 11:20:37 +01:00 |
|
|
|
b0ebb2db3e
|
Legger til en del objekter for å teste kryonet funksjonalitet
|
2020-03-12 11:17:42 +01:00 |
|
|
|
ea45a0cd93
|
Legger til manglende kryo avhengighet
|
2020-03-12 11:16:29 +01:00 |
|
GabrielMagnus
|
7e37fbdce9
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-12 11:15:17 +01:00 |
|
GabrielMagnus
|
ca86b3fe55
|
Made documentation for BoardElementContainer.java
|
2020-03-12 11:15:03 +01:00 |
|
GabrielMagnus
|
0e9c581a70
|
Made documentation for getPositionOfTileOnBoard and makeTileList
|
2020-03-12 11:14:44 +01:00 |
|
|
|
2219ea3dbe
|
Legger til kryonet avhengigheten i pom
|
2020-03-11 08:02:56 +01:00 |
|
|
|
d51deaf29e
|
Fikser noen småfeil i makeMove()
|
2020-03-11 08:02:30 +01:00 |
|
|
|
30a2379544
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-10 18:35:35 +01:00 |
|
|
|
f22e577180
|
Legger til forbedring av posisjonssjekking i Board
|
2020-03-10 18:35:15 +01:00 |
|
torlunjen
|
8d9a85946e
|
Adds default label to RoboRallyGame::makeMove switch.
|
2020-03-10 18:26:16 +01:00 |
|
torlunjen
|
a86b4efbb7
|
Fikser bug der robot kan gå forbi vegger som er på kanten av brettet.
|
2020-03-10 18:18:32 +01:00 |
|
Torbjørn Lunde Jensen
|
4d309d4321
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-10 17:29:47 +01:00 |
|
Torbjørn Lunde Jensen
|
cba469d09f
|
Adds method that moves robot according to action enum
|
2020-03-10 17:29:36 +01:00 |
|
GabrielMagnus
|
54ada72297
|
Lagt til getPositionOfTileOnBoard metoder og generisk metode makeTileList
|
2020-03-10 16:07:14 +01:00 |
|
GabrielMagnus
|
b03270203e
|
Lagt til BoardElementContainer.java
|
2020-03-10 16:04:27 +01:00 |
|
Steinar Aalstad Lillesund
|
e95ee32e64
|
Added tests for the playerclass.
Started on the tests needed for a player.
|
2020-03-10 16:03:07 +01:00 |
|
Steinar Aalstad Lillesund
|
822ca33345
|
Added A player class
Started on the functions needed for a player.
|
2020-03-10 16:02:34 +01:00 |
|
|
|
7a5b4fccd2
|
Legger til funksjonalitet for å kikke på det første eller siste kortet i en kortstokk
|
2020-03-09 13:21:52 +01:00 |
|
|
|
1c1bbc6a79
|
Legger til korrekt kopiering av roboter for å forhindre Game i å direkte endre en robot
|
2020-03-09 12:32:11 +01:00 |
|
