Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97 Commits 7 Branches 0 Tags
d8873289076b57e99eb4edf312c5cb30d168263e
Commit Graph
97 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 d887328907 Merge pull request #19 from CrystalPointA4/feature/werkendewav 
Feature/werkendewav
 2016-06-20 20:37:14 +02:00
kennyboy55 8cf1b02cf7 Merge branch 'developer' into feature/werkendewav 2016-06-20 20:34:35 +02:00
Janco Kock 779cf5cb91 Merge pull request #20 from CrystalPointA4/linux_refactor 
Working version for linux
 2016-06-20 20:11:10 +02:00
jancoow 030a136e8b Working version for linux 2016-06-20 20:00:58 +02:00
Aaldert f93c09a999 rock heeft muziek 2016-06-20 15:48:57 +02:00
Aaldert 587b79044b Delete 2016-06-20 15:41:39 +02:00
Aaldert dba9c581b1 world aangepast 2016-06-20 15:33:07 +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 f84fcfa4e2 Merge pull request #17 from CrystalPointA4/worlds 
Added Rock world. Updated others
 2016-06-10 12:10:28 +02:00
kennyboy55 ad30824057 Added Rock world. Updated others 2016-06-10 12:09:16 +02:00
kennyboy55 04fd3ac0e3 Skybox brightness hotfix 2016-06-10 11:59:43 +02:00
kennyboy55 31c11f3e1f Merge pull request #16 from CrystalPointA4/feature/portal_logic 
Feature/portal logic
 2016-06-10 11:56:52 +02:00
kennyboy55 656a904a4b Merge remote-tracking branch 'origin/feature/portal_logic' into feature/portal_logic 2016-06-10 11:56:17 +02:00
kennyboy55 348b53c027 Added enemy -> brightness skybox 2016-06-10 11:55:57 +02:00
Remco 71801a30f2 player crystals refresh 2016-06-10 11:06:39 +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 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
Remco 3ed5331437 Merge branch 'developer' into feature/refactor_crystals 2016-06-09 12:41:53 +02:00
kennyboy55 0aad7262d6 Merge pull request #13 from CrystalPointA4/feature/OpenAL 
Feature/OpenAL
 2016-06-09 12:38:09 +02:00
Remco 9cfaf07eba optimiasted crystal, entity now has a collide methode, which will be called when an entity collison has with the player. 2016-06-09 12:35:00 +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
Remco 1f3188376a added new model for crystal, not possible to move through crystals 2016-06-09 12:07:27 +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
Remco 1164501158 added variables for crystal icons in interface class 2016-06-09 11:12:15 +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