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

1523 Commits

Author SHA1 Message Date
Dander7BD 080bbf68fd Collideables fixed 
Missing returns
 2013-12-04 11:42:11 +01:00
dean11 b35ffdecfd GameLogic - Merged with DanbiasGame project 2013-12-04 11:40:22 +01:00
dean11 64a8089e54 GameLogic - Worked on server 2013-12-04 11:37:26 +01:00
Linda Andersson e658071643 GL- open a red window from lancher project 2013-12-04 11:32:43 +01:00
Dander7BD 1d94ed0ddc Fixed MomentOfInertia methods 2013-12-04 11:30:56 +01:00
Dander7BD f10f3b0bef Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-04 10:05:02 +01:00
Dander7BD 87e9d137ea Merge remote-tracking branch 'origin/Graphics' into Physics 2013-12-04 09:58:11 +01:00
lanariel 47aa2c89a2 Quick Error fix and using .png 2013-12-04 09:56:03 +01:00
Robin Engman f2548c43ce Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-04 09:52:03 +01:00
Robin Engman b03e9af027 Fixed octree and API 
Rewrote AddObject function in octree and OnPossibleCollision in
PhysocsAPI_Impl
 2013-12-04 09:51:48 +01:00
lanariel ce294cd1d7 Forgot to add a folder 2013-12-04 09:43:43 +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
Pontus Fransson df1470eb2c Network - Send/Recv both ways. 
Impl: SetBlockingMode() : Connection.
Impl: Resize() : OysterByte.
Remade Clear() : OysterByte.
Added bool return if FetchMessage() succeded or failed : PostBox.
Fixed a few errors with mutex on ThreadedClient.
Added missing mutex unlock in ThreadSafeQueue.
 2013-12-03 23:12:48 +01:00
Dander7BD e4476f7757 Added function for ICustomBody 
void ICustomBody::SetMomentum( const ::Oyster::Math::Float3 &worldG )
- Added and implemented
 2013-12-03 15:11:24 +01:00
Pontus Fransson e837b80e43 Network - Fixed warning, made functions private. 
Fixed warnings.
Made functions regarding the thread private in listener.
 2013-12-03 13:20:50 +01:00
Sam Mario Svensson 1466c0db31 Network - projectfile fix 2013-12-03 13:16:44 +01:00
Sam Mario Svensson aa19002cbe Merge branch 'Network' of https://github.com/dean11/Danbias into Network 
Conflicts:
	Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
 2013-12-03 13:12:17 +01:00
Sam Mario Svensson 10c1dc57f3 merge fix 2013-12-03 13:08:04 +01:00
Sam Mario Svensson aa4cf634d3 Client interface and class for both server and client. now using postbox system 2013-12-03 13:04:53 +01:00
dean11 3d973c16a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-03 12:09:22 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00
Linda Andersson 804c5df7a9 GL uppdate game test progam for physics 2013-12-03 11:47:04 +01:00
Pontus Fransson d78b48319d Network - Added MessagePlayerPos 
Added MessagePlayerPos
Fixed bugg with adding float array.
 2013-12-03 11:46:46 +01:00
Robin Engman 0a0e327d71 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-12-03 11:31:24 +01:00
dean11 f0b766e37c Something done in misc 2013-12-02 14:43:57 +01:00
dean11 997dfe2984 Update .gitignore 2013-11-29 21:23:59 +01:00
dean11 10c786b745 Update .gitignore 2013-11-29 21:23:05 +01:00
dean11 11d6313099 Update .gitignore 2013-11-29 20:59:11 +01:00
dean11 afd7652b6e Update .gitignore 2013-11-29 20:58:53 +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
Linda Andersson 2ca3cdd705 merge with sprint branch - working 2013-11-29 10:13:18 +01:00
Linda Andersson 4cb82e6396 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 10:04:59 +01:00
Linda Andersson 7a663b2e16 GL - camera movement working 2013-11-29 10:04:44 +01:00
Erik Persson f31bf1db5f some fixing 2013-11-29 10:03:32 +01:00
Dander7BD 026b427deb Implemented a temporary collision test update 
Will only call the subscribed CollisioEventAction whenevera collision is
detected.
 2013-11-29 10:00:07 +01:00
Robin Engman 1a06c7c7e6 Changed from pointer to reference 
Did it in sample and visit functions
 2013-11-29 10:00:06 +01:00
Robin Engman c31ea9730b Added overloads for visitor and sample functions 
They now have an overload for accepting ICollideable
 2013-11-29 10:00:05 +01:00
Dander7BD 5d5f684ad6 minor compilation error fix 
Forgot that UniquePointer had a special operator for checking if it is
not NULL >.<
 2013-11-29 10:00:04 +01:00
Dander7BD ec7185f463 Bunch of implementations 2013-11-29 10:00:03 +01:00
Pontus Fransson 10f8df45a8 Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Network 2013-11-29 09:36:31 +01:00
Erik Persson f9a1aaf43c Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:26:16 +01:00
Erik Persson b28a558732 fix transpose 2013-11-29 09:24:41 +01:00
Linda Andersson 04e48ec550 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:23:42 +01:00
dean11 de01d23d1d Fixed some structure issues and commented 2013-11-29 09:23:08 +01:00
Linda Andersson eb026cb9c7 GL more comments 2013-11-29 09:23:00 +01:00
Erik Persson 32c529feb6 converted camera class 2013-11-29 09:20:37 +01:00