BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
158 Commits 15 Branches 0 Tags
b83de4471557bc2c021e2eebc005480ce5f03580
Commit Graph

70 Commits

Author SHA1 Message Date
Jace b83de44715 Working GUI Button 2015-09-25 01:29:14 +02:00
Jace e0b1747ca9 EventBroker::Clear renamed to Swap to cause less confusion 2015-09-25 01:29:13 +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
viktorljung bc6b037923 Added submarine pad 2015-09-24 20:54:57 +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 bbec676683 Merged master into LevelSystemAndSuch. Now let's see if it works. 2015-09-23 16:05:07 +02:00
PlatinumSkink edc25e59f0 Start of Rescaling 10:16 2015-09-23 15:59:48 +02:00
viktorljung 4e429bc48c Fixed remove ball bug 2015-09-23 15:55:50 +02:00
viktorljung af22c84066 removed the test box 2015-09-23 15:24:41 +02:00
viktorljung 08d653b0b0 Merge remote-tracking branch 'origin/master' into Physics 2015-09-23 15:14:16 +02:00
viktorljung 03e2078cfb Pad modifies ball path and ball facing its direction 2015-09-23 15:12:18 +02:00
PlatinumSkink f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
viktorljung 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-17 17:11:37 +02:00
viktorljung c0155b7900 collisions remade 2015-09-17 16:52:43 +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
viktorljung 442554812d Collisions kind of working 2015-09-17 14:11:09 +01: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
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
tleety 4891a4d939 Bricks are now models. Warning: Laggy 2015-09-15 17:56:23 +02:00
tleety ef9f6a296b Renderer working and some test blocks in the world 2015-09-15 17:38:16 +02:00
tleety f19f7bf56a Added a few models and removed ortho camera perspectiv. 2015-09-15 17:05:47 +02:00
Stiffly aec694359c Merge remote-tracking branch 'origin/master' into Sound 2015-09-15 16:09:42 +02:00
Stiffly 5695a8c068 Sound in game! Using OpenAL. NOWHERE TO RUN 2015-09-15 16:08:52 +02:00
viktorljung 8963e94cd6 pad moving with physics velocity 2015-09-15 14:27:35 +01:00
PlatinumSkink 4cb1a780c5 Merge branch 'LevelSystemAndSuch' 
Conflicts:
	include/Core/Engine.h
 2015-09-15 15:04:40 +02:00
tleety 376ff34694 Merged into master and uncommented ball 2015-09-15 14:59:48 +02:00
tleety eeca9ed50a Merge branch 'GLrenderer' 2015-09-15 14:54:45 +02:00
Jace b58cdc813d Revert "impulse list and velocity for physics" 
This reverts commit 2d7b32b7a3.
 2015-09-15 14:31:10 +02:00
PlatinumSkink ce878ac1db Lives kind of work, and so does the demo! 2015-09-15 13:35:04 +02:00
tleety c5bbcec5dc Transparancy now working for forward rendering 2015-09-15 13:20:01 +02:00
Stiffly ff00e2bf9c nothing works 2015-09-14 17:07:25 +02:00
viktorljung 2d7b32b7a3 impulse list and velocity for physics 2015-09-14 16:06:48 +01:00
tleety b9eda67a2a Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button. 2015-09-14 16:53:14 +02:00
viktorljung dfef1ec774 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	src/game/Physics/PhysicsSystem.cpp
 2015-09-14 15:37:38 +01:00
viktorljung c7704f62e9 fixed timestep working 2015-09-14 14:59:39 +01:00
PlatinumSkink 157fa36f68 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-14 15:41:04 +02:00
PlatinumSkink 8d1ad184a6 Modified the pad-and-ball collision code a bit. Hopefully for the better. 2015-09-14 15:39:39 +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
PlatinumSkink 1b9da2de1b Put back the out-commented line that broke it all. 2015-09-14 14:38:18 +02:00
tleety 7b984c7cc3 Merge into master 2015-09-11 15:17:49 +02:00
PlatinumSkink bda864ac11 Breakout Standard Screen 
Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.
 2015-09-11 15:07:00 +02:00
viktorljung 586f8d438c changed box size/scale 2015-09-11 11:04:22 +01:00
viktorljung 6932a22d7a Rotation right this time 2015-09-11 10:48:15 +01:00
tleety 9382acdb52 Added a few brick textures 2015-09-11 11:16:43 +02:00
PlatinumSkink ead7c6c754 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-11 10:51:52 +02:00
PlatinumSkink c829315598 Ball hitting bricks destroys bricks! We can PLAY! (kind of) 2015-09-11 10:50:49 +02:00
tleety c4c1158364 Working lights and deferred rendering 2015-09-10 23:48:45 +02:00
viktorljung 963e492f9c CircleShape 2015-09-10 22:24:19 +01:00