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

merge with master

Browse Source 
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
This commit is contained in:
Sem van der Hoeven
2020-06-06 22:50:47 +02:00
parent 272a3c6966
commit 8d99753f7c
15 changed files with 307 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/netwerkprog/game/client/MainGame.java
View File

@@ -18,10 +18,13 @@ import netwerkprog.game.client.game.characters.Agent;
import netwerkprog.game.client.game.characters.Hacker;
import netwerkprog.game.client.game.characters.Team;
import netwerkprog.game.client.game.characters.abilities.BodySwap;
import netwerkprog.game.client.game.connections.Client;
import netwerkprog.game.client.game.map.GameInputProcessor;
import netwerkprog.game.client.game.map.GameTile;
import netwerkprog.game.client.game.map.Map;
import netwerkprog.game.client.game.map.MapRenderer;
import netwerkprog.game.util.data.Data;
import netwerkprog.game.util.data.DataCallback;
import netwerkprog.game.util.game.Faction;
import netwerkprog.game.util.game.GameCharacter;
import netwerkprog.game.util.graphics.FrameRate;
@@ -29,7 +32,7 @@ import netwerkprog.game.util.graphics.TextRenderer;
import java.awt.*;
public class MainGame extends ApplicationAdapter {
public class MainGame extends ApplicationAdapter implements DataCallback {
SpriteBatch batch;
float screenWidth;
float screenHeight;
@@ -106,7 +109,7 @@ public class MainGame extends ApplicationAdapter {
// playSong();
// connectToServer();
connectToServer();
}
public void initCharacters() {
@@ -155,7 +158,7 @@ public class MainGame extends ApplicationAdapter {
private void connectToServer() {
client = new Thread(new Client("localhost"));
client = new Thread(new Client("localhost", this));
try {
client.start();
} catch (Exception e) {
@@ -285,4 +288,8 @@ public class MainGame extends ApplicationAdapter {
return team;
}
@Override
public void onDataReceived(Data data) {
}
}