 Aaldert
|
b09311d810
Merge branch 'developer' into musicInclude
|
9 rokov pred |
 Kenneth van Ewijk
|
3025fecf94
Load weapons from JSON
|
9 rokov pred |
|
Aaldert
|
9543dd8324
Muziek toegvoegt aan world en enemy
|
9 rokov pred |
 jancoow
|
02a537dc60
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
9 rokov pred |
|
jancoow
|
4249e35653
Check if weapon collision point is inside enemy and do weapon damage
|
9 rokov pred |
|
Kenneth van Ewijk
|
ec900f7410
Added health+damage to enemy
|
9 rokov pred |
|
Kenneth van Ewijk
|
4effce6fea
Merge branch 'developer' into feature/Controller
|
9 rokov pred |
|
Kenneth van Ewijk
|
58ac7d13cf
Merge pull request #23 from CrystalPointA4/feature/soundsystemfix
|
9 rokov pred |
|
Kenneth van Ewijk
|
942b068851
Merge branch 'developer' into feature/Controller
|
9 rokov pred |
|
Aaldert
|
eadfea9d63
Sound pointers worden gedelete
|
9 rokov pred |
|
Aaldert
|
ea22712a45
Merge branch 'developer' into feature/gameplay
|
9 rokov pred |
|
Kenneth van Ewijk
|
8700aa90af
Bugfixes, added sound to portal and enemy in JSON
|
9 rokov pred |
|
Aaldert
|
35c21260e4
Hp, Lvl en Xp gameplay toegevoegt
|
9 rokov pred |
|
jancoow
|
3f8623d0bf
Merge remote-tracking branch 'origin/developer' into feature/Controller
|
9 rokov pred |
|
Kenneth van Ewijk
|
ce2f658b61
Merge branch 'developer' into feature/Menu
|
9 rokov pred |
|
Kenneth van Ewijk
|
3701918ac9
Bugfix
|
9 rokov pred |
|
Aaldert
|
587b79044b
Delete
|
9 rokov pred |
|
Aaldert
|
dba9c581b1
world aangepast
|
9 rokov pred |
|
Aaldert
|
b7d73c9abe
Test 1
|
9 rokov pred |
|
Kenneth van Ewijk
|
348b53c027
Added enemy -> brightness skybox
|
9 rokov pred |
 Remco
|
0ca94aef4d
when collected all crystals it is possible to move to the next level, by stepping in the portal
|
9 rokov pred |
|
Remco
|
912a2234a3
crystals will be displayed, when not get with darker icons, when picked up crystals get colors
|
9 rokov pred |
|
Kenneth van Ewijk
|
0209c8b4e2
Merge pull request #14 from CrystalPointA4/feature/refactor_crystals
|
9 rokov pred |
|
Kenneth van Ewijk
|
579e02728a
Merge branch 'developer' into feature/Skybox
|
9 rokov pred |
|
Kenneth van Ewijk
|
af681b0223
Fixed color issues
|
9 rokov pred |
|
Remco
|
3ed5331437
Merge branch 'developer' into feature/refactor_crystals
|
9 rokov pred |
|
Remco
|
9cfaf07eba
optimiasted crystal, entity now has a collide methode, which will be called when an entity collison has with the player.
|
9 rokov pred |
|
Kenneth van Ewijk
|
a4373adc25
Fix image direction / load from JSON
|
9 rokov pred |
|
Remco
|
1f3188376a
added new model for crystal, not possible to move through crystals
|
9 rokov pred |
|
Kenneth van Ewijk
|
69561794d8
Reimplemented into newer develop version
|
9 rokov pred |
