 kennyboy55
|
6bcd9b1426
|
Merge pull request #15 from CrystalPointA4/feature/Skybox
Feature/skybox
|
2016-06-09 13:04:19 +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 |
|
|
kennyboy55
|
0aad7262d6
|
Merge pull request #13 from CrystalPointA4/feature/OpenAL
Feature/OpenAL
|
2016-06-09 12:38:09 +02:00 |
|
|
kennyboy55
|
9659caa1d8
|
Fix filters
|
2016-06-09 12:32:13 +02:00 |
|
|
kennyboy55
|
a4373adc25
|
Fix image direction / load from JSON
|
2016-06-09 12:22:40 +02:00 |
|
|
kennyboy55
|
69561794d8
|
Reimplemented into newer develop version
|
2016-06-09 12:01:24 +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
|
593b9547cf
|
Merge pull request #12 from CrystalPointA4/crystal_capturing
Crystal capturing
|
2016-06-09 10:34:49 +02:00 |
|
|
kennyboy55
|
1a4339b49d
|
Merge branch 'developer' into crystal_capturing
# Conflicts:
# World.cpp
# worlds/small.json
|
2016-06-09 10:34:33 +02:00 |
|
|
kennyboy55
|
2c624ac4c7
|
Merge pull request #11 from CrystalPointA4/enemy
Enemy
|
2016-06-09 10:27:24 +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 |
|
|
Aaldert
|
47b4d9570d
|
Music Handler
|
2016-06-05 17:25:04 +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
|
293ceb0b9f
|
enemy walking around world
|
2016-06-03 13:58:07 +02:00 |
|
|
Remco
|
b827885f40
|
enemy collide logic in enemy and out of world
|
2016-06-03 13:51:54 +02:00 |
|
|
kennyboy55
|
527394f635
|
Merge pull request #10 from CrystalPointA4/enemy
Enemy
|
2016-06-03 11:31:33 +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 |
|
|
kennyboy55
|
95febc136f
|
Merge pull request #9 from CrystalPointA4/feature/interface
Feature/interface
|
2016-06-03 11:14:46 +02:00 |
|
|
kennyboy55
|
b4a2da4b88
|
Merge pull request #8 from CrystalPointA4/worldLoading
Added world loading and other various improvements
|
2016-06-03 11:12:23 +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 |
|
|
Daniel
|
f0a8330819
|
Werkt, maar loopt vast
|
2016-05-30 12:46:49 +02:00 |
|
|
Daniel
|
a80fc69043
|
.wav file toegevoegt
|
2016-05-30 11:59:36 +02:00 |
|
|
Daniel
|
0c73b5a586
|
Settings aangepast, als het goed is zit het er nu volledig in
|
2016-05-30 11:58:34 +02:00 |
|
|
Daniel
|
b53bcac528
|
OpenAL Test
|
2016-05-30 11:04:09 +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 |
|
|
kennyboy55
|
1c59a3bc6f
|
Fix player height (not working with scale)
|
2016-05-26 18:53:36 +02:00 |
|
|
kennyboy55
|
2b0e22d4c9
|
Added height at location
|
2016-05-26 17:06:34 +02:00 |
|
|
kennyboy55
|
4c613b606a
|
Implemented getHeight
|
2016-05-26 13:21:14 +02:00 |
|
|
kennyboy55
|
56e174ae2f
|
Lord and Savior Johan
|
2016-05-26 12:53:22 +02:00 |
|
|
kennyboy55
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +02:00 |
|
|
kennyboy55
|
33a61ca2ed
|
Merge pull request #7 from CrystalPointA4/enemy
Enemy collision and tracking
|
2016-05-25 13:44:26 +02:00 |
|
|
Remco
|
b2fa0bc028
|
Merge branch 'developer' into enemy
# Conflicts:
# World.h
# worlds/world1.json
|
2016-05-25 13:42:02 +02:00 |
|
|
Remco
|
cf124b3f38
|
enemy collison added, no jittering anymore
|
2016-05-25 13:38:13 +02:00 |
|
|
kennyboy55
|
0b6096d3e8
|
Merge pull request #6 from CrystalPointA4/array-rendering
Implement optimised array rendering
|
2016-05-25 12:56:17 +02:00 |
|
|
kennyboy55
|
84fcc346a9
|
Implement optimised array rendering
|
2016-05-25 12:44:24 +02:00 |
|
|
kennyboy55
|
fe1aa7220e
|
Merge pull request #5 from CrystalPointA4/heightmap
Heightmap implemented
|
2016-05-25 11:53:02 +02:00 |
|
|
Remco
|
d739141b25
|
enemys always looking at you when you are the target
|
2016-05-25 11:46:22 +02:00 |
|
|
kennyboy55
|
2a6cc0fd87
|
Fix missing Vertex
|
2016-05-25 11:44:13 +02:00 |
|
|
kennyboy55
|
965b54c901
|
Added heightmap
|
2016-05-25 11:31:37 +02:00 |
|
 jancoow
|
e7a7cc5588
|
Fixed capital letters and string return error..
|
2016-05-23 12:34:55 +02:00 |
|
|
Remco
|
9d3cfa7e2a
|
Merge branch 'developer' into johan
# Conflicts:
# World.cpp
# worlds/world1.json
|
2016-05-23 10:34:21 +02:00 |
|
|
Janco Kock
|
47c228205a
|
Merge pull request #3 from CrystalPointA4/johan_linuxrefactor
Johan linuxrefactor
|
2016-05-23 10:00:59 +02:00 |
|
|
kennyboy55
|
b1aa61d5f0
|
Fix cmath issue
|
2016-05-23 10:00:31 +02:00 |
|