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

826 Commits

Author SHA1 Message Date
Pontus Fransson 49cfbbebd5 Network - Changed to CustomProtocolObject on send. 2013-12-12 10:32:43 +01:00
Erik Persson c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic 
Conflicts:
	Bin/Content/Shaders/TextureDebug.cso
 2013-12-12 10:10:52 +01:00
Robin Engman c740bd5935 Added some data to PhysicsAPI 
GetRigidLinearVelocity() and void* as reference to game object.
 2013-12-12 10:02:35 +01:00
Erik Persson 2424b51c3e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Bin/Content/Shaders/DebugVertex.cso
 2013-12-12 09:39:27 +01:00
dean11 0adb831f7a Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-12 09:36:30 +01:00
Erik Persson e11d7d94f7 updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
dean11 fd3776a53b GameLogic - Pre-network merge 2013-12-12 09:33:59 +01:00
Pontus Fransson 04436258a5 Network - Non-blocking 2013-12-12 09:24:57 +01:00
Pontus Fransson bbe59836da Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-11 21:45:51 +01:00
Pontus Fransson 5a3188d5f6 Network - NetworkServer, NetworkClient, Translator 
First version of the NetworkAPI. It should work.
 2013-12-11 21:45:43 +01:00
Linda Andersson 22665bc44b GL - started using network and protocols for sending/recieveing 2013-12-11 12:14:00 +01:00
Linda Andersson bb789faa67 GL - merge with network - fixed dependencies in launcher project 2013-12-11 09:00:36 +01:00
dean11 d95d771c43 Network - Merged with Gamelogic 2013-12-10 14:00:20 +01:00
dean11 eb0b5ec0ee Network - Removing old gamelogic stuff before replacing them with new stuff 2013-12-10 13:38:25 +01:00
Linda Andersson 465ea1bd19 GL - soleved merge errors in project files 2013-12-10 11:50:35 +01:00
Linda Andersson 78f20e04a1 GL - moved object files to Obj 2013-12-10 11:27:20 +01:00
Linda Andersson f0181ad9f4 GL - fixed defines in headers - more structure for states 2013-12-10 11:26:18 +01:00
Erik Persson 4b9f2671bf updated weapon 2013-12-10 11:17:25 +01:00
Erik Persson 58c3371edd Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-10 09:57:13 +01:00
Erik Persson 97e0b1298a added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
Pontus Fransson e06ee31754 Network - First basic API. 2013-12-10 08:32:08 +01:00
dean11 226bbcc8af MISC - Added a release feature in smartpointers 2013-12-09 22:55:22 +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
Linda Andersson 1f172b422a Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-09 12:05:30 +01:00
Linda Andersson ea593743ad GL - added UI object 2013-12-09 12:01:36 +01:00
dean11 a45ffb2e40 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-09 11:58:44 +01:00
dean11 fbd95a7109 GAMELOGIC - Added a protocol api 2013-12-09 11:57:34 +01:00
Linda Andersson 4134836405 GL - added client objects 
-  no memory leaks in client
 2013-12-09 11:05:47 +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
Linda Andersson 5416df6d86 Merge remote-tracking branch 'origin/GameLogic' into GameLogic 2013-12-09 09:24:01 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +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
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
Linda Andersson b331ce1a1f GL - started working with client application 2013-12-06 10:38:43 +01:00
dean11 cb8fee9227 NETWORK - Added network custom protocol 2013-12-06 10:00:58 +01:00
Dander7BD 5835a72acc Setstruct introduction done 
Can be found as:
Physics::Struct::CustomBodyState
Physics::ICustomBody::State
Is all inline thus no expensive API calls, as intended.
Will be expanded to move API call methods from Physics::ICustomBody to
it.
 2013-12-06 09:46:30 +01:00
lanariel fb51881fab Fixed Mem leaks on gpu and start on deffered pipeline 2013-12-05 14:56:34 +01:00
Erik Persson 63addde51e made "interfaces" of most classes 2013-12-05 11:50:39 +01:00
dean11 1cb880a66e GameLogic - Fixed the window class 2013-12-04 15:59:44 +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
Dander7BD d0936f9133 InverseRotationMatrix fixed 
Compiler overstepping its bound, doing whatever it wants.
 2013-12-04 14:22:25 +01:00
Dander7BD 7ad60969fc Sphere Vs Box collision detect fix 
second ed. ... Works now! :3
 2013-12-04 14:12:06 +01:00
Dander7BD e0adc0ae93 Sphere Vs Box collision detect fix 2013-12-04 13:52:07 +01:00
Pontus Fransson e81062b875 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-12-04 12:41:37 +01:00