Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
118 Commits 7 Branches 0 Tags
58ac7d13cf0b0ab9d927ef65b43059f00471011b
Commit Graph
118 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 58ac7d13cf Merge pull request #23 from CrystalPointA4/feature/soundsystemfix 
Sound pointers worden gedelete
 2016-06-21 15:42:09 +02:00
kennyboy55 c91bb5c656 attempt fix 2016-06-21 15:41:42 +02:00
Aaldert eadfea9d63 Sound pointers worden gedelete 2016-06-21 14:45:41 +02:00
kennyboy55 e848780535 Merge pull request #22 from CrystalPointA4/feature/gameplay 
Feature/gameplay
 2016-06-21 14:17:13 +02:00
Aaldert ea22712a45 Merge branch 'developer' into feature/gameplay 
# Conflicts:
#	CrystalPoint.cpp
 2016-06-21 14:06:41 +02:00
kennyboy55 6096e53d94 Merge pull request #21 from CrystalPointA4/feature/Sounds 
Bugfixes, added sound to portal and enemy in JSON
 2016-06-21 13:53:30 +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
kennyboy55 7c4805d899 Merge pull request #18 from CrystalPointA4/feature/Menu 
Feature/menu
 2016-06-20 20:43:00 +02:00
kennyboy55 e42779f6c7 Fixed project files 2016-06-20 20:42:35 +02:00
kennyboy55 ce2f658b61 Merge branch 'developer' into feature/Menu 2016-06-20 20:39:00 +02:00
kennyboy55 3701918ac9 Bugfix 2016-06-20 20:38:56 +02:00
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
Remco e081373a45 Merge branch 'developer' into feature/Menu 
# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Main.cpp
#	Skybox.cpp
#	Skybox.h
 2016-06-20 15:23:55 +02:00
Remco 98f3645b6b menu pauses game, able to resume the game. exit game by pause menu 2016-06-20 15:20:12 +02:00
Aaldert 5c776e3d3a Test 2016-06-20 14:53:40 +02:00
Remco 03c06e0974 delete action pointer 2016-06-20 13:44:02 +02:00
Aaldert b7d73c9abe Test 1 2016-06-20 13:43:13 +02:00
Remco 7758f2c294 able to give button a funtion pointer, who will be called when clicked on the button 2016-06-20 13:42:28 +02:00
Remco 2e50d11e07 able to click with cursor, button detect clicking event 2016-06-20 13:29:28 +02:00
Remco 1ec3c8f346 buttons shows when ever the cursor is in the button 2016-06-20 12:50:51 +02:00
Remco 8dcee70324 button, text is placed in middle of button, plane is placed behind text 2016-06-20 12:38:16 +02:00
Remco 6cf9437620 button is draw by menu 2016-06-20 12:11:24 +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
kennyboy55 ced3ff4462 Attempt implement menu (unresolved symbol error) 2016-06-09 17:56:37 +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