dean11
|
a80b1fa96f
|
Added back to main menu NOTE MEMORY LEAKS
|
2014-02-27 11:41:17 +01:00 |
Pontus Fransson
|
5fe89f1d8f
|
Fixed some crashes and added mutex around broadcast options on network server.
|
2014-02-23 22:07:33 +01:00 |
|
Pontus Fransson
|
0cb7940bae
|
Sending real ip address, port and server name.
|
2014-02-23 21:15:16 +01:00 |
|
Pontus Fransson
|
d64f3d7a20
|
Broadcasting works and I am getting the protocols out to LanMenuState!
|
2014-02-23 20:23:15 +01:00 |
|
Pontus Fransson
|
a0bf9e862a
|
Started implementing broadcasting.
|
2014-02-23 18:38:20 +01:00 |
|
Pontus Fransson
|
8e9d1a4999
|
Reworked NetworkClient's thread.
Cpu usage is decreased and recv/send rate should be increased.
|
2014-02-22 22:38:28 +01:00 |
|
dean11
|
d93d900d40
|
GameServer - Misc
|
2014-02-20 09:14:42 +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 |
|
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 |
|
dean11
|
22f9daf0d8
|
Connection between server and client is stable
|
2014-02-18 16:38:08 +01:00 |
|
dean11
|
7395a0a495
|
Major cleanup
|
2014-02-17 10:38:11 +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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +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
|
ed202a15a2
|
Worked over the holidays
|
2014-01-07 10:26:09 +01:00 |
|
Dennis Andersen
|
8700824d12
|
Gamlogic - Merge with Linda
|
2013-12-17 14:32:57 +01:00 |
|
Dennis Andersen
|
097fa1da34
|
GameLogic - Pre merge with Linda
|
2013-12-17 14:15:20 +01:00 |
|
Linda Andersson
|
9d722bced3
|
GL - recieve messages from server
|
2013-12-17 13:39:10 +01:00 |
|
Dennis Andersen
|
682a28513b
|
Gamelogic - Merge with network
|
2013-12-17 11:35:34 +01:00 |
|
dean11
|
4650615a61
|
Gamelogic - Pre merge with Linda
|
2013-12-17 10:25:34 +01:00 |
|
Pontus Fransson
|
f31da90830
|
Network - Connection set blocking to true while connecting.
|
2013-12-17 09:05:32 +01:00 |
|
dean11
|
abc94e9acb
|
Nothing important done
|
2013-12-17 00:51:42 +01:00 |
|
Pontus Fransson
|
e4e0e1c189
|
Network - Fixed delay loading dll.
|
2013-12-16 19:58:31 +01:00 |
|
dean11
|
ec3c5f1290
|
Gamelogic - Added threading functionality to NetworkClient
|
2013-12-16 11:05:24 +01:00 |
|
Pontus Fransson
|
8a8cfcc5d6
|
Network - Forgot to use Initiateclient().
|
2013-12-16 09:48:41 +01:00 |
|
dean11
|
9eb8fcba40
|
Gamelogic - Publication to others...
|
2013-12-16 09:00:11 +01:00 |
|
dean11
|
17aa38d865
|
GameLogic - Merge with network, resolved 2 merging errors
|
2013-12-14 22:54:24 +01:00 |
|
dean11
|
8b1c2b91e8
|
Fixed some craches and stuff
|
2013-12-13 23:47:16 +01:00 |
|
Pontus Fransson
|
092f83a084
|
Network - Id on client and == operator.
|
2013-12-12 15:33:11 +01:00 |
|
dean11
|
71d31db884
|
GAMELOGIC - Fixed a minor major huge issue with no problems
|
2013-12-12 14:37:35 +01:00 |