Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
141 Commits 7 Branches 0 Tags
eaa6f9cd575c36b33d509b09dd6c14125bb442b1
Commit Graph
141 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 eaa6f9cd57 Hotfix rock world 2016-06-21 23:35:36 +02:00
kennyboy55 3cf6bf5857 Merge pull request #27 from CrystalPointA4/musicInclude 
Music include
 2016-06-21 20:03:56 +02:00
Aaldert 579a04a9b4 Merge branch 'developer' into musicInclude 
# Conflicts:
#	worlds/small.json
 2016-06-21 19:16:12 +02:00
Aaldert b09311d810 Merge branch 'developer' into musicInclude 
# Conflicts:
#	Enemy.cpp
#	World.cpp
 2016-06-21 19:06:50 +02:00
kennyboy55 d42ae6ccd3 Merge pull request #26 from CrystalPointA4/feature/weaponJSON 
Feature/weapon json
 2016-06-21 19:05:53 +02:00
kennyboy55 f80b513d90 Add weapon switching 2016-06-21 19:05:06 +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 ec900f7410 Added health+damage to enemy 2016-06-21 16:58:39 +02:00
kennyboy55 0a0fdfc8b1 Merge pull request #25 from CrystalPointA4/feature/Controller 
Feature/controller
 2016-06-21 15:44:43 +02:00
kennyboy55 4effce6fea Merge branch 'developer' into feature/Controller 2016-06-21 15:43:54 +02:00
kennyboy55 81cf7f43c0 Merge pull request #24 from CrystalPointA4/feature/normalsmoothing 
normal smoothing
 2016-06-21 15:42:39 +02:00
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
kennyboy55 ed3e537a3c Fix visual studio project files 2016-06-21 15:31:12 +02:00
Jannick van Ballegooijen eaeff6ed7d normal smoothing 2016-06-21 15:28:15 +02:00
kennyboy55 942b068851 Merge branch 'developer' into feature/Controller 
# Conflicts:
#	CrystalPoint.cpp
#	Player.cpp
 2016-06-21 15:14:08 +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
jancoow 36dc74a39e Fixed crash at startup, improved walking speed 2016-06-21 14:00:04 +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
jancoow 06a768a3a1 Fixed right weapon 2016-06-21 11:32:37 +02:00
jancoow 3f8623d0bf Merge remote-tracking branch 'origin/developer' into feature/Controller 
Added support for second controller
# Conflicts:
#	CrystalPoint.cpp
#	CrystalPoint.h
#	CrystalPoint.vcxproj
#	CrystalPoint.vcxproj.filters
 2016-06-21 11:24:55 +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
kennyboy55 83557c7ba7 Added controller code 2016-06-20 20:33:28 +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
kennyboy55 da0b1f5588 Johan fix 2016-06-20 17:16:29 +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