 Kenneth van Ewijk
|
5fc92d3f2a
Merge branch 'developer' into world/Building
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
97d43a1249
Merge pull request #29 from CrystalPointA4/feature/weaponCollision
|
vor 9 Jahren |
 jancoow
|
c9e5be2573
Merge branch 'developer' into feature/weaponCollision
|
vor 9 Jahren |
|
jancoow
|
5b6e7b54c7
Added enemy damage
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
9143204610
Merge pull request #28 from CrystalPointA4/feature/weaponCollision
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
5f31b2e602
Merge branch 'developer' into feature/weaponCollision
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
342a56fa5a
Added audio
|
vor 9 Jahren |
|
jancoow
|
27dfaf74c4
Better weapon alignment
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
eaa6f9cd57
Hotfix rock world
|
vor 9 Jahren |
 Dofensmirtsz
|
6306e8abd4
Heightmap fix, texture fix, rotating crystals and enemy height to 0
|
vor 9 Jahren |
|
jancoow
|
ba0482ee0a
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
0e99b9f719
Attempt fix rock world
|
vor 9 Jahren |
|
jancoow
|
e7163fc07c
Added controller cursor in menu
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
3cf6bf5857
Merge pull request #27 from CrystalPointA4/musicInclude
|
vor 9 Jahren |
 Aaldert
|
579a04a9b4
Merge branch 'developer' into musicInclude
|
vor 9 Jahren |
|
Aaldert
|
b09311d810
Merge branch 'developer' into musicInclude
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
d42ae6ccd3
Merge pull request #26 from CrystalPointA4/feature/weaponJSON
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
f80b513d90
Add weapon switching
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
3025fecf94
Load weapons from JSON
|
vor 9 Jahren |
|
Aaldert
|
41a81d104e
Enemy stops geluid als gedood
|
vor 9 Jahren |
|
Aaldert
|
9543dd8324
Muziek toegvoegt aan world en enemy
|
vor 9 Jahren |
|
Aaldert
|
d56625e19a
MusicIncluded, crystals
|
vor 9 Jahren |
|
jancoow
|
0431e9c230
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
vor 9 Jahren |
|
jancoow
|
d14f045708
Added dead check
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
4437acb9f2
Added missing json
|
vor 9 Jahren |
|
jancoow
|
02a537dc60
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
vor 9 Jahren |
|
jancoow
|
4249e35653
Check if weapon collision point is inside enemy and do weapon damage
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
ec900f7410
Added health+damage to enemy
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
0a0fdfc8b1
Merge pull request #25 from CrystalPointA4/feature/Controller
|
vor 9 Jahren |
|
Kenneth van Ewijk
|
4effce6fea
Merge branch 'developer' into feature/Controller
|
vor 9 Jahren |
