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

64 Commits

Author SHA1 Message Date
tleety d473e3711c Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water. 2015-09-23 18:01:15 +02:00
tleety 8e2eb63c5e Added renderQueue for water and created buffers for the water to use. 2015-09-23 12:07:28 +02:00
tleety 94401a10ee Water working, might not work for several bodies 2015-09-22 16:06:47 +02:00
tleety 1e70e151ee Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it. 2015-09-21 16:00:20 +02:00
tleety b32934dba6 Merge remote-tracking branch 'origin/physics' into water 
# Conflicts:
#	include/Core/Engine.h
#	include/Physics/PhysicsSystem.h
#	src/game/Game/PadSystem.cpp
#	src/game/Physics/PhysicsSystem.cpp
 2015-09-17 17:37:58 +02:00
tleety b69413d9c9 Base water set up 2015-09-17 17:35:17 +02:00
viktorljung 442554812d Collisions kind of working 2015-09-17 14:11:09 +01:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety a5ffce8db8 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 16:17:39 +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
PlatinumSkink 8f513e3281 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 15:49:36 +02:00
tleety 20fc1232d6 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 14:42:38 +02:00
Jace 4cfa0ef624 Fixed event broker unsubscribe bug where event relay would still think it belonged to a broker after unsubscribed 2015-09-16 12:54:34 +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
PlatinumSkink 0f96baedfa Merge branch 'master' into LevelSystemAndSuch 2015-09-15 17:31:53 +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
tleety f19f7bf56a Added a few models and removed ortho camera perspectiv. 2015-09-15 17:05:47 +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
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
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
PlatinumSkink 62d9ba1422 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-10 22:57:20 +02:00
PlatinumSkink 9867327f7f Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 
Conflicts:
	include/Core/Engine.h
 2015-09-10 22:44:44 +02:00
tleety f97112bb20 Backbone to deferred rendering started 2015-09-10 22:39:03 +02:00
viktorljung 9bf0ca0e46 ContactListener and contact events 2015-09-10 21:25:34 +01:00
tleety 9a381e84af Merge remote-tracking branch 'origin/master' into GLrenderer 
# Conflicts:
#	include/Core/Engine.h
 2015-09-10 22:16:15 +02:00
tleety c0589563af Base lightrendering started, still some work to be done. 2015-09-10 22:13:37 +02:00
PlatinumSkink 6a81751e56 WIP Level System + Pad 2015-09-10 20:28:48 +02:00
viktorljung da0e80b167 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
 2015-09-10 18:16:09 +01:00
viktorljung 0983d76444 Working rotations and positions 2015-09-10 18:12:15 +01:00