 kennyboy55
|
83240e2c57
|
More fixes
|
2016-06-22 03:18:13 +02:00 |
|
 jancoow
|
92460b8ca4
|
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
Feature/loadingscreen (reverted from commit 316d6c9e14)
|
2016-06-22 03:09:28 +02:00 |
|
 Dofensmirtsz
|
ec76b4e754
|
Merge branch 'developer' into FireWorld
# Conflicts:
# worlds/worlds.json
|
2016-06-22 02:57:01 +02:00 |
|
 Jannick van Ballegooijen
|
82acf0d9fc
|
ice world
|
2016-06-22 02:54:12 +02:00 |
|
|
Dofensmirtsz
|
f6d7695405
|
Fire en Earth werkend
|
2016-06-22 02:52:35 +02:00 |
|
 Remco
|
80f0c33b91
|
Merge branch 'developer' into feature/loadingscreen
# Conflicts:
# worlds/rock.json
|
2016-06-22 02:17:44 +02:00 |
|
|
kennyboy55
|
5fc92d3f2a
|
Merge branch 'developer' into world/Building
# Conflicts:
# World.cpp
# worlds/rock.json
|
2016-06-22 01:49:27 +02:00 |
|
|
Remco
|
d1abc20f64
|
placed loadingscreen picture in json file of a world
|
2016-06-22 01:48:00 +02:00 |
|
|
kennyboy55
|
5f31b2e602
|
Merge branch 'developer' into feature/weaponCollision
|
2016-06-22 00:49:05 +02:00 |
|
|
kennyboy55
|
342a56fa5a
|
Added audio
|
2016-06-22 00:47:02 +02:00 |
|
|
jancoow
|
27dfaf74c4
|
Better weapon alignment
|
2016-06-22 00:32:19 +02:00 |
|
|
Remco
|
5bff991b77
|
Merge branch 'developer' into feature/loadingscreen
|
2016-06-21 23:39:09 +02:00 |
|
|
kennyboy55
|
eaa6f9cd57
|
Hotfix rock world
|
2016-06-21 23:35:36 +02:00 |
|
|
Dofensmirtsz
|
6306e8abd4
|
Heightmap fix, texture fix, rotating crystals and enemy height to 0
|
2016-06-21 23:31:43 +02:00 |
|
|
Remco
|
d3bde622f0
|
menu placing right
|
2016-06-21 23:19:20 +02:00 |
|
|
jancoow
|
ba0482ee0a
|
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
Added waeponswitch to backbutton of controller
# Conflicts:
# Enemy.cpp
# Player.cpp
# Weapon.cpp
# Weapon.h
|
2016-06-21 23:10:58 +02:00 |
|
|
kennyboy55
|
0e99b9f719
|
Attempt fix rock world
|
2016-06-21 22:57:18 +02:00 |
|
 Aaldert
