Linda Andersson
|
704e562d01
|
Merge branch 'GameServer' into GameClient
|
2014-02-24 14:48:36 +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 |
|
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
|
8e0f6eefda
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
|
2014-02-21 15:04:48 +01:00 |
|
Pontus Fransson
|
1c71d7ef80
|
Don't update/send to inavlidated clients
|
2014-02-21 13:54:04 +01:00 |
|
lindaandersson
|
38717f011c
|
Render players with run animation
|
2014-02-21 12:38:25 +01:00 |
|
Pontus Fransson
|
5742f45392
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer
|
2014-02-21 11:45:11 +01:00 |
|
lindaandersson
|
7de0a2ba1b
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient
|
2014-02-21 11:24:11 +01:00 |
|
Pontus Fransson
|
a46ba0efb5
|
Added print out for disconnect
|
2014-02-21 11:12:24 +01:00 |
|
Erik Persson
|
3178f08bf0
|
GL - player can shoot, lookdir is now sent
|
2014-02-21 11:10:47 +01:00 |
dean11
|
f84c996a52
|
GameLogic - Added disconnect messages and reuse of players
|
2014-02-20 16:52:36 +01:00 |
|
Pontus Fransson
|
dedd0e87c7
|
Added player disconnect protocol.
|
2014-02-20 15:47:11 +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 |
Dander7BD
|
7ece3b62a0
|
Changed Player_Look protocol to Player_LeftTurn
|
2014-02-19 13:42:57 +01:00 |
|
dean11
|
8a3cd796ca
|
GameServer - Pontus found idiot bug that dennis made
|
2014-02-19 12:46:05 +01:00 |
|
dean11
|
22f9daf0d8
|
Connection between server and client is stable
|
2014-02-18 16:38: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
|
deb173bc46
|
GameServer - Merged with gamephysics
|
2014-02-15 22:49:13 +01:00 |
|
lindaandersson
|
e8536cc5d4
|
GL - removed before collision event, sending look and right dir to server
|
2014-02-12 13:11:35 +01:00 |
|
lindaandersson
|
c1757eef21
|
GL - moving character
|
2014-02-12 11:35:34 +01:00 |
|
lindaandersson
|
d771a5181d
|
GL - rotation and gravity fixed
|
2014-02-11 13:41:38 +01:00 |
|
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +01:00 |
|
dean11
|
3274727923
|
GameServer - Added more gameplay protocols and structured the old mess
|
2014-02-11 10:21:47 +01:00 |
|
Dennis Andersen
|
4abfdd70fe
|
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
|
2014-02-09 18:58:07 +01:00 |
|
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
|
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +01:00 |
|
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
Dennis Andersen
|
db822fa832
|
GameServer - Merged with gamelogic
|
2014-02-04 22:33:39 +01:00 |
|
Dennis Andersen
|
b7f550859d
|
GameServer - Merge with GameLogic
|
2014-02-04 22:13:07 +01:00 |
|
lindaandersson
|
d8c7220569
|
GL - added some testing things in player and more objects to the world
|
2014-02-04 16:08:28 +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
|
61178e2803
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:06:59 +01:00 |
|
lindaandersson
|
fcadd5b4c3
|
GL - testing physics
|
2014-02-04 10:29:02 +01:00 |
|
lindaandersson
|
e21cfe4cd4
|
GL - merge with Erik
|
2014-02-03 16:21:48 +01:00 |
|
Erik Persson
|
7f29b62c6f
|
GL - YOU CAN NOW SHOOT STUFF YAAAAY
|
2014-02-03 16:19:24 +01:00 |
|
lindaandersson
|
a3886c4f1f
|
GL - added models and started to fix camera movement
|
2014-02-03 15:52:00 +01:00 |
|
Dennis Andersen
|
a673e64694
|
GameServer - Pre-merge with graphic
|
2014-01-31 22:52:52 +01:00 |
|
Dennis Andersen
|
5aede62af6
|
Gameserver - Merge with gamelogic
|
2014-01-31 22:36:43 +01:00 |
|
lindaandersson
|
e327f64702
|
GL - can play with two characters
|
2014-01-31 16:33:16 +01:00 |
|
Dennis Andersen
|
c9c562fda6
|
GameServer - Added some functionality in windowshell
|
2014-01-31 10:50:38 +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
|
09f39ec26d
|
GameServer - Added acces directly to clients in network session
|
2014-01-30 14:15:25 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +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 |