EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-11-03 19:23:45 +01:00
Code Issues Projects Releases Wiki Activity
806 Commits 3 Branches 4 Tags
6c7ff8ac8be7d32ba01783956b7aa969e6e2bed2
Commit Graph

806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobydrama
19e8c104db added card choice screen 2020-04-16 14:58:01 +02:00
Tobydrama
a8d755a812 added catch exeption to send function 2020-04-16 14:57:01 +02:00
Tobydrama
0c3a8739e1 added some new cases new cases for the listner 2020-04-16 14:55:59 +02:00
Tobydrama
8f73c043bd gave the listner a server in the construktor 2020-04-16 14:54:13 +02:00
Tobydrama
fdc3564265 added new cases for the server lister and some new function 2020-04-16 14:52:25 +02:00
Tobydrama
6773bc0977 added ekstra functons to the interface 2020-04-16 14:51:42 +02:00
Tobydrama
a1fba2da88 added no args construktor 2020-04-16 14:51:16 +02:00
Tobydrama
e2928e8f17 added ekstra hlper functions 2020-04-16 14:50:45 +02:00
Tobydrama
560419d546 added classes to kryo 2020-04-16 14:49:28 +02:00
GabrielMagnus
60ddee894d Merge branch 'master' of https://github.com/inf112-v20/Fiasko 
 Conflicts:
	src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
 2020-04-16 12:40:10 +02:00
GabrielMagnus
4ddc2a1a83 Endrer checkAllFlags til å bruke hjelpemetoder fra Board 2020-04-16 12:36:33 +02:00
GabrielMagnus
d8167ba250 Lager hjelpemetoder for å sjekke roboter via board 2020-04-16 12:34:54 +02:00
EpicKnarvik97
b5eae63892 Legger til og forbedrer kommentarer i RoboRallyGame 2020-04-16 11:46:07 +02:00
EpicKnarvik97
f46d2f4e29 Splitter opp interfacer for tegning og intragering 
Endrer ting slik at spillet får vite om server og klient ved initialisering
Registerer Action for kryo
Oppdaterer konstruktør i RoboRallyGameTest
 2020-04-16 10:03:52 +02:00
EpicKnarvik97
fa0d53524c Flytter CardRectangle ut av CardChoiceScreen 2020-04-16 09:59:19 +02:00
torlunjen
2abf6d89a6 Optimizing imports 2020-04-15 00:30:15 +02:00
Steinar Aalstad Lillesund
c20cc354d7 Fikset flere Imports 2020-04-14 16:18:39 +02:00
Steinar Aalstad Lillesund
ec53519f3b Merge branch 'master' of https://github.com/inf112-v20/Fiasko 
 Conflicts:
	src/main/java/inf112/fiasko/roborally/gamewrapper/ScreenManager.java
	src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java
	src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java
	src/test/java/inf112/fiasko/roborally/objects/RoboRallyGameTest.java
 2020-04-14 16:13:29 +02:00
Steinar Aalstad Lillesund
7c74af106c Fikset imports og lagt til metode for merking av døde spillere 2020-04-14 16:10:16 +02:00
Steinar Aalstad Lillesund
23406f395b Lagt til en case for gamestate of fikset imports. 2020-04-14 16:08:50 +02:00
Steinar Aalstad Lillesund
bd8090a987 Fikset imports og lagt til funksjon for merkering for døde spillere. 2020-04-14 16:04:32 +02:00
Steinar Aalstad Lillesund
911a725a26 Fikset oppdeling og lagt til metode for å merkere døde spillere. 2020-04-14 16:03:01 +02:00
Steinar Aalstad Lillesund
99f7578cd7 Delt opp klasser. 
RoboRallyClient med RoboRallyClientListener
Og RoboRallyServer med RoboRallyServerListener
 2020-04-14 16:01:04 +02:00
Steinar Aalstad Lillesund
382960d623 Byttet pakkenavn. 2020-04-14 15:54:09 +02:00
GabrielMagnus
5361546e4f Merge branch 'master' of https://github.com/inf112-v20/Fiasko 
 Conflicts:
	src/main/java/inf112/fiasko/roborally/element_properties/GameState.java
	src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java
	src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
 2020-04-14 15:33:18 +02:00
GabrielMagnus
ff2f8a849e Lager felt for winningPlayerName og setter og getter til den 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:21:48 +02:00
GabrielMagnus
48afdfd9f9 Lager setGameState metode og getWinningPlayerName metode 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:19:23 +02:00
GabrielMagnus
83e0d2ceee Legger til metode for å hente ut en vinnerskjerm 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:18:36 +02:00
GabrielMagnus
0c23036a33 Legger til sjekk for om noen har vunnet, og viser vinnerskjermen 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:17:41 +02:00
GabrielMagnus
3edc1c384a Legger til enum for vinnsenario 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:16:51 +02:00
GabrielMagnus
fe78a2f666 Lager en skjerm som viser vinner av spillet 
Co-Authored-By: torlunjen <torlunjen@users.noreply.github.com>
 2020-04-14 15:15:39 +02:00
torlunjen
449c36a5fc Endret parameter i test metode 2020-04-14 15:13:41 +02:00
Steinar Aalstad Lillesund
9f716cc9a3 Merge branch 'master' of https://github.com/inf112-v20/Fiasko 2020-04-14 14:55:03 +02:00
Steinar Aalstad Lillesund
c684630b04 Liste med døde spiller lagt til i Board 2020-04-14 14:54:15 +02:00
Tobydrama
4632fe3acd la til playername 2020-04-14 14:51:53 +02:00
Tobydrama
c389b29195 la til flere game stats 2020-04-14 14:51:29 +02:00
Tobydrama
693ade38f5 la til slik at den tar et deck i input 2020-04-14 14:51:14 +02:00
Tobydrama
cafde5245d endre til et annet screen 2020-04-14 14:50:45 +02:00
Tobydrama
0ddf309e70 endre på neste screen fra loading screenet 2020-04-14 14:50:21 +02:00
Tobydrama
bd9dbf5555 fjernet cardchoisescreen 2020-04-14 14:49:49 +02:00
Tobydrama
847586d06c la til mulighet til å mota programming cards 2020-04-14 14:49:11 +02:00
Tobydrama
ce97c92325 la til en function som lar deg sendet et objekt til bare en client 2020-04-14 14:48:33 +02:00
Tobydrama
b1892e3447 la til getters og sertters for client og server 2020-04-14 14:47:42 +02:00
Steinar Aalstad Lillesund
e8f1c16caa Referat fra møte 2020-04-14 14:47:35 +02:00
Tobydrama
1cace21e88 la til tilgang til client og server 2020-04-14 14:47:17 +02:00
EpicKnarvik97
5ea2219ae9 Legger til getGameState i IDrawableGame 2020-04-14 12:42:32 +02:00
Tobydrama
1b04ed462c Merge branch 'master' of https://github.com/inf112-v20/Fiasko 2020-04-14 12:37:03 +02:00
Tobydrama
f5523aa31c added getters and setter for gameState 2020-04-14 12:36:55 +02:00
EpicKnarvik97
51b7d94f91 Henter gameState i loadingScreen 2020-04-14 12:36:13 +02:00
EpicKnarvik97
db08c273ce Merge branch 'master' of https://github.com/inf112-v20/Fiasko 2020-04-14 12:28:22 +02:00