NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
790 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

56 Commits

Author SHA1 Message Date
Erik Persson 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/GameLogic/Game.cpp
 2014-01-31 09:17:54 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dennis Andersen 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
lanariel 893934dcf4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/Tester/MainTest.cpp
 2014-01-17 09:07:42 +01:00
lanariel ab0b9a925a /Graphics Fixed stable pipeline with no warnings 2014-01-17 09:05:18 +01:00
bladdidoo 61b8baed1b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
	Code/Tester/MainTest.cpp
 2014-01-17 08:58:49 +01:00
bladdidoo c48f640cdf Loading .Dan geometry and material 2014-01-17 08:51:12 +01:00
lindaandersson a070e4d459 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-16 09:30:30 +01:00
lanariel 483236801f Fixed compile warnings and crash on non existing models 2014-01-16 09:30:01 +01:00
Dennis Andersen 82de85d1ac Fixed minor server network bug, modified shader to get visual 2014-01-14 10:15:50 +01:00
Dennis Andersen 844aa37906 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer 2014-01-14 09:25:39 +01:00
Dennis Andersen ce89e6bc98 GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions 2014-01-13 12:44:33 +01:00
Dander7BD c39e2fe791 Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct 
Conflicts:
	Bin/Content/Shaders/LightPass.cso
	Code/GamePhysics/PhysicsStructs-Impl.h
 2014-01-09 11:03:25 +01:00
lanariel 0a3d68a407 Small bug fix and include new SSAO shader 2014-01-09 01:08:49 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
Tobias Grundel 855860d454 Gravity struct 
Unions are the devil's work, but now there's GravityWell, Directed and
DirectedField structs implemented in PhysicsStructs
 2013-12-19 14:30:16 +01:00
lanariel 341e33ee78 Rebased Lights to Use World Coordinates 2013-12-18 20:36:41 +01:00
lanariel 3139585e7b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl
	Code/Tester/MainTest.cpp
 2013-12-18 20:29:24 +01:00
lanariel 718b1ade2b Proper Lighting, supports Multiple Lights 2013-12-18 20:28:06 +01:00
Dennis 6f48e6a13a Deffered Render Update 2013-12-17 14:49:45 +01:00
lanariel fb51881fab Fixed Mem leaks on gpu and start on deffered pipeline 2013-12-05 14:56:34 +01:00
lanariel 47aa2c89a2 Quick Error fix and using .png 2013-12-04 09:56:03 +01:00
lanariel d03f1eaf44 Merge to sprint2 2013-12-04 09:42:52 +01:00
lanariel f29af8b8bd Release Now Stable 2013-12-04 09:36:43 +01:00
dean11 c0807442a4 Fixed some minor errors with project linking 2013-11-29 11:04:52 +01:00
lanariel 07a616b252 Correct VertexShader 2013-11-29 10:44:04 +01:00
lanariel 469ccaab6c Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Bin/DLL/DebugCameraVertex.cso
	Bin/DLL/DebugPixel.cso
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Bin/DLL/OysterGraphics_x86D.dll
	Bin/DLL/OysterGraphics_x86D.exp
	Bin/DLL/OysterGraphics_x86D.ilk
	Bin/DLL/OysterGraphics_x86D.pdb
	Bin/DLL/TextureDebug.cso
	Bin/DLL/VertexGatherData.cso
	Code/OysterGraphics/FileLoader/ObjReader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.cpp
	Code/OysterGraphics/FileLoader/TextureLoader.h
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/Render/Resources/Resources.cpp
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl
	Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl
	Code/Tester/MainTest.cpp
 2013-11-29 10:31:19 +01:00
lanariel ca20a5af9e Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
lanariel 9bf84cdc65 Stable Graphics, hard coded texture read in ObjReader.ToModel 2013-11-28 14:34:52 +01:00
Erik Persson acd8681489 asd 2013-11-28 08:33:29 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +01:00
Erik Persson 2ce74e74cc fix 2013-11-27 09:14:44 +01:00
Erik Persson 61777e23df Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 
Conflicts:
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
 2013-11-27 09:12:21 +01:00
lanariel f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
lanariel 2de2ef9cd0 Pre merge Commit 2013-11-26 13:44:58 +01:00
lanariel 973aadac2d Engine tweaks + DefferedVertexDefinition 2013-11-26 09:09:35 +01:00
lanariel abed0157ec Do fix during weekend; Non stable 2013-11-22 15:18:52 +01:00
lanariel 328e4777ce Started to wrap into dll 2013-11-22 14:09:47 +01:00
lanariel 59dcbc9729 Fixed Projection 2013-11-22 10:55:21 +01:00
lanariel 5abaef6e86 Fixed render errors 2013-11-21 23:54:12 +01:00
lanariel ff1695497f Debug From Home 2013-11-21 18:31:16 +01:00
lanariel b419849fd4 Merged Obj and Engine Restructure 2013-11-21 14:17:03 +01:00
lanariel 9a0206bf35 More 2013-11-21 14:14:30 +01:00
lanariel 7b31377be8 Engine Sructured 2013-11-21 13:50:43 +01:00
Tobias Grundel f08e9491ed ObjReader 2013-11-21 13:45:11 +01:00
Tobias Grundel ddbc808977 Re-fixed ObjReader 2013-11-21 12:47:47 +01:00
Linda Andersson 2408bf49a1 projectfiles 2013-11-21 12:31:31 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00