sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
212 Commits 3 Branches 1 Tag
master
Commit Graph

212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MickWerf
1575161631 Merge branch 'master' into Mick 
* master:
  fix error
 2020-05-27 23:22:21 +02:00
Sem van der Hoeven
f15b81330a fix error 2020-05-27 23:19:36 +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
SemvdH
71800d3530 Merge pull request #7 from SemvdH/character-tile 
merge Character tile into master
 2020-05-27 23:15:51 +02:00
SemvdH
564c9acecb Merge branch 'master' into character-tile 2020-05-27 23:15:44 +02:00
Sem van der Hoeven
6ebe534a29 merged with master 
# Conflicts:
#	core/src/netwerkprog/game/util/game/GameCharacter.java
 2020-05-27 23:14:01 +02:00
Sem van der Hoeven
8b2853beeb refactored character to game character 2020-05-27 23:11:26 +02:00
Sem van der Hoeven
427062308e changed character into gamecharacter 2020-05-27 23:06:21 +02:00
Sem van der Hoeven
6c1e073348 merge master into this branch 
# Conflicts:
#	core/src/netwerkprog/game/util/game/Character.java
#	core/src/netwerkprog/game/util/game/Faction.java
 2020-05-27 23:04:04 +02:00
SemvdH
fd3a7afb35 Merge pull request #6 from SemvdH/Mick 
Mick
 2020-05-27 23:00:46 +02:00
Sem van der Hoeven
cc4297d86d made it possible to move multiple characters 2020-05-27 22:59:21 +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
Sem van der Hoeven
dedb0e1af4 add stuff for character placing 2020-05-27 22:31:02 +02:00
MickWerf
99647b781e Merge branch 'master' into Mick 
* master:
  refactor map things
 2020-05-27 21:18:43 +02:00
Sem van der Hoeven
9ddf94589b added test character drawing 2020-05-27 21:17:09 +02:00
Sem van der Hoeven
1f6e229d79 added bst classes 2020-05-27 20:40:37 +02:00
Sem van der Hoeven
ba2af725da added characters to game tile and map renderer 2020-05-27 20:33:55 +02:00
Sem van der Hoeven
e069fb1b77 refactor map things 2020-05-25 22:05:07 +02:00
MickWerf
b0752f1c1c Merge branch 'master' into Mick 
* master:
  stuff
 2020-05-25 22:01:08 +02:00
Sem van der Hoeven
58df1d4c8e stuff 2020-05-25 22:00:21 +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
Sem van der Hoeven
8c403f416e refactor tile to gametile 2020-05-25 21:57:17 +02:00
Sem van der Hoeven
0c6e06abaf add tile 2020-05-25 21:52:44 +02:00
Sem van der Hoeven
1053e15b4a add tile 2020-05-25 21:51:24 +02:00
MickWerf
5e68d98be3 Merge pull request #5 from SemvdH/add-clicking 
click click click click
 2020-05-25 21:25:51 +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
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