sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
185 Commits 3 Branches 1 Tag
3d5ad16eba5b245cd2b98e04b066308beaf0b5c7
Commit Graph
185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sem van der Hoeven d4c6d76aea removed inputtransform class, add comments and made smol fixes 2020-05-25 20:55:02 +02:00
Sem van der Hoeven 75f1c26349 add ability to see which tile was selected when you click on it 2020-05-25 20:44:20 +02:00
Sem van der Hoeven 6c85ae9949 remade the map drawing with tile classes that have a position 2020-05-25 20:13:10 +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
Sem van der Hoeven afeb7afa29 stuff 2020-05-25 19:52:46 +02:00
SemvdH 88f817837e Merge pull request #4 from SemvdH/Mick 
Split and personalized client code to fit our program.
 2020-05-25 19:52:33 +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
Sem van der Hoeven 8668bc2017 add inputProcesser 2020-05-25 19:36:19 +02:00
MickWerf f1f053e070 Merge pull request #3 from SemvdH/implement-mapdrawing 
merge Implement mapdrawing into master
 2020-05-25 19:28:42 +02:00
Sem van der Hoeven c4c95b6c6d merge master 2020-05-25 19:26:46 +02:00
Sem van der Hoeven 3e6bf5223f made camera take into account map size 2020-05-18 16:04:17 +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
Sem van der Hoeven d70e39e172 added moving of camera 2020-05-18 15:28:33 +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
Sem van der Hoeven 2eb3aa7ecf added test path 2020-05-18 14:16:32 +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
Sem van der Hoeven ca2747ef03 made drawing of tiles possible 2020-05-18 14:01:40 +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
SemvdH e843062456 Create gradle.yml 
added CI
 2020-05-15 20:19:18 +02:00
Sem van der Hoeven aa85e076bf added compile junit dependency for gradle 2020-05-15 20:18:23 +02:00
Sem van der Hoeven aae0e2db9a added ability to generate map array from strings 2020-05-15 20:07:59 +02:00
Sem van der Hoeven a8fe07b5c0 added maprenderer 2020-05-15 19:51:40 +02:00
Sem van der Hoeven 162b5e74cd removed tilewidth because the map data will not need this 2020-05-15 19:36:38 +02:00
Sem van der Hoeven 8cf834b9ea add map test 2020-05-15 19:34:43 +02:00
Sem van der Hoeven 4402bc65ae add junit to classpath 2020-05-15 19:20:45 +02:00
Sem van der Hoeven 1958f724d1 add begin of map class 2020-05-15 19:12:56 +02:00
Sem van der Hoeven 4854902bbf add drawable interface 2020-05-15 19:12:46 +02:00
Sem van der Hoeven 9b893a4294 add server launcher 2020-05-14 20:35:36 +02:00
Sem van der Hoeven 017a590618 comment test code 2020-05-14 20:34:31 +02:00
Sem van der Hoeven b6c3e433aa added logicController 2020-05-14 20:33:45 +02:00
Sem van der Hoeven 46759d9a5e moved timer 2020-05-14 20:33:17 +02:00
Sem van der Hoeven 917200c67e made callback class 2020-05-14 20:33:04 +02:00
Sem van der Hoeven 586a552426 remove some redundant files 2020-05-14 20:32:57 +02:00
Sem van der Hoeven ee211a4e13 fix typo 2020-05-14 20:02:21 +02:00
Sem van der Hoeven aaba65a9a1 added Timer class 2020-05-14 19:59:35 +02:00
Sem van der Hoeven c78f8f6bd6 more ideas 2020-05-14 19:59:28 +02:00
Sem van der Hoeven 2485a66627 added implementation ideas 2020-05-14 19:38:30 +02:00
Sem van der Hoeven 2b66e58301 added some more idea things 2020-05-14 19:36:13 +02:00
Sem van der Hoeven b8c9a2c81c added more definiteve ideas 2020-05-14 19:33:39 +02:00
Sem van der Hoeven 7f0b2b24fb made session thread start 2020-05-12 13:36:29 +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