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

merge Character tile into master #7

Merged
SemvdH merged 10 commits from character-tile into master 2020-05-27 21:15:51 +00:00
Conversation 0 Commits 10 Files Changed 15
+635 -37
10 Commits
Author SHA1 Message Date
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
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