 jancoow
|
0431e9c230
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
vor 10 Jahren |
|
jancoow
|
d14f045708
Added dead check
|
vor 10 Jahren |
 Kenneth van Ewijk
|
4437acb9f2
Added missing json
|
vor 10 Jahren |
|
jancoow
|
02a537dc60
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
vor 10 Jahren |
|
jancoow
|
4249e35653
Check if weapon collision point is inside enemy and do weapon damage
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
ec900f7410
Added health+damage to enemy
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
0a0fdfc8b1
Merge pull request #25 from CrystalPointA4/feature/Controller
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
4effce6fea
Merge branch 'developer' into feature/Controller
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
81cf7f43c0
Merge pull request #24 from CrystalPointA4/feature/normalsmoothing
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
58ac7d13cf
Merge pull request #23 from CrystalPointA4/feature/soundsystemfix
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
c91bb5c656
attempt fix
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
ed3e537a3c
Fix visual studio project files
|
vor 10 Jahren |
 Jannick van Ballegooijen
|
eaeff6ed7d
normal smoothing
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
942b068851
Merge branch 'developer' into feature/Controller
|
vor 10 Jahren |
 Aaldert
|
eadfea9d63
Sound pointers worden gedelete
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
e848780535
Merge pull request #22 from CrystalPointA4/feature/gameplay
|
vor 10 Jahren |
|
Aaldert
|
ea22712a45
Merge branch 'developer' into feature/gameplay
|
vor 10 Jahren |
|
jancoow
|
36dc74a39e
Fixed crash at startup, improved walking speed
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
6096e53d94
Merge pull request #21 from CrystalPointA4/feature/Sounds
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
8700aa90af
Bugfixes, added sound to portal and enemy in JSON
|
vor 10 Jahren |
|
Aaldert
|
35c21260e4
Hp, Lvl en Xp gameplay toegevoegt
|
vor 10 Jahren |
|
jancoow
|
06a768a3a1
Fixed right weapon
|
vor 10 Jahren |
|
jancoow
|
3f8623d0bf
Merge remote-tracking branch 'origin/developer' into feature/Controller
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
7c4805d899
Merge pull request #18 from CrystalPointA4/feature/Menu
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
e42779f6c7
Fixed project files
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
ce2f658b61
Merge branch 'developer' into feature/Menu
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
3701918ac9
Bugfix
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
d887328907
Merge pull request #19 from CrystalPointA4/feature/werkendewav
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
8cf1b02cf7
Merge branch 'developer' into feature/werkendewav
|
vor 10 Jahren |
|
Kenneth van Ewijk
|
83557c7ba7
Added controller code
|
vor 10 Jahren |
