Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
181 Commits 7 Branches 0 Tags
92460b8ca47e331db34673d7a8350d834f282a9b
Commit Graph
76 Commits
Author SHA1 Message Date
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
Remco 9f455be8d6 revert commit 2016-06-22 02:00:30 +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
Remco cdd3b962eb texture in loadings screen 2016-06-22 01:40:53 +02:00
jancoow 5b6e7b54c7 Added enemy damage 2016-06-22 01:37:47 +02:00
jancoow 27dfaf74c4 Better weapon alignment 2016-06-22 00:32:19 +02:00
Remco fea7728139 enemy hits player 2016-06-22 00:26:43 +02:00
Remco 50e2b1c7ea enemy weird xp gift fixed 2016-06-21 23:44:32 +02:00
Remco 9192eb7371 see couting points of loading things 2016-06-21 23:38:33 +02:00
Dofensmirtsz 6306e8abd4 Heightmap fix, texture fix, rotating crystals and enemy height to 0 2016-06-21 23:31:43 +02:00
Remco 7edbcd4d4d loadingscreen has been draw when loading a world 2016-06-21 23:28:44 +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
jancoow e7163fc07c Added controller cursor in menu 2016-06-21 22:12:08 +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 3025fecf94 Load weapons from JSON 2016-06-21 18:25:16 +02:00
Aaldert 9543dd8324 Muziek toegvoegt aan world en enemy 2016-06-21 18:15:49 +02:00
jancoow 02a537dc60 Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision 2016-06-21 17:01:08 +02:00
jancoow 4249e35653 Check if weapon collision point is inside enemy and do weapon damage 2016-06-21 17:00:36 +02:00
kennyboy55 ec900f7410 Added health+damage to enemy 2016-06-21 16:58:39 +02:00
kennyboy55 4effce6fea Merge branch 'developer' into feature/Controller 2016-06-21 15:43:54 +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 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
Aaldert ea22712a45 Merge branch 'developer' into feature/gameplay 
# Conflicts:
#	CrystalPoint.cpp
 2016-06-21 14:06:41 +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 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 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
Aaldert 587b79044b Delete 2016-06-20 15:41:39 +02:00
Aaldert dba9c581b1 world aangepast 2016-06-20 15:33:07 +02:00
Aaldert b7d73c9abe Test 1 2016-06-20 13:43:13 +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
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 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