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

57 Commits

Author SHA1 Message Date
Sem van der Hoeven
fdb80afba5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
 2020-06-07 17:33:35 +02:00
Sem van der Hoeven
046cade8a0 add restart 2020-06-07 17:33:03 +02:00
MickWerf
6914bb891c Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 2020-06-07 17:25:57 +02:00
MickWerf
50e6b7ca95 Maingame cleaning 2020-06-07 17:25:50 +02:00
Sem van der Hoeven
f2e5504c5c added esc string 2020-06-07 17:16:07 +02:00
Sem van der Hoeven
6ae2b5de51 add exit method 2020-06-07 17:15:00 +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
3d5ad16eba add music 2020-06-07 16:56:16 +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
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
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
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
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
Sem van der Hoeven
fd0c8ba765 stuff 2020-06-07 14:50:29 +02:00
Sem van der Hoeven
79a0348a84 team picking things 2020-06-07 14:42:39 +02:00
MickWerf
0af0ca02b6 Removed server interfaces from client game 2020-06-07 14:36:35 +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
MickWerf
fdf9b22d58 Fixed Datacontroller to allow for Data sendback 2020-06-07 13:58:55 +02:00
Sem van der Hoeven
1be186e113 souts 2020-06-07 13:43:05 +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
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
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
8b2853beeb refactored character to game character 2020-05-27 23:11:26 +02:00
Sem van der Hoeven
cc4297d86d made it possible to move multiple characters 2020-05-27 22:59:21 +02:00