Commit Graph

30 Commits

Author SHA1 Message Date
tleety 55232a4ec2 water radius now changeable in config file, also improved the look of the water 2015-10-19 14:50:26 +02:00
Jace a35d72cac3 Working skeletal animations!!! 2015-10-15 12:48:28 +02:00
PlatinumSkink 36d0601dfd Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad. 2015-10-13 17:28:31 +02:00
Jace 7f344263da Merge branch 'master' into gui
Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp
2015-10-08 23:47:25 +02:00
Jace c91cb1c3b7 Fixed GUI color fading in renderer 2015-10-08 21:49:45 +02:00
Stiffly 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +02:00
Stiffly 8b12c1036d Partycles. 2015-10-06 21:42:54 +02:00
tleety 52dec86925 Particle system up and running, but with bugged rendering 2015-10-01 14:14:51 +02:00
tleety 2491dd8b74 Fixed some things, code up to styleguide 2015-09-30 10:29:56 +02:00
tleety 38d3a8c990 Fixed a bug where you could not have more than one particle group 2015-09-29 10:27:57 +02:00
Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui
Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp
2015-09-25 02:27:00 +02:00
tleety effc9ff781 Merge and some small fixes 2015-09-25 01:49:08 +02:00
Jace 5f1963b8bc Complete main menu without event bindings. 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
tleety fa198cf953 Water now rendered in forward rendering 2015-09-24 23:21:46 +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 692e0ca9df Fixed a bug where models normal and specular maps is not loaded. 2015-09-17 14:37:00 +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 f19f7bf56a Added a few models and removed ortho camera perspectiv. 2015-09-15 17:05:47 +02:00
tleety c5bbcec5dc Transparancy now working for forward rendering 2015-09-15 13:20:01 +02: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
tleety c4c1158364 Working lights and deferred rendering 2015-09-10 23:48:45 +02:00
tleety f97112bb20 Backbone to deferred rendering started 2015-09-10 22:39:03 +02:00
tleety c0589563af Base lightrendering started, still some work to be done. 2015-09-10 22:13:37 +02:00
tleety 1e67bfb103 Sprite ACTUALLY rendered as unitquad now. 2015-09-10 18:32:50 +02:00
tleety 58931e29b3 Sprites are now rendered on unitQuads instead of ScreenQuads 2015-09-10 17:45:26 +02:00
Jace 54bed28327 Working sprite rendering. Removed bone transforms for now. 2015-09-10 16:23:24 +02:00
Jace 98e363eda6 Initial structure 2015-09-04 10:02:06 +02:00