dean11
|
8cf0087a95
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 11:32:57 +01:00 |
Pontus Fransson
|
d1fb6a7718
|
Added udp connection if we want to implement broadcast.
|
2014-02-20 11:01:25 +01:00 |
|
dean11
|
208885d4eb
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 09:22:03 +01:00 |
|
dean11
|
d93d900d40
|
GameServer - Misc
|
2014-02-20 09:14:42 +01:00 |
|
Pontus Fransson
|
3527d3acb0
|
Network - Fixed memory leak in NetworkServer.
|
2014-02-20 09:07:02 +01:00 |
lindaandersson
|
0c0fde51b0
|
GameClient Correct scaling on drawn RB
|
2014-02-20 08:56:36 +01:00 |
|
dean11
|
d6dfd7a115
|
Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer
|
2014-02-20 08:40:36 +01:00 |
|
Dennis Andersen
|
f872cfffd1
|
Added debug project to game server and some other stuff
|
2014-02-20 08:33:07 +01:00 |
|
dean11
|
b656ce448d
|
GameServer - Debuging GameLogic
|
2014-02-19 16:22:14 +01:00 |
Dander7BD
|
3b70e0baec
|
Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient
|
2014-02-19 16:09:07 +01:00 |
lanariel
|
4697b85e3b
|
Small fixes
|
2014-02-19 15:57:52 +01:00 |
|
Pontus Fransson
|
717e95bdfe
|
Network - Added reconnect with the last address you connected on.
|
2014-02-19 14:49:20 +01:00 |
|
Pontus Fransson
|
7f8c10292e
|
Moved LevelLoader to a seperate lib project.
|
2014-02-19 11:00:16 +01:00 |
|
Pontus Fransson
|
ca2695293f
|
Added reconnect (not tested). Added check for level parser not finding file.
|
2014-02-19 09:25:40 +01:00 |
|
Dander7BD
|
02b467be18
|
const related edits in CustomNetProtocol
Should be none impact besides positive ones
|
2014-02-18 17:04:27 +01:00 |
|
dean11
|
22f9daf0d8
|
Connection between server and client is stable
|
2014-02-18 16:38:08 +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
|
7395a0a495
|
Major cleanup
|
2014-02-17 10:38:11 +01:00 |
|
dean11
|
bb8d3549dc
|
Cleanup
|
2014-02-17 09:01:01 +01:00 |
|
Dennis Andersen
|
5119af8127
|
Gameserver - Added more features to standalone srver
|
2014-02-17 08:53:15 +01:00 |
|
Dennis Andersen
|
85ebe3a7ca
|
GameServer - Merged with Input, Added some athur info in headers
|
2014-02-16 01:38:03 +01:00 |
|
Dander7BD
|
805f90d926
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
Code/Game/DanBiasGame/GameClientState/LoginState.cpp
|
2014-02-13 15:25:07 +01:00 |
|
Pontus Fransson
|
95e08e84c3
|
Network - Overloaded Connect in NetworkClient to use std::wstring.
|
2014-02-13 15:21:19 +01:00 |
|
Dander7BD
|
5d4d66cf06
|
stuff
|
2014-02-12 17:20:42 +01:00 |
|
Dander7BD
|
5ff8661843
|
Bugs and Compilation errors dealt with
|
2014-02-12 14:33:56 +01:00 |
|
Dander7BD
|
4d78e30fb8
|
Overhaul of GameState
|
2014-02-12 09:02:44 +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
|
b7f550859d
|
GameServer - Merge with GameLogic
|
2014-02-04 22:13:07 +01:00 |
|
Dennis Andersen
|
168539da08
|
Gameserver - Fixed minor merging isues
|
2014-02-04 16:27:18 +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 |
|
Pontus Fransson
|
dc5b408196
|
Network - Updated network api with comment.
|
2014-02-03 15:32:20 +01:00 |
|
Dennis Andersen
|
a673e64694
|
GameServer - Pre-merge with graphic
|
2014-01-31 22:52:52 +01:00 |
|
Dennis Andersen
|
c9c562fda6
|
GameServer - Added some functionality in windowshell
|
2014-01-31 10:50:38 +01:00 |
|
lindaandersson
|
4df6b849a6
|
GL - working with new models and server
|
2014-01-31 09:39:44 +01:00 |
|
Dennis Andersen
|
34b6b29fc4
|
GameLogic - Merged with GL
|
2014-01-31 09:24:16 +01:00 |
|
lindaandersson
|
a6ff6eba42
|
GL - merge with server
|
2014-01-31 09:14:55 +01:00 |
|
Dennis Andersen
|
40f0fe61f0
|
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
|
2014-01-31 08:41:08 +01:00 |
|
Pontus Fransson
|
3b8a8e9c09
|
Network - Fixed receiving parts of packages.
|
2014-01-30 23:22:46 +01:00 |
Sam Mario Svensson
|
4167b6a93b
|
GL- merge fix
|
2014-01-30 15:02:35 +01:00 |
|
lindaandersson
|
2bb2d0cd56
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-30 14:58:30 +01:00 |
|
Dennis Andersen
|
e043d03a59
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-01-30 14:40:04 +01:00 |
|
Dennis Andersen
|
09f39ec26d
|
GameServer - Added acces directly to clients in network session
|
2014-01-30 14:15:25 +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
|
05740665da
|
GameServer - Fixed a small error regarding not reaching some data
|
2014-01-30 11:11:04 +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 |