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

130 Commits

Author SHA1 Message Date
Erik Persson b753387649 asd 2014-01-31 14:14:20 +01:00
Pontus Fransson d6769ac62f Misc - EventHandler, EventCollection 2014-01-31 13:06:11 +01:00
Pontus Fransson 8ee8374169 Misc - EventHandler 2014-01-31 11:28:01 +01:00
Dennis Andersen cac38decca MISC - Fixed a bug in ResourceLoader 2014-01-31 11:00:04 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Sam Mario Svensson 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic 2014-01-30 13:44:18 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
Pontus Fransson 51a1b3ecff GL - Resource get size 2014-01-27 13:55:05 +01:00
Sam Mario Svensson 1748fe323a GL - Added Parsing functions for levelLoader and moved Packing classes to misc 2014-01-27 10:15:39 +01:00
lindaandersson 6cf5ed3a22 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic 2014-01-21 14:58:08 +01:00
Dennis Andersen 50c09547f3 GameServer - Added protocols and stuff 2014-01-21 14:32:42 +01:00
Dennis Andersen f7f59e8ac8 GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client 2014-01-21 09:52:48 +01:00
Dander7BD 2ec8662a83 Utility::Value::Clamp 2014-01-20 18:46:08 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
Dennis Andersen ceac5ce31d Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic 2014-01-15 11:03:25 +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
Dennis Andersen a02a32c029 Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder 2014-01-09 14:18:01 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
Dennis Andersen ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 15d6ac8cf9 GameLogic - Final sprint2 merge 2013-12-20 09:42:02 +01:00
Dennis Andersen d68fd63b25 Added server launcher 2013-12-19 13:35:56 +01:00
Dennis Andersen beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Dennis Andersen 8721224d7c GameLogic - Added alot of functionality to Game related parts 2013-12-18 13:07:10 +01:00
Dennis Andersen 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
dean11 ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient 2013-12-16 11:05:24 +01:00
dean11 7cda07507a GameLogic - Pre merge with Netowkr 2013-12-16 09:50:23 +01:00
dean11 f29f50f830 Merged with Gamelogic branch and fixed errors and added features 2013-12-14 22:04:42 +01:00
dean11 8b1c2b91e8 Fixed some craches and stuff 2013-12-13 23:47:16 +01:00
dean11 42fa756866 GameLogic - Merge with util fixed 2013-12-12 14:29:56 +01:00
dean11 693b9df928 Some wierd stuff is going on here 2013-12-12 12:54:08 +01:00
dean11 d95d771c43 Network - Merged with Gamelogic 2013-12-10 14:00:20 +01:00
dean11 226bbcc8af MISC - Added a release feature in smartpointers 2013-12-09 22:55:22 +01:00
Pontus Fransson 2cb8bbd8a9 Network - IServer running on separate thread. 
IServer accepting clients.
 2013-12-09 22:22:05 +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
dean11 597891acfe Misc - Added more fetures to Smart pointers 2013-12-06 11:46:47 +01:00
lanariel fb51881fab Fixed Mem leaks on gpu and start on deffered pipeline 2013-12-05 14:56:34 +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
dean11 f0b766e37c Something done in misc 2013-12-02 14:43:57 +01:00
dean11 c0807442a4 Fixed some minor errors with project linking 2013-11-29 11:04:52 +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
Pontus Fransson 10f8df45a8 Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Network 2013-11-29 09:36:31 +01:00
dean11 de01d23d1d Fixed some structure issues and commented 2013-11-29 09:23:08 +01:00
Sam Mario Svensson 3c681352da Documentation of the code done by Sam 2013-11-29 09:19:14 +01:00
dean11 a3ae340a30 Merge after pull from misc branch 2013-11-28 23:22:50 +01:00
dean11 f5aa5d03db Modified project file to include Thread in misc 2013-11-28 23:18:48 +01:00
Dander7BD 9d92b292d9 Improved documentation of UniquePointer and UniqueArray 2013-11-28 16:18:20 +01:00
Pontus Fransson 1453d81a9d Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 16:15:41 +01:00
Pontus Fransson 1617606145 PostBox 
Created PostBox and IPostBox.
Listener post new clients to PostBox.
 2013-11-28 16:15:28 +01:00
Sam Mario Svensson 23fa090296 Threadsafe Queue implemented with IQueue interface 
threadsafe by using mutex lock in the Queue
 2013-11-28 16:14:59 +01:00
Dander7BD 036519f3f6 Fixed potential ambiguity bug 
Ambiguity in assignment operator with UniquePointer and UniqueArray
 2013-11-28 16:06:01 +01:00
Dander7BD 045cfe28fe Renamed Utilities-InlineImpl.h to Utilities-Impl.h 
Implied that only Inlines were implemented there.
Contains template implementations as well.
 2013-11-28 15:45:09 +01:00
dean11 0785e54dfd Removed .orig files after merge 2013-11-28 15:19:52 +01:00
dean11 6e71b6ac54 Fixed merging errors 2013-11-28 15:17:25 +01:00
dean11 cc4835a97b Merge with Physics branch 2013-11-28 15:09:09 +01:00
Dander7BD d241298308 merging MiscBranch into Physics with conflict fixes 2013-11-28 14:52:13 +01:00
lanariel 9bf84cdc65 Stable Graphics, hard coded texture read in ObjReader.ToModel 2013-11-28 14:34:52 +01:00
dean11 d08644e8e1 Added a force reload feture in resource loading 2013-11-28 13:43:11 +01:00
Dander7BD 64565b50de Merge remote-tracking branch 'origin/GameLogicBranch' into Physics 2013-11-28 11:59:15 +01:00
Dander7BD 23d3af21c6 Added comparison operators to UniquePointer and UniqueArray 
operator ==
operator !=
 2013-11-28 11:15:25 +01:00
dean11 5eec570768 Added an atomic<int> to the reference counter for thread saftey 2013-11-27 22:39:49 +01:00
dean11 fe7fd6b0b3 Fixed bugs in the threading wrapper 2013-11-27 21:47:32 +01:00
dean11 972cfa0d39 Fixed bugs with custom loading 2013-11-27 21:12:37 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +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
dean11 48c812b033 Forgot to follow coding standard... 2013-11-26 21:51:40 +01:00
dean11 e4904870b3 Added a threading wrapper with basic functionality that needs real testing 2013-11-26 21:08:34 +01:00
lanariel f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
lanariel c2484a363d Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics 2013-11-26 13:43:33 +01:00
dean11 1f27336b3f Added filename paramater in custom load function 2013-11-26 12:09:38 +01:00
dean11 e5cef4895e Added support for custom loading, unloading and reloading 2013-11-26 10:55:51 +01:00
Linda Andersson f78027a1cf dll - working 
fix in unique pointer and array - missing copy constructor
 2013-11-26 09:16:51 +01:00
Dander7BD 6ac4254b9d Documentations 
PhysicsAPI mostly documented.
Namespace MomentOFInertia and ICustomBody still not documented
 2013-11-25 08:57:47 +01:00
dean11 15455db1b2 Added a resource handler with basic byte loading 2013-11-22 10:46:25 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00