Commit Graph

34 Commits

Author SHA1 Message Date
Linda Andersson b8395e9af7 Added eventfunctions for PlayerAction and PickupEvent 2014-02-25 14:35:27 +01:00
lindaandersson 4f838bb39e Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-21 15:42:21 +01:00
lindaandersson 22f52150d5 Sending dmg, respawn and dead from player to client 2014-02-21 15:42:09 +01:00
Erik Persson ed3152057c GL - fixing with explosivecrate and massdriver 2014-02-21 15:02:42 +01:00
Pontus Fransson 4072e7aca2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:00:21 +01:00
Pontus Fransson 54adb19eb8 Unnecessary get client 2014-02-21 10:54:30 +01:00
Pontus Fransson 93eb598012 Fixed dynamic objects not being updated on startup. 2014-02-21 10:48:09 +01:00
dean11 a1411bd9da Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-20 16:54:36 +01:00
dean11 7d887d81b0 GameServer - Modified one row 2014-02-20 16:54:24 +01:00
dean11 f84c996a52 GameLogic - Added disconnect messages and reuse of players 2014-02-20 16:52:36 +01:00
dean11 0a664bd0dd GameServer - Added dynamic player alias and model names 2014-02-19 11:02:44 +01:00
Dennis Andersen 53c0c74c7c GameLogic - Merged with GameServer and fixed some merge errors 2014-02-18 21:50:51 +01:00
dean11 22f9daf0d8 Connection between server and client is stable 2014-02-18 16:38:08 +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
dean11 830b448690 Temp 2014-02-17 16:17:07 +01:00
Dennis Andersen 9d0148c5c2 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:27 +01:00
Dennis Andersen 21c640c6e1 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:03 +01:00
Dennis Andersen deb173bc46 GameServer - Merged with gamephysics 2014-02-15 22:49:13 +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
Dander7BD 134994447f Fixed compilation error 2014-02-12 12:11:23 +01:00
lindaandersson d771a5181d GL - rotation and gravity fixed 2014-02-11 13:41:38 +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 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +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
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +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
Renamed from Code/Game/DanBiasServer/GameSession/GameSession_General.cpp (Browse further)