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

120 Commits

Author SHA1 Message Date
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
Dennis Andersen 22bc079ed7 GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 10:32:08 +01:00
Linda Andersson 9731cd9c5e Spawning players on rand spawnpoint when they connect 2014-02-27 10:31:15 +01:00
Linda Andersson d4e80733d2 Fixed deleting problems when shuting down 2014-02-27 10:27:55 +01:00
Pontus Fransson 28e84854d1 Health pickups is now working! 2014-02-27 10:27:54 +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 6bd8c94d79 Addded objectDelete protocol. Enable/ disable will be used for visibility on client 2014-02-27 10:07:11 +01:00
Linda Andersson 5620a3c517 Added eventfunctions for PlayerAction and PickupEvent 2014-02-27 10:07:07 +01:00
Linda Andersson 4d967b995d Added player stats. Added players to level. Respawn logic in level. 2014-02-27 10:06:01 +01:00
dean11 ca715dbe05 GameLogic - Merged with gamelogic 2014-02-27 09:11:00 +01:00
Dennis Andersen ffa6da1a2f GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 08:19:50 +01:00
Linda Andersson 74456a4d80 Spawning players on rand spawnpoint when they connect 2014-02-26 14:55:29 +01:00
dean11 504f11ef4c Gameserver - Merged with gamelogic 2014-02-26 14:42:17 +01:00
dean11 e680da9d54 GameServer - Merged with physics 2014-02-26 14:20:33 +01:00
dean11 b1f82c8ef2 Merged with Physics 2014-02-26 14:07:46 +01:00
Linda Andersson 16ca665311 Fixed deleting problems when shuting down 2014-02-26 11:09:24 +01:00
Linda Andersson 039dcef6a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 10:26:19 +01:00
Linda Andersson a8055cfbf7 Merge with physics 2014-02-26 10:25:39 +01:00
Pontus Fransson dbbc7a9769 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-26 10:24:42 +01:00
Pontus Fransson 925f05b3b0 Health pickups is now working! 2014-02-26 10:23:38 +01:00
Linda Andersson 13d6a062fc Added collision and weapon events and send them to client 2014-02-26 10:05:07 +01:00
Robin Engman 2d9f89676a Merge with GL 2014-02-26 09:48:19 +01:00
dean11 8d7bff808a NewInput - Merged with Gameserver 2014-02-25 16:49:33 +01:00
Linda Andersson 638f2f6241 Addded objectDelete protocol. Enable/ disable will be used for visibility on client 2014-02-25 16:26:37 +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
Linda Andersson 7460f16512 Added player stats. Added players to level. Respawn logic in level. 2014-02-25 11:46:05 +01:00
dean11 feb7c51e1c Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-24 16:30:31 +01:00
Linda Andersson 704e562d01 Merge branch 'GameServer' into GameClient 2014-02-24 14:48:36 +01:00
dean11 342aada491 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-24 12:31:19 +01:00
Pontus Fransson 0cb7940bae Sending real ip address, port and server name. 2014-02-23 21:15:16 +01:00
Pontus Fransson be1c3e2af0 Sending strings in broadcast message. 2014-02-23 20:40:29 +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
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
Erik Persson ed3152057c GL - fixing with explosivecrate and massdriver 2014-02-21 15:02:42 +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
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