sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • fbe3f8f5a9 Merge pull request #8 from SemvdH/Mick SemvdH 2020-05-27 23:24:18 +02:00
  • 1575161631 Merge branch 'master' into Mick MickWerf 2020-05-27 23:22:21 +02:00
  • f15b81330a fix error Sem van der Hoeven 2020-05-27 23:19:36 +02:00
  • 80bd3d1583 Merge branch 'master' into Mick MickWerf 2020-05-27 23:18:33 +02:00
  • 96d9c4a31f Data sending tests YAY! MickWerf 2020-05-27 23:17:13 +02:00
  • 71800d3530 Merge pull request #7 from SemvdH/character-tile SemvdH 2020-05-27 23:15:51 +02:00
  • 564c9acecb Merge branch 'master' into character-tile SemvdH 2020-05-27 23:15:44 +02:00
  • 6ebe534a29 merged with master # Conflicts: # core/src/netwerkprog/game/util/game/GameCharacter.java Sem van der Hoeven 2020-05-27 23:14:01 +02:00
  • 8b2853beeb refactored character to game character Sem van der Hoeven 2020-05-27 23:11:26 +02:00
  • 427062308e changed character into gamecharacter Sem van der Hoeven 2020-05-27 23:06:21 +02:00
  • 6c1e073348 merge master into this branch # Conflicts: # core/src/netwerkprog/game/util/game/Character.java # core/src/netwerkprog/game/util/game/Faction.java Sem van der Hoeven 2020-05-27 23:04:04 +02:00
  • fd3a7afb35 Merge pull request #6 from SemvdH/Mick SemvdH 2020-05-27 23:00:46 +02:00
  • cc4297d86d made it possible to move multiple characters Sem van der Hoeven 2020-05-27 22:59:21 +02:00
  • 95037404f2 Removed generic dataparser. Removed generic callback. Added Parsers for client and server. Added Parsercallback interface. Applied parser and callback to serverclient and client. MickWerf 2020-05-27 22:46:24 +02:00
  • dedb0e1af4 add stuff for character placing Sem van der Hoeven 2020-05-27 22:31:02 +02:00
  • 99647b781e Merge branch 'master' into Mick MickWerf 2020-05-27 21:18:43 +02:00
  • 9ddf94589b added test character drawing Sem van der Hoeven 2020-05-27 21:17:09 +02:00
  • 1f6e229d79 added bst classes Sem van der Hoeven 2020-05-27 20:40:37 +02:00
  • ba2af725da added characters to game tile and map renderer Sem van der Hoeven 2020-05-27 20:33:55 +02:00
  • e069fb1b77 refactor map things Sem van der Hoeven 2020-05-25 22:05:07 +02:00
  • b0752f1c1c Merge branch 'master' into Mick MickWerf 2020-05-25 22:01:08 +02:00
  • 58df1d4c8e stuff Sem van der Hoeven 2020-05-25 22:00:21 +02:00
  • 4a2c3cf3ee Merge branch 'master' into Mick MickWerf 2020-05-25 21:58:51 +02:00
  • 2e04560930 Changed GameCharacter to include sprites and draw method. Added ScifiCritters testspirtes. MickWerf 2020-05-25 21:57:43 +02:00
  • 8c403f416e refactor tile to gametile Sem van der Hoeven 2020-05-25 21:57:17 +02:00
  • 0c6e06abaf add tile Sem van der Hoeven 2020-05-25 21:52:44 +02:00
  • 1053e15b4a add tile Sem van der Hoeven 2020-05-25 21:51:24 +02:00
  • 5e68d98be3 Merge pull request #5 from SemvdH/add-clicking MickWerf 2020-05-25 21:25:51 +02:00
  • cc37fc2858 Expanded Character to include sprites and positions. Added George sprites for testing. TestCode for George MickWerf 2020-05-25 20:58:06 +02:00
  • d4c6d76aea removed inputtransform class, add comments and made smol fixes Sem van der Hoeven 2020-05-25 20:55:02 +02:00
  • 75f1c26349 add ability to see which tile was selected when you click on it Sem van der Hoeven 2020-05-25 20:44:20 +02:00
  • 6c85ae9949 remade the map drawing with tile classes that have a position Sem van der Hoeven 2020-05-25 20:13:10 +02:00
  • a3b14a9273 Merge branch 'master' into Mick MickWerf 2020-05-25 19:52:59 +02:00
  • afeb7afa29 stuff Sem van der Hoeven 2020-05-25 19:52:46 +02:00
  • 88f817837e Merge pull request #4 from SemvdH/Mick SemvdH 2020-05-25 19:52:33 +02:00
  • bdcdff4c17 Split and personalized client code to fit our program. Added comments to client code. MickWerf 2020-05-25 19:48:29 +02:00
  • 8668bc2017 add inputProcesser Sem van der Hoeven 2020-05-25 19:36:19 +02:00
  • f1f053e070 Merge pull request #3 from SemvdH/implement-mapdrawing MickWerf 2020-05-25 19:28:42 +02:00
  • c4c95b6c6d merge master Sem van der Hoeven 2020-05-25 19:26:46 +02:00
  • 3e6bf5223f made camera take into account map size Sem van der Hoeven 2020-05-18 16:04:17 +02:00
  • cf33df0167 Merge branch 'Mick' MickWerf 2020-05-18 15:53:27 +02:00
  • a20568b427 Restructured Util for better usability Moved MainGame from util to client. Moved server port static from serverData to Data MickWerf 2020-05-18 15:53:14 +02:00
  • f3659e1df3 Merge branch 'Mick' MickWerf 2020-05-18 15:39:22 +02:00
  • 198c1bfdd8 Fixed Shutdown to truely shut down the sessionController actions and closes the thread. Added testcode to RestartSessionControllerTest to test for no errors. MickWerf 2020-05-18 15:39:09 +02:00
  • d70e39e172 added moving of camera Sem van der Hoeven 2020-05-18 15:28:33 +02:00
  • fef8477e8b Merge branch 'Mick' MickWerf 2020-05-18 15:04:35 +02:00
  • 7601496e40 Added Data parser call to the ServerClient class. Added comments, helper functions and finished the framework of the SessionController. MickWerf 2020-05-18 15:04:22 +02:00
  • 725c13db30 Merge branch 'Mick' MickWerf 2020-05-18 14:26:57 +02:00
  • 94ecff6799 Abbreviated Connect function into the listen function on the sessionController MickWerf 2020-05-18 14:26:44 +02:00
  • 2eb3aa7ecf added test path Sem van der Hoeven 2020-05-18 14:16:32 +02:00
  • 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 MickWerf 2020-05-18 14:09:48 +02:00
  • ca2747ef03 made drawing of tiles possible Sem van der Hoeven 2020-05-18 14:01:40 +02:00
  • 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 MickWerf 2020-05-15 21:45:57 +02:00
  • 63f24b1bb1 Added code to ability super class MickWerf 2020-05-15 21:34:37 +02:00
  • 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 MickWerf 2020-05-15 21:28:56 +02:00
  • e843062456 Create gradle.yml SemvdH 2020-05-15 20:19:18 +02:00
  • aa85e076bf added compile junit dependency for gradle Sem van der Hoeven 2020-05-15 20:18:23 +02:00
  • aae0e2db9a added ability to generate map array from strings Sem van der Hoeven 2020-05-15 20:07:59 +02:00
  • a8fe07b5c0 added maprenderer Sem van der Hoeven 2020-05-15 19:51:40 +02:00
  • 162b5e74cd removed tilewidth because the map data will not need this Sem van der Hoeven 2020-05-15 19:36:38 +02:00
  • 8cf834b9ea add map test Sem van der Hoeven 2020-05-15 19:34:43 +02:00
  • 4402bc65ae add junit to classpath Sem van der Hoeven 2020-05-15 19:20:45 +02:00
  • 1958f724d1 add begin of map class Sem van der Hoeven 2020-05-15 19:12:56 +02:00
  • 4854902bbf add drawable interface Sem van der Hoeven 2020-05-15 19:12:46 +02:00
  • 9b893a4294 add server launcher Sem van der Hoeven 2020-05-14 20:35:36 +02:00
  • 017a590618 comment test code Sem van der Hoeven 2020-05-14 20:34:31 +02:00
  • b6c3e433aa added logicController Sem van der Hoeven 2020-05-14 20:33:45 +02:00
  • 46759d9a5e moved timer Sem van der Hoeven 2020-05-14 20:33:17 +02:00
  • 917200c67e made callback class Sem van der Hoeven 2020-05-14 20:33:04 +02:00
  • 586a552426 remove some redundant files Sem van der Hoeven 2020-05-14 20:32:57 +02:00
  • ee211a4e13 fix typo Sem van der Hoeven 2020-05-14 20:02:21 +02:00
  • aaba65a9a1 added Timer class Sem van der Hoeven 2020-05-14 19:59:35 +02:00
  • c78f8f6bd6 more ideas Sem van der Hoeven 2020-05-14 19:59:28 +02:00
  • 2485a66627 added implementation ideas Sem van der Hoeven 2020-05-14 19:38:30 +02:00
  • 2b66e58301 added some more idea things Sem van der Hoeven 2020-05-14 19:36:13 +02:00
  • b8c9a2c81c added more definiteve ideas Sem van der Hoeven 2020-05-14 19:33:39 +02:00
  • 7f0b2b24fb made session thread start Sem van der Hoeven 2020-05-12 13:36:29 +02:00
  • 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 MickWerf 2020-05-11 17:04:33 +02:00
  • 6b25356ee3 edited build.gradle to include the api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" lib MickWerf 2020-05-11 14:43:47 +02:00
  • 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. MickWerf 2020-05-11 14:32:22 +02:00
  • 2596b913fc added new thread for client connection and added resize method Sem van der Hoeven 2020-05-11 12:17:05 +02:00
  • ffdbd5543f improved client error messages Sem van der Hoeven 2020-05-11 12:16:42 +02:00
  • d28022499f renamed temp to examples Sem van der Hoeven 2020-05-11 12:16:28 +02:00
  • 0253cc1a28 added an update method to handle calculation Sem van der Hoeven 2020-05-11 11:55:49 +02:00
  • f9c0a4834e made client extend thread so a new connection can be launched when the game is started Sem van der Hoeven 2020-05-11 11:55:32 +02:00
  • 615273f301 removed todos Sem van der Hoeven 2020-05-11 11:41:35 +02:00
  • ccbadd6328 added fps counter Sem van der Hoeven 2020-05-11 09:35:59 +02:00
  • d87ecaaca5 added lwjgl version 3 to gradle Sem van der Hoeven 2020-05-11 09:18:14 +02:00
  • a5aaec76b1 added new constructors to game config class Sem van der Hoeven 2020-05-11 09:12:33 +02:00
  • 2849c34c63 added example networking file (that doesnt work) Sem van der Hoeven 2020-05-10 22:29:15 +02:00
  • 914383f89b Merge pull request #2 from SemvdH/how-to-make-game SemvdH 2020-05-10 22:14:35 +02:00
  • aac30b4317 added todos Sem van der Hoeven 2020-05-10 22:13:26 +02:00
  • 4aef28eea4 added music that plays Sem van der Hoeven 2020-05-10 22:13:22 +02:00
  • 2b3ba04684 Delete gradle.yml SemvdH 2020-05-10 21:40:33 +02:00
  • 509ec5b0da added CI action SemvdH 2020-05-10 21:32:16 +02:00
  • 35f5c8760a Merge pull request #1 from SemvdH/how-to-make-game SemvdH 2020-05-10 21:27:25 +02:00
  • 30ad6d1ffd added temp stuff for learning how Sem van der Hoeven 2020-05-10 21:24:47 +02:00
  • de587b55c6 added example animation Sem van der Hoeven 2020-05-10 21:24:34 +02:00
  • cca7e4262c added custom configuration class Sem van der Hoeven 2020-05-10 21:24:19 +02:00
  • f2b935e839 added lwjgl library to gradle Sem van der Hoeven 2020-05-10 21:24:02 +02:00