 Kenneth van Ewijk
|
df611e8e51
Bugfix
|
9 years ago |
|
Kenneth van Ewijk
|
5fc92d3f2a
Merge branch 'developer' into world/Building
|
9 years ago |
 Remco
|
d1abc20f64
placed loadingscreen picture in json file of a world
|
9 years ago |
|
Kenneth van Ewijk
|
97d43a1249
Merge pull request #29 from CrystalPointA4/feature/weaponCollision
|
9 years ago |
|
Remco
|
cdd3b962eb
texture in loadings screen
|
9 years ago |
 jancoow
|
c9e5be2573
Merge branch 'developer' into feature/weaponCollision
|
9 years ago |
|
jancoow
|
5b6e7b54c7
Added enemy damage
|
9 years ago |
|
Kenneth van Ewijk
|
9143204610
Merge pull request #28 from CrystalPointA4/feature/weaponCollision
|
9 years ago |
|
Kenneth van Ewijk
|
5f31b2e602
Merge branch 'developer' into feature/weaponCollision
|
9 years ago |
|
Kenneth van Ewijk
|
342a56fa5a
Added audio
|
9 years ago |
|
jancoow
|
27dfaf74c4
Better weapon alignment
|
9 years ago |
|
Remco
|
fea7728139
enemy hits player
|
9 years ago |
|
Remco
|
50e2b1c7ea
enemy weird xp gift fixed
|
9 years ago |
|
Remco
|
5bff991b77
Merge branch 'developer' into feature/loadingscreen
|
9 years ago |
|
Remco
|
9192eb7371
see couting points of loading things
|
9 years ago |
|
Kenneth van Ewijk
|
eaa6f9cd57
Hotfix rock world
|
9 years ago |
 Dofensmirtsz
|
6306e8abd4
Heightmap fix, texture fix, rotating crystals and enemy height to 0
|
9 years ago |
|
Remco
|
7edbcd4d4d
loadingscreen has been draw when loading a world
|
9 years ago |
|
Remco
|
d3bde622f0
menu placing right
|
9 years ago |
|
Remco
|
a407be072d
Revert "Revert "Revert "added loadingscreen clas"""
|
9 years ago |
|
Remco
|
97448bfabf
Revert "Revert "added loadingscreen clas""
|
9 years ago |
|
Remco
|
7e6514581e
Revert "added loadingscreen clas"
|
9 years ago |
|
jancoow
|
ba0482ee0a
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
|
9 years ago |
|
Kenneth van Ewijk
|
0e99b9f719
Attempt fix rock world
|
9 years ago |
|
jancoow
|
e7163fc07c
Added controller cursor in menu
|
9 years ago |
|
Remco
|
52ef1b4494
added loadingscreen clas
|
9 years ago |
|
Kenneth van Ewijk
|
3cf6bf5857
Merge pull request #27 from CrystalPointA4/musicInclude
|
9 years ago |
 Aaldert
|
579a04a9b4
Merge branch 'developer' into musicInclude
|
9 years ago |
|
Aaldert
|
b09311d810
Merge branch 'developer' into musicInclude
|
9 years ago |
|
Kenneth van Ewijk
|
d42ae6ccd3
Merge pull request #26 from CrystalPointA4/feature/weaponJSON
|
9 years ago |
