BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
286 Commits 15 Branches 0 Tags
f5f6a5cf3ab5c563bde97455c9ee1b59ba42eeec
Commit Graph

67 Commits

Author SHA1 Message Date
Tleety f5f6a5cf3a Fixed transparency 2014-06-02 22:15:52 +02:00
Stiffly 349fab54a4 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 17:37:25 +02:00
Jace 72420d4248 WIP Fullscreen Stuff (UI not scaling properly yet) 2014-06-01 03:05:42 +02:00
Stiffly 756107363e Some pretty darn cool explosions 2014-06-01 01:15:53 +02:00
Tleety 2d1d4f02f3 Fixed some things in gameworld and added a new skymap. 2014-05-31 23:14:33 +02:00
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +02:00
Jace a6906886f5 Vehicle selection! 2014-05-31 03:45:37 +02:00
Tleety a459a1c69b Skybox bugfix 2014-05-31 02:03:50 +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 7b622d530b No shadows and no skybox. 2014-05-27 08:35:39 +02:00
Jace 98167a806d Merge remote-tracking branch 'origin/deffered_rendering' into render_queue 
Conflicts:
	src/Renderer.cpp
	src/Renderer.h
 2014-05-27 07:10:50 +02:00
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Tleety 2db52ded2f Direction light working. 
Cleaned up some code in Renderer.cpp
 2014-05-27 03:09:52 +02:00
Jace 74239300bd Merge commit 'e3aab96a750d6e5d6f8ff42ffdb5a23a47ab929d' into render_queue 
Conflicts:
	assets
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	src/Systems/RenderSystem.cpp
 2014-05-26 04:21:08 +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
Tleety 7d82c43df9 Started work on blend maps 2014-05-26 01:08:10 +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
Tleety e3aab96a75 Fixed forward rendering for transparensy 2014-05-25 01:52:57 +02:00
Tleety a9f2911e41 Shadows working, and looking totaly not shit. 
Improved location of the shadowmap to always be infront of the camera.
 2014-05-23 22:42:11 +02:00
Tleety dbad1ee7f5 Work done on light and shadows. 2014-05-21 16:51:05 +02:00
Tleety e414087816 Some work done on lights and normals and other buggs/fixes 2014-05-20 03:33:42 +02:00
Tleety 82d5953c97 Specular maps working. 2014-05-19 21:36:28 +02:00
Jace bd7ba73bca Split screen working 2014-05-19 17:20:43 +02:00
Jace e07a0a2b1a More viewport stuff 2014-05-19 04:29:30 +02:00
Jace 3023391358 Merge remote-tracking branch 'origin/deffered_rendering' into gui 
Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-19 03:15:40 +02:00
Tleety 7455f4b865 NormalMaps Working and started work on specular maps. 2014-05-19 01:01:46 +02:00
Tleety 67778f391a Working on shadows 2014-05-17 18:02:10 +02:00
Jace bafa8d0a5d Merge remote-tracking branch 'origin/deffered_rendering' 
Conflicts:
	assets
	src/Components/PointLight.h
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-13 04:07:24 +02:00
Tleety ccd1393dac Fixed some shadow buggs. 2014-05-12 23:02:19 +02:00
Stiffly 19a2879104 Emitter childed to a wheel. BUG FIXED: Billboarding calculation. 2014-05-12 22:21:27 +02:00
Tleety 4639a6e4c3 Working shadows, however ugly they are. 2014-05-12 18:03:39 +02:00
Stiffly e0b5b72454 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-12 13:55:48 +02:00
Tleety d9ca9ac1f7 Removed unused code. 2014-05-11 01:09:06 +02:00
Tleety 37a8af6b65 Added being able to change attenuation in real time 2014-05-11 01:05:22 +02:00
Tleety 22d855a521 Fixed attenuation for lights. 2014-05-11 00:02:34 +02:00
Tleety c1c30b0019 Fixed lights and added a bad gamma correction 2014-05-10 19:51:48 +02:00
Tleety 6e3ba0f077 Merge remote-tracking branch 'origin/master' into deffered_rendering 2014-05-10 17:45:01 +02:00
Tleety 1268b3d8fd Removed Unused code in renderer 2014-05-10 17:44:55 +02:00
Jace 62ca923821 Defucked defucked rendering 2014-05-07 22:34:38 +02:00
Stiffly 1a365bf069 Billboarding on sprites 2014-05-07 21:34:19 +02:00
Tleety b1b60bce61 WIP 2014-05-07 14:23:01 +00:00
Jace 7c18d0c778 Merge branch 'master' into gui 2014-05-06 18:08:32 +02:00