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

767 Commits

Author SHA1 Message Date
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
Pontus Fransson 9ec3fc6fa4 Does not render non visible models anymore. 2014-02-26 10:22:43 +01:00
Pontus Fransson 8798fc9006 Fixed static id not matching on client/server. 2014-02-26 10:22:08 +01:00
Robin Engman 2f19390cd2 Fixed player jump 2014-02-26 10:05:18 +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
Robin Engman 08bec9470e Merge remote-tracking branch 'origin/GameServer' into Physics 2014-02-26 09:39:39 +01:00
Linda Andersson 8438b7dfbb Renamed actionEvent 2014-02-26 09:11:45 +01:00
Linda Andersson 4d077106dc Weapon action enum added 2014-02-26 08:51:56 +01:00
Robin Engman ca693c412f Player air check function 2014-02-26 08:51:18 +01:00
Robin Engman 47e6d93957 Fixed player going bonkers on lower hemisphere 2014-02-25 18:25:51 +01:00
dean11 8d7bff808a NewInput - Merged with Gameserver 2014-02-25 16:49:33 +01:00
dean11 7c52fe236f NewInput - Merged with gameClient 2014-02-25 16:42:51 +01:00
Linda Andersson de3250f650 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 16:26:46 +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
Pontus Fransson 11eda5065e Reading hp pickups from levelformat. Updating pickups. 2014-02-25 16:10:02 +01:00
Linda Andersson f2bb50804c Play action animation 2014-02-25 16:08:45 +01:00
Pontus Fransson d56d1d7569 Fixed error with reading lights from level format. 2014-02-25 16:07:50 +01:00
dean11 0fd038be8c NewInpuit - Pre-merge with gameclient 2014-02-25 15:52:15 +01:00
Pontus Fransson 2052f60ea4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 14:37:07 +01:00
Pontus Fransson 0369d8cf19 Not finished Pickup system. 2014-02-25 14:36:54 +01:00
Linda Andersson 2996627c56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-25 14:35:39 +01:00
Linda Andersson b8395e9af7 Added eventfunctions for PlayerAction and PickupEvent 2014-02-25 14:35:27 +01:00
dean11 b4ad883472 New input - added new input and more menu stuff 2014-02-25 14:25:54 +01:00
Erik Persson 31bf73c2fd GL - weapon energy, force etc inside weapon 2014-02-25 13:56:49 +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
Erik Persson 8a359bd1ba GL - only 1 player can manipulate a object at a time 2014-02-25 11:20:46 +01:00
Erik Persson 5ba57c1a72 Merge remote-tracking branch 'origin/GameClient' into GameLogic 2014-02-25 10:44:51 +01:00
Erik Persson bc17a9f09e merge 2014-02-25 10:37:33 +01:00
lanariel 53f0699b61 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-25 09:45:13 +01:00
lanariel f35f96b8f2 Instanced fix, render char, manual instanced flag per model, wireframe fix 2014-02-25 09:45:02 +01:00
Dander7BD 1f90de4cb4 some implemetations 2014-02-24 19:45:13 +01:00
Pontus Fransson 9ccdbd55e2 Not connecting with broadcast anymore. 2014-02-24 16:18:47 +01:00
Linda Andersson 1b0772a004 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-24 14:59:35 +01:00
lindaandersson 114e14c408 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-24 14:59:09 +01:00
lindaandersson 627063748d Player action protocol added 2014-02-24 14:59:01 +01:00
Linda Andersson 704e562d01 Merge branch 'GameServer' into GameClient 2014-02-24 14:48:36 +01:00
lanariel 37e9d47207 Instanced Rendering 2014-02-24 14:44:36 +01:00
Pontus Fransson bf07ef5f5f Connecting to the ip and port received in the last broadcast message. 2014-02-23 22:25:41 +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 be1c3e2af0 Sending strings in broadcast message. 2014-02-23 20:40:29 +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
Pontus Fransson 6eb0a282c2 LevelLoader reads lights and cgMesh correctly. 2014-02-22 12:58:43 +01:00
Dennis Andersen 44aab68bfb Input - More support for mouse 2014-02-21 21:04:30 +01:00
lindaandersson 7bb67b6a85 sec respawn 2014-02-21 15:56:32 +01:00
lindaandersson 1d147004a2 small fixes and explosive crate do 90 dmg 2014-02-21 15:54:43 +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
Robin Engman e133562021 Merge with server 2014-02-21 14:14:30 +01:00
Robin Engman 954dc67f7a Fixed multiple collisions 2014-02-21 14:09:38 +01:00
Pontus Fransson 1c71d7ef80 Don't update/send to inavlidated clients 2014-02-21 13:54:04 +01:00
Erik Persson 4360519be7 Merge remote-tracking branch 'origin/GameClient' into GameLogic 2014-02-21 13:00:20 +01:00
Erik Persson 87cf2d8ac5 GL - stuff 2014-02-21 12:59:04 +01:00
lindaandersson b0aa6acdd6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-21 12:38:34 +01:00
lindaandersson 38717f011c Render players with run animation 2014-02-21 12:38:25 +01:00
Dander7BD dee6c5f8d1 MainState renders now a mouseCursor 2014-02-21 12:31:31 +01:00
Dander7BD 40276391af post merge fixes 2014-02-21 12:18:46 +01:00
Dander7BD 60a5ddc79d Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 
Conflicts:
	Code/Game/GameClient/GameClient.vcxproj
	Code/Game/GameClient/GameClientState/GameState.cpp
 2014-02-21 12:14:22 +01:00
