Tobydrama
|
dfefe49aa0
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-17 17:24:05 +01:00 |
|
Tobydrama
|
7cb22379e7
|
Made a laser function that fires all lasers
made a firealllasers function in roborallygame and added many support function in board to actually fire the lasers. added som of the needed tests.
|
2020-03-17 17:23:57 +01:00 |
|
torlunjen
|
b83dfcdfbf
|
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
|
2020-03-17 16:22:20 +01:00 |
|
torlunjen
|
1647d84e95
|
Adds checks for collisions on conveyor belts.
Parprogrammering med Gabriel
|
2020-03-17 16:22:11 +01:00 |
|
|
|
3b7a5c6899
|
Gjør metoden for å sjekke om et trekk blir stoppet av en vegg offentlig
Bytter navn fra robotMove til move
|
2020-03-17 14:37:49 +01:00 |
|
|
|
979265c592
|
Merge remote-tracking branch 'origin/master'
|
2020-03-17 14:25:03 +01:00 |
|
|
|
7da60bcc91
|
Legger til en metode for å hente ut en spesifikk vegg på brettet
|
2020-03-17 14:24:46 +01:00 |
|
GabrielMagnus
|
875363708c
|
La til test for å sjekke at getPositionsOfWallOnBoard har rett type og antall med flere argumenter
La til hjelpefunksjoner for å sjekke at alle elementer er av rett type
|
2020-03-17 14:02:04 +01:00 |
|
|
|
fbd7bef642
|
Korrigerer feil konvertering av koordinater i CardChoiceScreen
|
2020-03-17 12:57:50 +01:00 |
|
Steinar Aalstad Lillesund
|
c846adcb14
|
referat fra møte
|
2020-03-17 12:54:44 +01:00 |
|
|
|
7f370a9dbc
|
Fikser importeringer i RoboRallyGame
Fikser også manglende scope for getNewPosition
|
2020-03-16 20:11:31 +01:00 |
|
|
|
b520178686
|
Fikser kodestil
|
2020-03-16 20:06:35 +01:00 |
|
|
|
49ee7dc896
|
Splitter opp moveConveyorBelts for bedre leselighet
|
2020-03-16 19:46:00 +01:00 |
|
|
|
ee753764eb
|
Fikser opp i moveConveyorBelts og fikser skille mellom raske og trege transportbånd
Bytter navn fra TransportBand til ConveyorBelt
Bytter ut listContainsTile med en generisk predikattester
|
2020-03-16 19:37:21 +01:00 |
|
|
|
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 |
|
