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
SemvdH
fbe3f8f5a9
Merge pull request #8 from SemvdH/Mick
...
Mick
2020-05-27 23:24:18 +02:00
MickWerf
1575161631
Merge branch 'master' into Mick
...
* master:
fix error
2020-05-27 23:22:21 +02:00
Sem van der Hoeven
f15b81330a
fix error
2020-05-27 23:19:36 +02:00
MickWerf
80bd3d1583
Merge branch 'master' into Mick
...
* master:
merged with master # Conflicts: # core/src/netwerkprog/game/util/game/GameCharacter.java
refactored character to game character
changed character into gamecharacter
merge master into this branch # Conflicts: # core/src/netwerkprog/game/util/game/Character.java # core/src/netwerkprog/game/util/game/Faction.java
made it possible to move multiple characters
add stuff for character placing
added test character drawing
added bst classes
added characters to game tile and map renderer
2020-05-27 23:18:33 +02:00
MickWerf
96d9c4a31f
Data sending tests YAY!
2020-05-27 23:17:13 +02:00
SemvdH
71800d3530
Merge pull request #7 from SemvdH/character-tile
...
merge Character tile into master
2020-05-27 23:15:51 +02:00
SemvdH
564c9acecb
Merge branch 'master' into character-tile
2020-05-27 23:15:44 +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
SemvdH
fd3a7afb35
Merge pull request #6 from SemvdH/Mick
...
Mick
2020-05-27 23:00:46 +02:00
Sem van der Hoeven
cc4297d86d
made it possible to move multiple characters
2020-05-27 22:59:21 +02:00
MickWerf
95037404f2
Removed generic dataparser.
...
Removed generic callback.
Added Parsers for client and server.
Added Parsercallback interface.
Applied parser and callback to serverclient and client.
2020-05-27 22:46:24 +02:00
Sem van der Hoeven
dedb0e1af4
add stuff for character placing
2020-05-27 22:31:02 +02:00
MickWerf
99647b781e
Merge branch 'master' into Mick
...
* master:
refactor map things
2020-05-27 21:18:43 +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
MickWerf
b0752f1c1c
Merge branch 'master' into Mick
...
* master:
stuff
2020-05-25 22:01:08 +02:00
Sem van der Hoeven
58df1d4c8e
stuff
2020-05-25 22:00:21 +02:00
MickWerf
4a2c3cf3ee
Merge branch 'master' into Mick
...
* master:
refactor tile to gametile
add tile
removed inputtransform class, add comments and made smol fixes
add ability to see which tile was selected when you click on it
remade the map drawing with tile classes that have a position
stuff
add inputProcesser
2020-05-25 21:58:51 +02:00
MickWerf
2e04560930
Changed GameCharacter to include sprites and draw method.
...
Added ScifiCritters testspirtes.
2020-05-25 21:57:43 +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
MickWerf
5e68d98be3
Merge pull request #5 from SemvdH/add-clicking
...
click click click click
2020-05-25 21:25:51 +02:00
MickWerf
cc37fc2858
Expanded Character to include sprites and positions.
...
Added George sprites for testing.
TestCode for George
2020-05-25 20:58:06 +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
MickWerf
a3b14a9273
Merge branch 'master' into Mick
...
* master:
made camera take into account map size
added moving of camera
added test path
made drawing of tiles possible
2020-05-25 19:52:59 +02:00
Sem van der Hoeven
afeb7afa29
stuff
2020-05-25 19:52:46 +02:00
SemvdH
88f817837e
Merge pull request #4 from SemvdH/Mick
...
Split and personalized client code to fit our program.
2020-05-25 19:52:33 +02:00
MickWerf
bdcdff4c17
Split and personalized client code to fit our program.
...
Added comments to client code.
2020-05-25 19:48:29 +02:00
Sem van der Hoeven
8668bc2017
add inputProcesser
2020-05-25 19:36:19 +02:00
MickWerf
f1f053e070
Merge pull request #3 from SemvdH/implement-mapdrawing
...
merge Implement mapdrawing into master
2020-05-25 19:28:42 +02:00
