BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
924 Commits 116 Branches 0 Tags
94b59af973e0ad7551e8c5b092825d5b1c766724
Commit Graph

54 Commits

Author SHA1 Message Date
Tleety 94b59af973 Defender shield should now be working 2016-02-08 11:47:35 +01:00
Tleety c526a7af55 WIP stencil stuff 2016-02-04 17:58:36 +01:00
Tleety 7c582898f4 Working stencil buffer for the shield. 2016-02-04 14:33:39 +01:00
Tleety 379d211832 some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate 2016-02-04 11:13:26 +01:00
Tleety bc01e147c2 Some state stuff, some draw stuff, some QA map stuff 2016-02-03 18:09:44 +01:00
Tleety 7ffbd8455f Added Queues for the models with shield and shielded components. 2016-02-03 13:53:57 +01:00
Tleety 8299b99e2f Test world changes and some other small fixes 2016-02-01 19:08:46 +01:00
Tleety c708f1582c Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-01 18:30:30 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
Jace be3cfef65f Merge remote-tracking branch 'origin/master' into EditorUsefulness 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-01 16:00:46 +01:00
Jace a22bc00d46 *cough* 2016-02-01 13:37:51 +01:00
Tleety 7054822be2 SceneLight component now working 2016-02-01 11:12:03 +01:00
Tleety 0e70dc6fa3 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 15:41:31 +01:00
Tleety 44302bb0f3 Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component 2016-01-27 15:38:54 +01:00
Tleety a954cbbf50 Normal map support 2016-01-27 13:52:27 +01:00
Jace 0334ec3fa7 Merge remote-tracking branch 'origin/Animations' 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/WeaponSystem.cpp
 2016-01-27 13:36:49 +01:00
Tleety 8102f3a2ea Working transparency in most common cases. 
Transparency check is automatically set if the alpha color value is under 1
 2016-01-27 12:59:44 +01:00
Tleety cbb17d22d4 WIP 2016-01-27 12:10:00 +01:00
Jace 7e12d00874 Merge branch 'master' into CoolDeathAnimation 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 10:43:23 +01:00
viktorljung d12246833e Some further small fizes to resolution //Tobias 2016-01-25 01:26:41 +01:00
stiffly 44baa47bba Merge remote-tracking branch 'origin/master' into CoolDeathAnimation 
# Conflicts:
#	include/Engine/Common.h
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
 2016-01-25 01:21:15 +01:00
Jace b95c1fdfa4 Merge remote-tracking branch 'origin/Menu' 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Game/Game.cpp
 2016-01-25 00:25:03 +01:00
viktorljung 6aeb281249 Resolution fix in render stages //Tobias 2016-01-25 00:07:17 +01:00
viktorljung ada1bac2a7 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-24 20:48:17 +01:00
viktorljung 8cf9caf7aa AnimationSystem working 2016-01-24 18:31:23 +01:00
antc13 96a735c542 Changed .obj to .mesh for all meshes. 2016-01-24 16:12:31 +01:00
antc13 666f1fd878 Removed temp variables & the "forced" animation in DrawFinalPass 2016-01-24 15:30:20 +01:00
antc13 4c5d17b203 Merge remote-tracking branch 'origin/master' into Importer 
# Conflicts:
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Network/Server.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestHardCodedTestWorld.h
#	src/Tests/ResourceManagerTest.cpp
 2016-01-24 14:40:52 +01:00
antc13 8286d052b3 Changed color values from floats to glm::vec4 2016-01-24 14:38:17 +01:00
antc13 b5b1140f5c Custom Animations should now work. We also save color values if there's no texture. 2016-01-24 13:28:40 +01:00
antc13 3baa988ad4 Changed .obj files to our own format. DummyScene.mesh may be broken. 2016-01-23 20:35:58 +01:00
viktorljung fcba0a28b8 Merge branch 'master' into Menu 2016-01-23 18:27:48 +01:00
viktorljung 160b7183b2 WIP 2016-01-23 18:07:07 +01:00
antc13 f1835fd89c Animations PROBABLY works fine if all joints got keyframes. 2016-01-23 18:02:42 +01:00
viktorljung ff6ec82a6c AMD fix 2016-01-23 16:27:01 +01:00
viktorljung aacfc47fb5 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-01-23 15:12:19 +01:00
viktorljung 680a12d88f HealthMeter 2016-01-23 14:53:17 +01:00
Tleety f623232a2b Removed a temp variable. 2016-01-23 14:52:29 +01:00
Tleety b499f4b020 Fixed some rendering bugs and some code refactoring 2016-01-23 12:17:38 +01:00
Tleety 7498cebf5e Merge remote-tracking branch 'origin/master' into Forward+ 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPassState.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp
 2016-01-22 15:57:38 +01:00
Tleety 2b8debbfff Added MipMap texture generation 2016-01-22 15:55:32 +01:00
viktorljung 254caf9e5d Picking depthbuffer fix 2016-01-21 16:49:20 +01:00
Ayumiwii 382e00cff4 Randomness fixed 
Redundant continue removed
Redundant cross product removed
 2016-01-21 15:34:08 +01:00
Tleety afe43c5f44 Shader will now handle Glowmaps. However the load code is not there yet. 2016-01-21 14:53:47 +01:00
Tleety 86824f1b1f Colors above value 1 is now added to the bloomtexture, and will be used to get a glow effect in later stage. 2016-01-20 15:23:49 +01:00
Tleety 78a1037983 WIP 
DrawScreenQuad implemented and working.
Started work on HDR coloring.
 2016-01-20 13:34:56 +01:00
antc13 3826142e94 Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah! 2016-01-19 17:40:34 +01:00
Ayumiwii 77e1dacb6f Merge 2016-01-19 09:58:52 +01:00
Jace 4786986abd Rendering pipeline fixes across the board and base work on refactored editor 2016-01-17 06:29:25 +01:00
Tleety 3de853ac8b Frustum culling now works correctly for all resolutions 2016-01-15 15:38:14 +01:00