 Kenneth van Ewijk
|
b6b42b3afc
Merge remote-tracking branch 'origin/developer' into developer
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
e7c7dbaf39
bugfixes
|
9 vuotta sitten |
 Dofensmirtsz
|
ec76b4e754
Merge branch 'developer' into FireWorld
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
cfb8a7ada8
Merge remote-tracking branch 'origin/developer' into developer
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
42cffd796d
bugfix
|
9 vuotta sitten |
 Jannick van Ballegooijen
|
82acf0d9fc
ice world
|
9 vuotta sitten |
|
Dofensmirtsz
|
f6d7695405
Fire en Earth werkend
|
9 vuotta sitten |
 Remco
|
80f0c33b91
Merge branch 'developer' into feature/loadingscreen
|
9 vuotta sitten |
|
Remco
|
9f455be8d6
revert commit
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
5fc92d3f2a
Merge branch 'developer' into world/Building
|
9 vuotta sitten |
|
Remco
|
d1abc20f64
placed loadingscreen picture in json file of a world
|
9 vuotta sitten |
|
Remco
|
cdd3b962eb
texture in loadings screen
|
9 vuotta sitten |
 jancoow
|
5b6e7b54c7
Added enemy damage
|
9 vuotta sitten |
|
jancoow
|
27dfaf74c4
Better weapon alignment
|
9 vuotta sitten |
|
Remco
|
fea7728139
enemy hits player
|
9 vuotta sitten |
|
Remco
|
50e2b1c7ea
enemy weird xp gift fixed
|
9 vuotta sitten |
|
Remco
|
9192eb7371
see couting points of loading things
|
9 vuotta sitten |
|
Dofensmirtsz
|
6306e8abd4
Heightmap fix, texture fix, rotating crystals and enemy height to 0
|
9 vuotta sitten |
|
Remco
|
7edbcd4d4d
loadingscreen has been draw when loading a world
|
9 vuotta sitten |
|
jancoow
|
ba0482ee0a
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
0e99b9f719
Attempt fix rock world
|
9 vuotta sitten |
|
jancoow
|
e7163fc07c
Added controller cursor in menu
|
9 vuotta sitten |
 Aaldert
|
579a04a9b4
Merge branch 'developer' into musicInclude
|
9 vuotta sitten |
|
Aaldert
|
b09311d810
Merge branch 'developer' into musicInclude
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
3025fecf94
Load weapons from JSON
|
9 vuotta sitten |
|
Aaldert
|
9543dd8324
Muziek toegvoegt aan world en enemy
|
9 vuotta sitten |
|
jancoow
|
02a537dc60
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
9 vuotta sitten |
|
jancoow
|
4249e35653
Check if weapon collision point is inside enemy and do weapon damage
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
ec900f7410
Added health+damage to enemy
|
9 vuotta sitten |
|
Kenneth van Ewijk
|
4effce6fea
Merge branch 'developer' into feature/Controller
|
9 vuotta sitten |
