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

314 Commits

Author SHA1 Message Date
Pontus Fransson 5a3188d5f6 Network - NetworkServer, NetworkClient, Translator 
First version of the NetworkAPI. It should work.
 2013-12-11 21:45:43 +01:00
Pontus Fransson e06ee31754 Network - First basic API. 2013-12-10 08:32:08 +01:00
Pontus Fransson d27dcbe5b6 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-09 22:22:40 +01:00
Pontus Fransson 2cb8bbd8a9 Network - IServer running on separate thread. 
IServer accepting clients.
 2013-12-09 22:22:05 +01:00
dean11 9d264b0d89 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-09 14:24:12 +01:00
dean11 5473c5160f NETWORK - Modified the protocol creation structure 2013-12-09 14:23:30 +01:00
Pontus Fransson b72fb21b07 Network - Fixed all thread related crashes. 
The crashes was caused by OysterMutex, so i changed all OysterMutex to
std::mutex instead.
 2013-12-09 10:48:43 +01:00
Pontus Fransson a79dc61159 Network - Stuff 2013-12-08 23:56:17 +01:00
Pontus Fransson bbb79a4ba9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-06 10:46:05 +01:00
Pontus Fransson 5465ccf51a Network - Started implementing Server,client,session. 2013-12-06 10:45:53 +01:00
dean11 cb8fee9227 NETWORK - Added network custom protocol 2013-12-06 10:00:58 +01:00
Sam Mario Svensson cc793851af Network- set blocking mode 2013-12-04 14:59:00 +01:00
Pontus Fransson df1594a43b Network - Fixed small errors 2013-12-04 14:58:15 +01:00
Pontus Fransson e81062b875 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-04 12:41:37 +01:00
Pontus Fransson f0dff0b728 Network - Starting to implement correct shutdown connection. 2013-12-04 12:41:25 +01:00
Sam Mario Svensson 79cf9df111 Network - changed from & to smartpoints 2013-12-04 12:40:49 +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
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
Pontus Fransson d78b48319d Network - Added MessagePlayerPos 
Added MessagePlayerPos
Fixed bugg with adding float array.
 2013-12-03 11:46:46 +01:00
dean11 10c786b745 Update .gitignore 2013-11-29 21:23:05 +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
Sam Mario Svensson 3c681352da Documentation of the code done by Sam 2013-11-29 09:19:14 +01:00
Pontus Fransson 407f3c5c9a Added documentation and removed unecessesary code. 2013-11-29 09:11:30 +01:00
Linda Andersson d9fcec0c1c Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:05:12 +01:00
Linda Andersson 017efd55e5 GL starting commenting 2013-11-29 09:05:01 +01:00
Erik Persson 8138afb6b5 object update 2013-11-29 09:00:12 +01:00