Commit Graph

27 Commits

Author SHA1 Message Date
Jace b83de44715 Working GUI Button 2015-09-25 01:29:14 +02:00
Jace 1d500eb4f6 First iteration of GUI code. GUI is rendered on top of everything, world still separate. 2015-09-25 01:29:13 +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 f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
Stiffly 3f4ede4b7d OpenAL fixed. CMake path set correctly. 2015-09-22 14:32:04 +02:00
Stiffly 6671136a08 Made a Sound folder. Rename class Sound to SoundSystem.
Also awesome Cmakeness.
2015-09-17 14:42:33 +02:00
Stiffly 953be0cda9 Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
	include/Core/Engine.h
2015-09-17 13:18:56 +02:00
PlatinumSkink bdba34e8e1 Reset ball is also octopus. 2015-09-16 16:35:41 +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
Stiffly aec694359c Merge remote-tracking branch 'origin/master' into Sound 2015-09-15 16:09:42 +02:00
PlatinumSkink b340cf97bb I forgot to stage in my last commit. 2015-09-15 15:00:47 +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
Stiffly 760574f454 Merge remote-tracking branch 'origin/master' into Sound
Conflicts:
	include/Core/Engine.h
	src/game/CMakeLists.txt
2015-09-14 14:54:41 +02:00
Stiffly ed5881ec54 Linking OpenAL. 2015-09-14 14:45:44 +02:00
viktorljung 963e492f9c CircleShape 2015-09-10 22:24:19 +01:00
viktorljung 9bf0ca0e46 ContactListener and contact events 2015-09-10 21:25:34 +01:00
viktorljung a98806d551 Make box on entity commit 2015-09-10 16:27:14 +01:00
viktorljung ce342f695f Base PhysicsSystem. 2015-09-09 20:46:04 +01:00
viktorljung 0535d35628 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-09 18:04:35 +01:00
viktorljung 67f7a30ca6 Liquidfun links 2015-09-09 18:04:17 +01:00
Jace 1ce46cc06b Added 'Game' subfolder for gameplay related source files 2015-09-09 16:36:55 +02:00
Jace 8833377855 Semi-working Linux build 2015-09-08 21:47:10 +02:00
Jace 17a00fef85 Working bgfx renderer base on Windows 2015-09-08 20:36:03 +02:00
Jace c24b039005 Semi-working base for bgfx renderer 2015-09-08 16:13:59 +02:00
Jace c7f17c8ef0 Added bgfx library, precompiled for linux-gcc-64 2015-09-07 17:41:50 +02:00
Jace 7c92b6aef7 Working build with CMake 3.3.1 2015-09-04 14:08:07 +02:00
Jace 98e363eda6 Initial structure 2015-09-04 10:02:06 +02:00