 Remco
|
9f455be8d6
|
revert commit
|
2016-06-22 02:00:30 +02:00 |
|
|
Remco
|
fea7728139
|
enemy hits player
|
2016-06-22 00:26:43 +02:00 |
|
 jancoow
|
d14f045708
|
Added dead check
|
2016-06-21 17:07:19 +02:00 |
|
|
jancoow
|
02a537dc60
|
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
2016-06-21 17:01:08 +02:00 |
|
|
jancoow
|
4249e35653
|
Check if weapon collision point is inside enemy and do weapon damage
|
2016-06-21 17:00:36 +02:00 |
|
 kennyboy55
|
ec900f7410
|
Added health+damage to enemy
|
2016-06-21 16:58:39 +02:00 |
|
 Aaldert
|
ea22712a45
|
Merge branch 'developer' into feature/gameplay
# Conflicts:
# CrystalPoint.cpp
|
2016-06-21 14:06:41 +02:00 |
|
|
kennyboy55
|
8700aa90af
|
Bugfixes, added sound to portal and enemy in JSON
|
2016-06-21 13:51:16 +02:00 |
|
|
Aaldert
|
35c21260e4
|
Hp, Lvl en Xp gameplay toegevoegt
|
2016-06-21 12:25:38 +02:00 |
|
|
Aaldert
|
d5406120c6
|
Enemy speelt cow!
|
2016-06-20 15:30:38 +02:00 |
|
|
kennyboy55
|
348b53c027
|
Added enemy -> brightness skybox
|
2016-06-10 11:55:57 +02:00 |
|
|
Aaldert
|
5c24a34202
|
Merge branch 'developer' into feature/OpenAL
# Conflicts:
# CrystalPoint.vcxproj.filters
# Enemy.cpp
# Enemy.h
# worlds/small.json
|
2016-06-09 11:44:45 +02:00 |
|
|
Aaldert
|
117010b9fe
|
OpenAl Werkt! en Setup enzo
|
2016-06-05 23:49:06 +02:00 |
|
|
Aaldert
|
0f8fd67dd3
|
Merge remote-tracking branch 'refs/remotes/origin/developer' into feature/OpenAL
# Conflicts:
# CrystalPoint.vcxproj.filters
# Enemy.h
|
2016-06-05 16:06:48 +02:00 |
|
|
Aaldert
|
0afbca8ffc
|
More Generalized
|
2016-06-05 15:26:14 +02:00 |
|
|
Remco
|
b827885f40
|
enemy collide logic in enemy and out of world
|
2016-06-03 13:51:54 +02:00 |
|
|
Remco
|
c3fe041eb1
|
enemy logic added to enemy and out of world
|
2016-06-03 11:09:48 +02:00 |
|
|
kennyboy55
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +02:00 |
|
|
Remco
|
d01efecb0e
|
enemy comes to you when in his radius
|
2016-05-23 08:48:23 +02:00 |
|
|
kennyboy55
|
7c4ee37867
|
Johan is love, Johan is life
|
2016-05-19 14:25:03 +02:00 |
|
|
kennyboy55
|
049fb28ffc
|
Added more structure, added abstraction to existing parts
|
2016-05-11 12:37:18 +02:00 |
|