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

91 Commits

Author SHA1 Message Date
lanariel 21c92ac8a6 Merge branch 'Gtest' into GameClient 
Conflicts:
	Code/Game/GameClient/DanBiasGame_Impl.cpp
 2014-02-27 11:42:29 +01:00
lanariel 1b7cebc2e9 Resize 2014-02-27 10:49:22 +01:00
lanariel d5eeb3eec1 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Gtest 2014-02-27 09:05:09 +01:00
lanariel 3e72421cb5 half baked tiles 2014-02-27 09:04:12 +01:00
Linda Andersson 9c4f72882c Merged: game logic with new Input 2014-02-26 15:12:13 +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
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
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
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 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
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
lindaandersson 1d147004a2 small fixes and explosive crate do 90 dmg 2014-02-21 15:54:43 +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 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
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
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
Pontus Fransson 4072e7aca2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-21 11:00:21 +01:00
lindaandersson 0ade5fde25 GameClient UI base. TODO: make it look pretty 2014-02-21 10:49:02 +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
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
lindaandersson d83e545e58 Started adding GameUI 2014-02-20 16:35:49 +01:00
Dander7BD 3e8595f52c branch jumping 2014-02-20 16:15:47 +01:00
Pontus Fransson f532514131 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 15:57:36 +01:00
Pontus Fransson dedd0e87c7 Added player disconnect protocol. 2014-02-20 15:47:11 +01:00
lanariel 67d150fce1 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 15:16:20 +01:00
lanariel a3c4099111 Global Tint 2014-02-20 15:15:54 +01:00
Robin Engman f8f656d7c9 Player now has better movement 
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
 2014-02-20 15:14:02 +01:00
lanariel ab830f2293 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:08:31 +01:00
lanariel a965c66e13 Seperate Glow and Tint 2014-02-20 12:07:53 +01:00
lindaandersson 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +01:00