sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
182 Commits 3 Branches 1 Tag
355d9757b4a04e8223a6c09baffd15fc24be8f8a
Commit Graph
52 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MickWerf 355d9757b4 Removed controller and replaced with runnable. 
Remove unused logic package
 2020-06-07 16:49:37 +02:00
MickWerf e86a48d3cd Disconnect clients properly and cleaned server package 2020-06-07 16:47:04 +02:00
MickWerf 4c23293c2c Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 
# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
 2020-06-07 16:36:35 +02:00
MickWerf c5411217b8 Server Coments 2020-06-07 16:36:13 +02:00
MickWerf 30b343fc84 Fixed move and implemented Damaging characters 2020-06-07 15:30:05 +02:00
MickWerf 6d22fce2d1 Move Character communication done 2020-06-07 15:26:02 +02:00
MickWerf e9f22850f7 Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 2020-06-07 15:22:21 +02:00
MickWerf 3adf271cfe MoveData Initial stuff 2020-06-07 15:22:15 +02:00
MickWerf 8b70287aa0 fixed import issue 2020-06-07 15:06:54 +02:00
MickWerf b35161f4de Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 
# Conflicts:
#	core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
 2020-06-07 15:04:53 +02:00
MickWerf 1a1d014f42 Added package structure for Data 
Renamed CharacterData to MoveData
Added DamageData.
 2020-06-07 15:03:32 +02:00
MickWerf a3e79cf6c4 fixed test build error 2020-06-07 14:38:26 +02:00
MickWerf 0af0ca02b6 Removed server interfaces from client game 2020-06-07 14:36:35 +02:00
MickWerf d913138cda Added automatic updating an sending data for the server 2020-06-07 14:31:15 +02:00
MickWerf a971c3c44e Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 
# Conflicts:
#	core/src/netwerkprog/game/server/SessionController.java
 2020-06-07 14:27:31 +02:00
MickWerf e1029187f6 Removed DataController from server 2020-06-07 14:24:51 +02:00
MickWerf 51558d1d4d Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 2020-06-07 14:13:08 +02:00
MickWerf 60d478bb1e Added automatic updates server side when data is changed 2020-06-07 14:12:48 +02:00
MickWerf b287360012 Added TeamData 2020-06-07 14:04:30 +02:00
MickWerf fdf9b22d58 Fixed Datacontroller to allow for Data sendback 2020-06-07 13:58:55 +02:00
MickWerf 315d447a2a Added Client to DataController 2020-06-07 13:48:45 +02:00
MickWerf 15492cb91d Fixed test build issue 2020-06-06 16:50:32 +02:00
MickWerf 4b7eaaa641 Merge branch 'master' into Connections 
* master:
  optimize imports
  fixed memory leaks
  made only possible to select own factions characters
  made character only able to move in some position
  added character squares he can move
  added stuff
  add square to selected character

# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
#	core/src/netwerkprog/game/util/game/GameCharacter.java
 2020-06-06 16:47:59 +02:00
MickWerf 9349e6ce48 Finished Server/Client registration and communications 2020-06-06 16:42:44 +02:00
MickWerf 3dbffa4ffb Finished server side registration. 2020-06-06 15:44:53 +02:00
MickWerf f942bbbc92 Connections, Applied Data objects, removed parsers and Made genereric data handling 2020-06-06 15:02:45 +02:00
MickWerf 1575161631 Merge branch 'master' into Mick 
* master:
  fix error
 2020-05-27 23:22:21 +02:00
MickWerf 80bd3d1583 Merge branch 'master' into Mick 
* master:
  merged with master # Conflicts: #	core/src/netwerkprog/game/util/game/GameCharacter.java
  refactored character to game character
  changed character into gamecharacter
  merge master into this branch # Conflicts: #	core/src/netwerkprog/game/util/game/Character.java #	core/src/netwerkprog/game/util/game/Faction.java
  made it possible to move multiple characters
  add stuff for character placing
  added test character drawing
  added bst classes
  added characters to game tile and map renderer
 2020-05-27 23:18:33 +02:00
MickWerf 96d9c4a31f Data sending tests YAY! 2020-05-27 23:17:13 +02:00
MickWerf 95037404f2 Removed generic dataparser. 
Removed generic callback.
Added Parsers for client and server.
Added Parsercallback interface.
Applied parser and callback to serverclient and client.
 2020-05-27 22:46:24 +02:00
MickWerf 99647b781e Merge branch 'master' into Mick 
* master:
  refactor map things
 2020-05-27 21:18:43 +02:00
