sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
195 Commits 3 Branches 1 Tag
784762991f01663883356c8e8eef695dea7ace9c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sem van der Hoeven 9ed89bf642 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/netwerkprog/game/util/tree/BST.java
#	core/src/netwerkprog/game/util/tree/Tree.java
 2020-06-07 17:11:12 +02:00
Sem van der Hoeven 749429b171 clean bst 2020-06-07 17:10:36 +02:00
Sem van der Hoeven 37cefd6d88 refactor method 2020-06-07 17:06:00 +02:00
Sem van der Hoeven 3e316ccc17 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/netwerkprog/game/util/graphics/Renderable.java
 2020-06-07 16:56:36 +02:00
Sem van der Hoeven 3d5ad16eba add music 2020-06-07 16:56:16 +02:00
Sem van der Hoeven 7ce4cba2ff Merge remote-tracking branch 'origin/master' 2020-06-07 16:51:54 +02:00
Sem van der Hoeven b80fe293e0 comments 2020-06-07 16:51:41 +02:00
Sem van der Hoeven 133310a3e2 stuff fix 2020-06-07 16:34:27 +02:00
Sem van der Hoeven 8344cbab0b made not able to move dead people 2020-06-07 16:25:19 +02:00
Sem van der Hoeven 6ac66d8311 update moving 2020-06-07 16:09:16 +02:00
Sem van der Hoeven fd6d91b7ed fix faction choosing 2020-06-07 15:54:22 +02:00
Sem van der Hoeven 9337c44e20 fix import 2020-06-07 15:50:02 +02:00
Sem van der Hoeven 80ebf342c6 Merge remote-tracking branch 'origin/master' 2020-06-07 15:49:34 +02:00
Sem van der Hoeven e33aca517f faction choose progress 2020-06-07 15:49:26 +02:00
Sem van der Hoeven 60f3edb656 made getter for username 2020-06-07 15:21:27 +02:00
Sem van der Hoeven 63b1f66567 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
 2020-06-07 15:13:17 +02:00
Sem van der Hoeven 41b8544646 stuff 2 2020-06-07 15:12:38 +02:00
Sem van der Hoeven fd0c8ba765 stuff 2020-06-07 14:50:29 +02:00
Sem van der Hoeven 360e2cb967 Merge remote-tracking branch 'origin/master' 2020-06-07 14:44:11 +02:00
Sem van der Hoeven ff35e96312 usernames 2 2020-06-07 14:44:03 +02:00
Sem van der Hoeven 79a0348a84 team picking things 2020-06-07 14:42:39 +02:00
Sem van der Hoeven 2aeec735d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/netwerkprog/game/server/controllers/SessionController.java
 2020-06-07 14:26:12 +02:00
Sem van der Hoeven ddaf07df49 username sending done 2020-06-07 14:24:34 +02:00
Sem van der Hoeven 749f27d448 made game extend game 2020-06-07 14:05:45 +02:00
Sem van der Hoeven 1be186e113 souts 2020-06-07 13:43:05 +02:00
Sem van der Hoeven 7abe8e22a1 made them bois killable 2020-06-06 23:00:35 +02:00
Sem van der Hoeven 8d99753f7c merge with master 
Squashed commit of the following:

commit ec0d0c3531
Merge: cb2ef90 15492cb
Author: SemvdH <45453592+SemvdH@users.noreply.github.com>
Date:   Sat Jun 6 22:43:28 2020 +0200

    Merge pull request #10 from SemvdH/Connections

    Connections

commit 15492cb91d
Author: MickWerf <mickwerf@outlook.com>
Date:   Sat Jun 6 16:50:32 2020 +0200

    Fixed test build issue

commit 4b7eaaa641
Merge: 9349e6c c07c860
Author: MickWerf <mickwerf@outlook.com>
Date:   Sat Jun 6 16:47:59 2020 +0200

    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

commit 9349e6ce48
Author: MickWerf <mickwerf@outlook.com>
Date:   Sat Jun 6 16:42:44 2020 +0200

    Finished Server/Client registration and communications

commit 3dbffa4ffb
Author: MickWerf <mickwerf@outlook.com>
Date:   Sat Jun 6 15:44:53 2020 +0200

    Finished server side registration.

