Commit Graph

34 Commits

Author SHA1 Message Date
Stiffly a97dae542d Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
	src/game/Sound/SoundSystem.cpp
2015-09-28 18:14:06 +02:00
Stiffly f10749d220 Refactoring SoundSystem and its events, components 2015-09-28 17:59:57 +02:00
viktorljung cb48b881b7 cool fixes and stuff 2015-09-25 05:33:10 +02:00
viktorljung cfb6d1e4b5 Falling bricks and collision filters 2015-09-25 04:28:46 +02:00
viktorljung d2301594ce Gravity scale per entity 2015-09-25 00:01:24 +02:00
viktorljung e7806165b4 Merged Master into Sound. 2015-09-24 20:54:32 +02:00
PlatinumSkink 4e4ba29666 Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug. 2015-09-24 18:14:39 +02:00
PlatinumSkink 62b17e3dbf Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge. 2015-09-23 20:46:57 +02:00
PlatinumSkink edc25e59f0 Start of Rescaling 10:16 2015-09-23 15:59:48 +02:00
PlatinumSkink 1b0d87e862 Adjusted Power-Up Code 2015-09-23 14:23:41 +02:00
PlatinumSkink f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
PlatinumSkink dbb04c83af Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-21 13:27:54 +02:00
PlatinumSkink 761631c4a6 m-button is MultiBall powerup. Still needs fine-tuning. 2015-09-17 18:09:22 +02:00
Stiffly 4dd8ac8445 Added Component to bricks to emitt sound. Improved code for playing a sound 2015-09-17 15:41:08 +02:00
PlatinumSkink bc5a5e5e92 Adjusted model and position of displayed lives. 2015-09-16 16:49:52 +02:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety 825f6dc991 Models now get a standard normal and specular map if they dont have one 2015-09-16 16:09:20 +02:00
tleety 20fc1232d6 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 14:42:38 +02:00
PlatinumSkink 5ee5400a28 StyleGuide Fix 2015-09-15 18:48:26 +02:00
tleety 5e39ac3629 Added a low poly brick model and changed their ingame scale 2015-09-15 18:20:26 +02:00
tleety 4891a4d939 Bricks are now models. Warning: Laggy 2015-09-15 17:56:23 +02:00
PlatinumSkink c2d29b6110 Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed. 2015-09-15 17:31:22 +02:00
PlatinumSkink b340cf97bb I forgot to stage in my last commit. 2015-09-15 15:00:47 +02:00
PlatinumSkink ce878ac1db Lives kind of work, and so does the demo! 2015-09-15 13:35:04 +02:00
PlatinumSkink 9db15aa898 This is a safety commit on a working point because what I do next might crash everything. 2015-09-15 12:41:57 +02:00
PlatinumSkink 88bd96861d Tried to implement lives. Failed. Everything crashes if I try to RemoveEntity in Update. 2015-09-15 12:40:23 +02:00
PlatinumSkink c829315598 Ball hitting bricks destroys bricks! We can PLAY! (kind of) 2015-09-11 10:50:49 +02:00
PlatinumSkink e0bc28092a Adjusted size to new scale. 2015-09-10 22:56:23 +02:00
PlatinumSkink 1d94338214 Added CBall 2015-09-10 21:46:03 +02:00
PlatinumSkink a047e46fe9 Kod för boll mot bricka kollision 2015-09-10 21:30:39 +02:00
PlatinumSkink 16c5d2a40f Made a Stage! Imported PlaceHolder Graphics! 2015-09-10 21:06:21 +02:00
PlatinumSkink 6a81751e56 WIP Level System + Pad 2015-09-10 20:28:48 +02:00
PlatinumSkink 84577cb2c8 Created CPad and PadSystem. Doesn't do very much. 2015-09-10 16:40:49 +02:00
PlatinumSkink 5d753babe6 I developed a LevelSystem class, along with a CBrick component for use in it and an EStageCleared event that is triggered upon all the bricks being removed.
The class currently creates a 8x8 grid of entities with Transform components.
2015-09-09 21:10:10 +02:00