 Remco
|
7e6514581e
Revert "added loadingscreen clas"
|
10 anni fa |
 jancoow
|
ba0482ee0a
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
|
10 anni fa |
 Kenneth van Ewijk
|
0e99b9f719
Attempt fix rock world
|
10 anni fa |
|
jancoow
|
e7163fc07c
Added controller cursor in menu
|
10 anni fa |
|
Remco
|
52ef1b4494
added loadingscreen clas
|
10 anni fa |
|
Kenneth van Ewijk
|
3cf6bf5857
Merge pull request #27 from CrystalPointA4/musicInclude
|
10 anni fa |
 Aaldert
|
579a04a9b4
Merge branch 'developer' into musicInclude
|
10 anni fa |
|
Aaldert
|
b09311d810
Merge branch 'developer' into musicInclude
|
10 anni fa |
|
Kenneth van Ewijk
|
d42ae6ccd3
Merge pull request #26 from CrystalPointA4/feature/weaponJSON
|
10 anni fa |
|
Kenneth van Ewijk
|
f80b513d90
Add weapon switching
|
10 anni fa |
|
Kenneth van Ewijk
|
3025fecf94
Load weapons from JSON
|
10 anni fa |
|
Aaldert
|
41a81d104e
Enemy stops geluid als gedood
|
10 anni fa |
|
Aaldert
|
9543dd8324
Muziek toegvoegt aan world en enemy
|
10 anni fa |
|
Aaldert
|
d56625e19a
MusicIncluded, crystals
|
10 anni fa |
|
jancoow
|
0431e9c230
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
10 anni fa |
|
jancoow
|
d14f045708
Added dead check
|
10 anni fa |
|
Kenneth van Ewijk
|
4437acb9f2
Added missing json
|
10 anni fa |
|
jancoow
|
02a537dc60
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
10 anni fa |
|
jancoow
|
4249e35653
Check if weapon collision point is inside enemy and do weapon damage
|
10 anni fa |
|
Kenneth van Ewijk
|
ec900f7410
Added health+damage to enemy
|
10 anni fa |
|
Kenneth van Ewijk
|
0a0fdfc8b1
Merge pull request #25 from CrystalPointA4/feature/Controller
|
10 anni fa |
|
Kenneth van Ewijk
|
4effce6fea
Merge branch 'developer' into feature/Controller
|
10 anni fa |
|
Kenneth van Ewijk
|
81cf7f43c0
Merge pull request #24 from CrystalPointA4/feature/normalsmoothing
|
10 anni fa |
|
Kenneth van Ewijk
|
58ac7d13cf
Merge pull request #23 from CrystalPointA4/feature/soundsystemfix
|
10 anni fa |
|
Kenneth van Ewijk
|
c91bb5c656
attempt fix
|
10 anni fa |
|
Kenneth van Ewijk
|
ed3e537a3c
Fix visual studio project files
|
10 anni fa |
 Jannick van Ballegooijen
|
eaeff6ed7d
normal smoothing
|
10 anni fa |
|
Kenneth van Ewijk
|
942b068851
Merge branch 'developer' into feature/Controller
|
10 anni fa |
|
Aaldert
|
eadfea9d63
Sound pointers worden gedelete
|
10 anni fa |
|
Kenneth van Ewijk
|
e848780535
Merge pull request #22 from CrystalPointA4/feature/gameplay
|
10 anni fa |