commit f942bbbc92
Author: MickWerf <mickwerf@outlook.com>
Date:   Sat Jun 6 15:02:45 2020 +0200

    Connections, Applied Data objects, removed parsers and Made genereric data handling
 2020-06-06 22:50:47 +02:00
Sem van der Hoeven 272a3c6966 temp 2020-06-06 22:48:45 +02:00
Sem van der Hoeven 35a93d3ecb hit timer 2020-06-06 22:42:43 +02:00
Sem van der Hoeven 6a078550b2 timeout stuff 2020-06-06 21:06:11 +02:00
Sem van der Hoeven 24a03a2854 made characters in range attackable 2020-06-06 17:37:23 +02:00
Sem van der Hoeven bdb7c6e5c5 remove line 2020-06-06 17:21:27 +02:00
Sem van der Hoeven bbfa59ab7f amazing music 2020-06-06 17:19:44 +02:00
Sem van der Hoeven c8325ba55c optimize imports 2020-06-06 16:21:00 +02:00
Sem van der Hoeven 95a582b91e fixed memory leaks 2020-06-06 16:19:36 +02:00
Sem van der Hoeven ab3d57bc7f made only possible to select own factions characters 2020-06-06 16:07:05 +02:00
Sem van der Hoeven 23cf4d120e made character only able to move in some position 2020-06-06 15:44:46 +02:00
Sem van der Hoeven 737e1ac1cb added character squares he can move 2020-06-06 15:35:01 +02:00
Sem van der Hoeven 3827098c42 added stuff 2020-06-06 15:27:22 +02:00
Sem van der Hoeven 8b4538da39 add square to selected character 2020-06-06 14:40:22 +02:00
Sem van der Hoeven f32a1b34c3 made compareto only use health 2020-06-02 23:44:14 +02:00
Sem van der Hoeven 1285e1ae82 update compareTo 2020-06-02 23:43:35 +02:00
Sem van der Hoeven c9a6907fca added isDead method to team class 2020-06-02 23:42:51 +02:00
Sem van der Hoeven be0703ba61 added health to characters 2020-06-02 23:40:25 +02:00
Sem van der Hoeven 087c3a7193 added team class that uses a tree 2020-06-02 23:35:28 +02:00
Sem van der Hoeven 42d88e434f added coordinates to characters 2020-05-27 23:34:16 +02:00
Sem van der Hoeven f15b81330a fix error 2020-05-27 23:19:36 +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
Sem van der Hoeven cc4297d86d made it possible to move multiple characters 2020-05-27 22:59:21 +02:00
Sem van der Hoeven dedb0e1af4 add stuff for character placing 2020-05-27 22:31:02 +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
Sem van der Hoeven 58df1d4c8e stuff 2020-05-25 22:00:21 +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
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
Sem van der Hoeven afeb7afa29 stuff 2020-05-25 19:52:46 +02:00
Sem van der Hoeven 8668bc2017 add inputProcesser 2020-05-25 19:36:19 +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
Sem van der Hoeven d70e39e172 added moving of camera 2020-05-18 15:28:33 +02:00
Sem van der Hoeven 2eb3aa7ecf added test path 2020-05-18 14:16:32 +02:00
Sem van der Hoeven ca2747ef03 made drawing of tiles possible 2020-05-18 14:01:40 +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
Sem van der Hoeven 2596b913fc added new thread for client connection and added resize method 2020-05-11 12:17:05 +02:00
Sem van der Hoeven ffdbd5543f improved client error messages 2020-05-11 12:16:42 +02:00
Sem van der Hoeven d28022499f renamed temp to examples 2020-05-11 12:16:28 +02:00
Sem van der Hoeven 0253cc1a28 added an update method to handle calculation 2020-05-11 11:55:49 +02:00
Sem van der Hoeven f9c0a4834e made client extend thread so a new connection can be launched when the game is started 2020-05-11 11:55:32 +02:00
Sem van der Hoeven 615273f301 removed todos 2020-05-11 11:41:35 +02:00
Sem van der Hoeven ccbadd6328 added fps counter 2020-05-11 09:35:59 +02:00
Sem van der Hoeven d87ecaaca5 added lwjgl version 3 to gradle 2020-05-11 09:18:14 +02:00