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

28 Commits

Author SHA1 Message Date
Dander7BD 779b2ee00c More merge conflicts untanglement 2014-02-27 11:46:58 +01:00
Dander7BD 96cb865242 Merge remote-tracking branch 'origin/New-inputsystem' into PlayerRunEdits 
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
	Code/Game/GameLogic/GameAPI.h
	Code/Game/GameLogic/Player.cpp
	Code/Game/GameLogic/Player.h
	Code/Game/GameServer/GameSession.h
	Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp
	Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h
 2014-02-27 11:18:16 +01:00
Dander7BD f1e6a1c897 Merge fixes 
Warning! Possibility that code were lost during this merge.
Please oh please do check what branch you are in before you edit files.
 2014-02-27 10:46:30 +01:00
Linda Andersson 5a74f5368f Added collision and weapon events and send them to client 2014-02-27 10:24:37 +01:00
Linda Andersson 5620a3c517 Added eventfunctions for PlayerAction and PickupEvent 2014-02-27 10:07:07 +01:00
Linda Andersson 13d6a062fc Added collision and weapon events and send them to client 2014-02-26 10:05:07 +01:00
Linda Andersson b8395e9af7 Added eventfunctions for PlayerAction and PickupEvent 2014-02-25 14:35:27 +01:00
Linda Andersson f56323ee01 Merge with affectedByTag. Sending killer ID 2014-02-25 12:12:24 +01:00
lindaandersson 22f52150d5 Sending dmg, respawn and dead from player to client 2014-02-21 15:42:09 +01:00
Dander7BD 7ece3b62a0 Changed Player_Look protocol to Player_LeftTurn 2014-02-19 13:42:57 +01:00
dean11 e00ddb30c9 Fixed server-client communication 2014-02-18 13:12:08 +01:00
dean11 cec2740896 GameServer - Fixed minor miss with inheritance 2014-02-18 11:56:36 +01:00
dean11 f6f183d6e7 GameServer - Added inititiate protocols 2014-02-18 11:34:24 +01:00
Dennis Andersen 5b4758d2ae Broekn 2014-02-18 08:55:38 +01:00
Dennis Andersen b834f1fb9b GameServer - Merged with GameServer 2014-02-15 22:33:40 +01:00
Dennis Andersen 359c208f57 GameServer - Some minor changes 2014-02-15 09:29:54 +01:00
dean11 3274727923 GameServer - Added more gameplay protocols and structured the old mess 2014-02-11 10:21:47 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Dennis Andersen de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect 2014-02-04 16:07:10 +01:00
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +01:00
lindaandersson d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 11:13:42 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
lindaandersson a249e7ede9 GL - merge with new serverAPI 2014-01-30 10:57:44 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +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
Renamed from Code/Game/DanBiasServer/GameSession/GameSession.h (Browse further)