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

188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MickWerf
a2a7095881 Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 2020-06-07 16:54:34 +02:00
MickWerf
3df66c1789 Cleaned Data 
Removed updatable
 2020-06-07 16:54:20 +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
MickWerf
355d9757b4 Removed controller and replaced with runnable. 
Remove unused logic package
 2020-06-07 16:49:37 +02:00
MickWerf
e86a48d3cd Disconnect clients properly and cleaned server package 2020-06-07 16:47:04 +02:00
MickWerf
4c23293c2c Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 
# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java
 2020-06-07 16:36:35 +02:00
MickWerf
c5411217b8 Server Coments 2020-06-07 16:36:13 +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
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
8b70287aa0 fixed import issue 2020-06-07 15:06:54 +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
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
MickWerf
a3e79cf6c4 fixed test build error 2020-06-07 14:38:26 +02:00
MickWerf
0af0ca02b6 Removed server interfaces from client game 2020-06-07 14:36:35 +02:00
MickWerf
d913138cda Added automatic updating an sending data for the server 2020-06-07 14:31:15 +02:00
MickWerf
a971c3c44e Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 
# Conflicts:
#	core/src/netwerkprog/game/server/SessionController.java
 2020-06-07 14:27:31 +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
MickWerf
e1029187f6 Removed DataController from server 2020-06-07 14:24:51 +02:00
Sem van der Hoeven
ddaf07df49 username sending done 2020-06-07 14:24:34 +02:00
MickWerf
51558d1d4d Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht 2020-06-07 14:13:08 +02:00
MickWerf
60d478bb1e Added automatic updates server side when data is changed 2020-06-07 14:12:48 +02:00
Sem van der Hoeven
749f27d448 made game extend game 2020-06-07 14:05:45 +02:00
MickWerf
b287360012 Added TeamData 2020-06-07 14:04:30 +02:00
MickWerf
fdf9b22d58 Fixed Datacontroller to allow for Data sendback 2020-06-07 13:58:55 +02:00
MickWerf
315d447a2a Added Client to DataController 2020-06-07 13:48: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
SemvdH
f8074d5e64 Merge pull request #12 from SemvdH/temp 
Temp
 2020-06-06 22:51:19 +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
SemvdH
ec0d0c3531 Merge pull request #10 from SemvdH/Connections 
Connections
 2020-06-06 22:43:28 +02:00