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

145 Commits

Author SHA1 Message Date
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
Robin Engman d5cda4deaa Added early triangle collisions 2014-02-26 14:06:02 +01:00
Linda Andersson 934bc80b62 InGame keys: Go to mainMenu with M. Exit client with ESC. Fix drop in drop out correctly. 2014-02-26 11:53:33 +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
Pontus Fransson 9ec3fc6fa4 Does not render non visible models anymore. 2014-02-26 10:22:43 +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
dean11 7c52fe236f NewInput - Merged with gameClient 2014-02-25 16:42:51 +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 f2bb50804c Play action animation 2014-02-25 16:08:45 +01:00
dean11 0fd038be8c NewInpuit - Pre-merge with gameclient 2014-02-25 15:52:15 +01:00
dean11 b4ad883472 New input - added new input and more menu stuff 2014-02-25 14:25:54 +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
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 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 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 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 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 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
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
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 c460bae943 Updated dmg protocol 2014-02-21 11:23:38 +01:00