Dander7BD 9a470fc175 post merge fixes 2014-02-21 12:09:38 +01:00
Erik Persson 695d6db7a9 Merge remote-tracking branch 'origin/GameServer' into GameLogic 2014-02-21 11:57:21 +01:00
Erik Persson a4a531264f GL - second draft damage 2014-02-21 11:56:48 +01:00
Dander7BD adda3c1fff Merge remote-tracking branch 'origin/Input' into New-inputsystem 
Conflicts:
	Code/Misc/Input/Include/Mouse.h
 2014-02-21 11:54:40 +01:00
dean11 c04ef3a425 Misc - Merged with Input 2014-02-21 11:52:48 +01:00
lanariel 957d73f0f7 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:50:22 +01:00
lanariel bd0daf363d start with Instanced 2014-02-21 11:49:24 +01:00
Pontus Fransson 5742f45392 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:45:11 +01:00
dean11 ed6f80765e Misc - Intergrated seperate textual input 2014-02-21 11:43:05 +01:00
Erik Persson 1776601961 GL - damage first draft 2014-02-21 11:35:38 +01:00
lindaandersson 7de0a2ba1b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:24:11 +01:00
lindaandersson 56e45f586e Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:23:57 +01:00
lindaandersson c80b6cba79 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:23:46 +01:00
lindaandersson c460bae943 Updated dmg protocol 2014-02-21 11:23:38 +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 f8b8439874 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-21 10:49:46 +01:00
lindaandersson 0ade5fde25 GameClient UI base. TODO: make it look pretty 2014-02-21 10:49:02 +01:00
Pontus Fransson 93eb598012 Fixed dynamic objects not being updated on startup. 2014-02-21 10:48:09 +01:00
Erik Persson 623359dd66 Merge remote-tracking branch 'origin/GameClient' into GameLogic 2014-02-21 09:48:54 +01:00
dean11 956c1a726c Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-21 09:44:29 +01:00
Dander7BD ac492b413b implementations 2014-02-21 09:36:43 +01:00
Pontus Fransson c718dc5a2b Started implementing broadcasting 2014-02-21 09:34:09 +01:00
Dander7BD ab70cb53c4 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
 2014-02-20 17:19:48 +01:00
Dander7BD 61ce9a9a3e New input system integrations 2014-02-20 16:55:34 +01:00
dean11 9758456f92 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 16:54:47 +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
lindaandersson 3bee35785a moved debug buttons to gameState 2014-02-20 16:51:14 +01:00
lindaandersson d7a9772889 Merge with gameServer 2014-02-20 16:38:15 +01:00