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

1432 Commits

Author SHA1 Message Date
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
Robin Engman d7e0b55a82 Experiment - Release from limbo 2014-02-21 12:21:10 +01:00
lanariel 5aeac78f60 instanced structure in place 2014-02-21 12:19:53 +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 8f0a0464a5 Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:51:00 +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 0ceab1640d Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-02-21 11:36:32 +01:00
Erik Persson 1776601961 GL - damage first draft 2014-02-21 11:35:38 +01:00
Robin Engman 628c81c33a Fixed linear velocity 2014-02-21 11:33:57 +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 29ad63cc48 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-02-21 11:11:28 +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
Robin Engman e73c988b81 Added ability to get previous velocity for rigid bodies 2014-02-21 09:54:32 +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
dean11 3bdb65f92a Misc - Added methods for extracting resource reference count and resource size 2014-02-20 17:10:37 +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 f03da77a55 Merge remote-tracking branch 'origin/Physics' into GameClientGraphics 2014-02-20 16:38:41 +01:00
lindaandersson d7a9772889 Merge with gameServer 2014-02-20 16:38:15 +01:00
Dander7BD 536f1a69da Merge remote-tracking branch 'origin/Input' into New-inputsystem 
Conflicts:
	Code/Misc/Input/Include/Mouse.h
 2014-02-20 16:36:06 +01:00
lindaandersson d83e545e58 Started adding GameUI 2014-02-20 16:35:49 +01:00
Dander7BD daa3f84c9c Added feature Input::Mouse::GetDeltaPosition 
plus a few improvements
 2014-02-20 16:34:45 +01:00
Pontus Fransson 708526a54b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-20 16:24:44 +01:00
Dander7BD 3e8595f52c branch jumping 2014-02-20 16:15:47 +01:00
dean11 8583e40d2f Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-02-20 16:12:33 +01:00
Erik Persson 41cd83500c GL - deleteing cones in attatchmentMassdriver 2014-02-20 16:02:53 +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
Robin Engman e3141cd1f9 Added move to limbo for custom bodies 
NO idea if this works
 2014-02-20 15:45:07 +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
Dander7BD fa2c4455f1 missed file 2014-02-20 14:59:24 +01:00
Dander7BD ccd1ce3ab1 jumping 2014-02-20 14:58:42 +01:00
Dander7BD 0aabd0b323 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 2014-02-20 14:40:04 +01:00
Dander7BD 8993241408 Win32ApplicationKeyboard fully implemented 
ApplicationKeyboard, Win32ApplicationKeyboard & implemented into the
CreateDevice function
 2014-02-20 14:39:12 +01:00
lindaandersson de70388dfb world matrix for RB on client fix 2014-02-20 13:35:51 +01:00
Dander7BD 2c8b52e0fa some implementations 2014-02-20 13:27:21 +01:00
dean11 6414fc1a4f Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:45:25 +01:00
dean11 ef35172bb9 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:45:13 +01:00
dean11 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 12:44:24 +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 50fc2fcc29 Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-20 11:59:44 +01:00
lindaandersson 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +01:00
dean11 7ee63f887e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:58:08 +01:00
dean11 4150ba0fc3 GameLogic - Added default scael 1:1 2014-02-20 11:57:26 +01:00
dean11 b570ca895e Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:48:09 +01:00
Pontus Fransson 84d2c4eb56 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:47:32 +01:00
Pontus Fransson bdf8c199a3 Removed check to not send rotation since it fucked up the rotation. 2014-02-20 11:47:18 +01:00
lindaandersson bf41bd38d4 Updating model worldMatrix 2014-02-20 11:34:29 +01:00
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
dean11 e954180e22 Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:40 +01:00
dean11 53dc42ffc4 Input - Added normalized cordinates 2014-02-20 11:27:43 +01:00
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Robin Engman 89c52d34f4 Changed order of move call 2014-02-20 11:15:13 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
lindaandersson ddbc800dbb Merge branches 'GameClient' and 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:12:16 +01:00
lindaandersson a2bba95003 GameClient sending rotation to server 2014-02-20 11:12:08 +01:00
Pontus Fransson a4de2ddbe2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 11:01:38 +01:00
Pontus Fransson d1fb6a7718 Added udp connection if we want to implement broadcast. 2014-02-20 11:01:25 +01:00
lindaandersson e6cd1f1e5f GameClient now objects say to client that they have moved! 2014-02-20 10:33:27 +01:00
lindaandersson 9082666eba Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 10:13:08 +01:00