search

PlaceholderGames / 2016-VnD_Game

2nd year computer games development group project
2 stars 0 forks source link

Merge to develop #45

Closed elliotnaylor closed 7 years ago

elliotnaylor commented 7 years ago

There are going to be a lot of conflicts and there aren't that many changes so I am going to do it by myself.

elliotnaylor commented 7 years ago

I am not going to commit this to the develop branch yet because the kamakaze macro is not outputting an explosion even when set. I changed it as a test earlier but it hasn't changed back.

BojanStankovic commented 7 years ago

Since #33 was branched from the branch for this issue it contains all the updates. Therefor, the branch for this issue will remain unmerged. Closing