|
579a04a9b4
|
Merge branch 'developer' into musicInclude
# Conflicts:
# worlds/small.json
|
2016-06-21 19:16:12 +02:00 |
|
|
kennyboy55
|
3025fecf94
|
Load weapons from JSON
|
2016-06-21 18:25:16 +02:00 |
|
|
Aaldert
|
41a81d104e
|
Enemy stops geluid als gedood
|
2016-06-21 18:23:57 +02:00 |
|
|
Aaldert
|
9543dd8324
|
Muziek toegvoegt aan world en enemy
|
2016-06-21 18:15:49 +02:00 |
|
|
Aaldert
|
d56625e19a
|
MusicIncluded, crystals
|
2016-06-21 17:10:34 +02:00 |
|
|
kennyboy55
|
4437acb9f2
|
Added missing json
|
2016-06-21 17:06:57 +02:00 |
|
|
kennyboy55
|
8700aa90af
|
Bugfixes, added sound to portal and enemy in JSON
|
2016-06-21 13:51:16 +02:00 |
|
|
Aaldert
|
f93c09a999
|
rock heeft muziek
|
2016-06-20 15:48:57 +02:00 |
|
|
Aaldert
|
d5406120c6
|
Enemy speelt cow!
|
2016-06-20 15:30:38 +02:00 |
|
|
Aaldert
|
5c776e3d3a
|
Test
|
2016-06-20 14:53:40 +02:00 |
|
|
Aaldert
|
b7d73c9abe
|
Test 1
|
2016-06-20 13:43:13 +02:00 |
|
|
kennyboy55
|
ad30824057
|
Added Rock world. Updated others
|
2016-06-10 12:09:16 +02:00 |
|
|
kennyboy55
|
348b53c027
|
Added enemy -> brightness skybox
|
2016-06-10 11:55:57 +02:00 |
|
|
Remco
|
0ca94aef4d
|
when collected all crystals it is possible to move to the next level, by stepping in the portal
|
2016-06-10 10:56:54 +02:00 |
|
|
Remco
|
912a2234a3
|
crystals will be displayed, when not get with darker icons, when picked up crystals get colors
|
2016-06-09 17:47:34 +02:00 |
|
|
kennyboy55
|
0209c8b4e2
|
Merge pull request #14 from CrystalPointA4/feature/refactor_crystals
Feature/refactor crystals
|
2016-06-09 13:05:11 +02:00 |
|
|
kennyboy55
|
579e02728a
|
Merge branch 'developer' into feature/Skybox
# Conflicts:
# CrystalPoint.vcxproj.filters
# World.h
|
2016-06-09 13:03:28 +02:00 |
|
|
kennyboy55
|
af681b0223
|
Fixed color issues
|
2016-06-09 13:01:03 +02:00 |
|
|
Remco
|
3ed5331437
|
Merge branch 'developer' into feature/refactor_crystals
|
2016-06-09 12:41:53 +02:00 |
|
|
kennyboy55
|
a4373adc25
|
Fix image direction / load from JSON
|
2016-06-09 12:22:40 +02:00 |
|
|
Remco
|
1f3188376a
|
added new model for crystal, not possible to move through crystals
|
2016-06-09 12:07:27 +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 |
|
|
kennyboy55
|
1a4339b49d
|
Merge branch 'developer' into crystal_capturing
# Conflicts:
# World.cpp
# worlds/small.json
|
2016-06-09 10:34:33 +02:00 |
|
|
Remco
|
881b58138c
|
crystal displayed on interface, with fancy gradient and the most beautifull colors for the crystal :)
|
2016-06-08 13:08:14 +02:00 |
|
|
Remco
|
bba0a2e2a0
|
picking up crystal(sphere)
|
2016-06-08 12:41:33 +02:00 |
|
|
Aaldert
|
117010b9fe
|
OpenAl Werkt! en Setup enzo
|
2016-06-05 23:49:06 +02:00 |
|
|
Remco
|
293ceb0b9f
|
enemy walking around world
|
2016-06-03 13:58:07 +02:00 |
|
|
kennyboy55
|
95ab1879b4
|
Merge branch 'developer' into enemy
# Conflicts:
# CrystalPoint.cpp
# Entity.cpp
# Player.cpp
# Player.h
# World.cpp
# World.h
|
2016-06-03 11:30:19 +02:00 |
|
|
Remco
|
c3fe041eb1
|
enemy logic added to enemy and out of world
|
2016-06-03 11:09:48 +02:00 |
|
|
kennyboy55
|
1ade6002c1
|
Bugfix/performance improvement
|
2016-05-30 13:12:51 +02:00 |
|
|
kennyboy55
|
ae80c7a5bf
|
Add health/xp/level interface
|
2016-05-28 16:04:44 +02:00 |
|
|
kennyboy55
|
34ea491f39
|
Remove scale
|
2016-05-28 13:11:11 +02:00 |
|
|
kennyboy55
|
d83cc6403c
|
Spawn objects from file
|
2016-05-27 10:56:24 +02:00 |
|