MickWerf b0752f1c1c Merge branch 'master' into Mick 
* master:
  stuff
 2020-05-25 22:01:08 +02:00
MickWerf 4a2c3cf3ee Merge branch 'master' into Mick 
* master:
  refactor tile to gametile
  add tile
  removed inputtransform class, add comments and made smol fixes
  add ability to see which tile was selected when you click on it
  remade the map drawing with tile classes that have a position
  stuff
  add inputProcesser
 2020-05-25 21:58:51 +02:00
MickWerf 2e04560930 Changed GameCharacter to include sprites and draw method. 
Added ScifiCritters testspirtes.
 2020-05-25 21:57:43 +02:00
MickWerf cc37fc2858 Expanded Character to include sprites and positions. 
Added George sprites for testing.
TestCode for George
 2020-05-25 20:58:06 +02:00
MickWerf a3b14a9273 Merge branch 'master' into Mick 
* master:
  made camera take into account map size
  added moving of camera
  added test path
  made drawing of tiles possible
 2020-05-25 19:52:59 +02:00
MickWerf bdcdff4c17 Split and personalized client code to fit our program. 
Added comments to client code.
 2020-05-25 19:48:29 +02:00
MickWerf cf33df0167 Merge branch 'Mick' 
* Mick:
  Restructured Util for better usability Moved MainGame from util to client. Moved server port static from serverData to Data
 2020-05-18 15:53:27 +02:00
MickWerf a20568b427 Restructured Util for better usability 
Moved MainGame from util to client.
Moved server port static from serverData to Data
 2020-05-18 15:53:14 +02:00
MickWerf f3659e1df3 Merge branch 'Mick' 
* Mick:
  Fixed Shutdown to truely shut down the sessionController actions and closes the thread. Added testcode to RestartSessionControllerTest to test for no errors.
 2020-05-18 15:39:22 +02:00
MickWerf 198c1bfdd8 Fixed Shutdown to truely shut down the sessionController actions and closes the thread. 
Added testcode to RestartSessionControllerTest to test for no errors.
 2020-05-18 15:39:09 +02:00
MickWerf fef8477e8b Merge branch 'Mick' 
* Mick:
  Added Data parser call to the ServerClient class. Added comments, helper functions and finished the framework of the SessionController.
 2020-05-18 15:04:35 +02:00
MickWerf 7601496e40 Added Data parser call to the ServerClient class. 
Added comments, helper functions and finished the framework of the SessionController.
 2020-05-18 15:04:22 +02:00
MickWerf 725c13db30 Merge branch 'Mick' 
* Mick:
  Abbreviated Connect function into the listen function on the sessionController
 2020-05-18 14:26:57 +02:00
MickWerf 94ecff6799 Abbreviated Connect function into the listen function on the sessionController 2020-05-18 14:26:44 +02:00
MickWerf 8dee45a844 Added skeleton for Server Connection structure changes. 
Added Data and Event classes for Data saving on the server.
Added DataParser class for translating requests to data.
Added ServerData package
 2020-05-18 14:09:48 +02:00
MickWerf 7969746bc1 Fixed issue with build. 
Changed MainGame to create a thread instead of a client and used the client as input for the thread
Changed client to extend Controller instead of thread
 2020-05-15 21:45:57 +02:00
MickWerf 63f24b1bb1 Added code to ability super class 2020-05-15 21:34:37 +02:00
MickWerf 46ae15b1c7 Structure change to fit new design. 
Added skeleton for Characters and abilities.
Added ability and Character super classes.
Added code to character superclass.
Added faction Enum
 2020-05-15 21:28:56 +02:00
MickWerf 1c7b47dc57 Moved connection code from server to sessioncontroller 
Added implements runnable to controller super class.
Added Thread management to server.
Added testcode to GameController
Added InputController to client
Added Objective to Game package
Added Timer to game package
Removed ScoreController
 2020-05-11 17:04:33 +02:00
MickWerf 6b25356ee3 edited build.gradle to include the api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" lib 2020-05-11 14:43:47 +02:00
MickWerf f56af5e3dd Added util package for all mutual classes between server and client. 
Added FrameRate and GameApplicationConfiguration to util package.
Added super class for controllers.
Added controllers package for server and client packages.
Added gamecontroller for server.
Added character, object and score controllers for server and create them on gamecontroller creation.
Added sessioncontroller for server and client.
Added graphicsController for client.
Removed unused imports.
 2020-05-11 14:32:22 +02:00