Commit Graph

21 Commits

Author SHA1 Message Date
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Tleety 0bba9e40d4 Merge branch 'deffered_rendering' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into deffered_rendering
Conflicts:
	src/Renderer.cpp
2014-05-30 22:47:23 +02:00
Tleety 0e612cb3f3 Colors now working correcly. 2014-05-30 22:45:00 +02:00
Jace 6c8fff9ed0 Non-retardedly slow sprite rendering 2014-05-30 22:00:20 +02:00
Tleety 9ccf8ecc42 Fixed being able to draw sprites and normal/specular maps for terrain 2014-05-30 19:53:00 +02:00
Tleety cc84f04542 Transparent objects working. 2014-05-29 23:59:36 +02:00
Tleety eb37cc2296 Fixed blendmaps
Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-28 22:08:50 +02:00
Tleety 761b8e21e1 Added blendmap component
Added renderque for models with a blendmap component
Added shaders for blendmaps
2014-05-28 20:24:31 +02:00
Jace cc42b94000 Viewports fixed. Damage HUD. Free steering fixed. 2014-05-28 20:22:38 +02:00
Jace f813f8d2ca What is this I don't even *falls asleep* 2014-05-27 10:25:52 +02:00
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Jace 22442708cc One hell of a GUI interface (minus graphical)
"how does this even work lol"
2014-05-26 03:33:11 +02:00
Jace 07c74ff9f5 I'll create a GUI interface using Visual Basic, see if I can track an IP address 2014-05-25 04:12:28 +02:00
Jace 9723d80742 And then Microsoft happened... 2014-05-15 21:50:49 +02:00
Jace 6684aa06b7 Merge branch 'master' into gui
Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp
2014-05-15 21:16:43 +02:00
Jace d259811795 Xbox360 controller support 2014-05-13 02:24:42 +02:00
Jace ad19848c1b WIP ECS GUI 2014-05-12 22:33:59 +02:00
Jace 41177581c6 WIP Render Queue 2014-05-11 01:46:02 +02:00
Jace 9e8c3161e0 WIP Frame 2014-04-29 13:58:37 +02:00
Jace dfd9425473 WIP Frame 2014-04-23 02:19:17 +02:00
Jace 1e2f7fdd5c Skeleton MessageRelay 2014-04-22 19:15:02 +02:00