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

115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tleety fa198cf953 Water now rendered in forward rendering 2015-09-24 23:21:46 +02:00
tleety ef3591ba46 Water threshhold added, now it's actually waterlike 2015-09-24 16:23:57 +02:00
tleety a1215d71e9 Water now blurred and looking kinda water like 2015-09-24 16:10:13 +02:00
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
tleety 692e0ca9df Fixed a bug where models normal and specular maps is not loaded. 2015-09-17 14:37:00 +02:00
PlatinumSkink bc5a5e5e92 Adjusted model and position of displayed lives. 2015-09-16 16:49:52 +02:00
PlatinumSkink bdba34e8e1 Reset ball is also octopus. 2015-09-16 16:35:41 +02:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety c311408346 Ball size fix 2015-09-16 16:23:59 +02:00
tleety a5ffce8db8 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 16:17:39 +02:00
tleety 12273f66af Ball size fix 2015-09-16 16:17:02 +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
Jace 12dc837f51 Tests for entity cloning 2015-09-16 15:26:40 +02:00
Jace 9396f9391f Tests for EventBroker 2015-09-16 15:26:30 +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
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
tleety ef9f6a296b Renderer working and some test blocks in the world 2015-09-15 17:38:16 +02:00
PlatinumSkink 990f31d120 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-15 17:32:34 +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
Jace e31f5e054e Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-15 17:11:35 +02:00
Jace 884fee9f13 Updated style guide 2015-09-15 17:11:18 +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
PlatinumSkink b340cf97bb I forgot to stage in my last commit. 2015-09-15 15:00:47 +02:00
PlatinumSkink d06cd54c2a Created ELifeLost event. It works. 2015-09-15 15:00:12 +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
PlatinumSkink c6c3602aae Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-15 14:36:41 +02:00
PlatinumSkink d3d24876bb Something. 2015-09-15 14:32:42 +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
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
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