Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 5742f45392 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer Pontus Fransson 2014-02-21 11:45:11 +0100
• ed6f80765e Misc - Intergrated seperate textual input dean11 2014-02-21 11:43:05 +0100
• 0ceab1640d Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-02-21 11:36:32 +0100
• 1776601961 GL - damage first draft Erik Persson 2014-02-21 11:35:38 +0100
• 628c81c33a Fixed linear velocity Robin Engman 2014-02-21 11:33:57 +0100
• 7de0a2ba1b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-21 11:24:11 +0100
• 56e45f586e Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-21 11:23:57 +0100
• c80b6cba79 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-21 11:23:46 +0100
• c460bae943 Updated dmg protocol lindaandersson 2014-02-21 11:23:38 +0100
• a46ba0efb5 Added print out for disconnect Pontus Fransson 2014-02-21 11:12:24 +0100
• 29ad63cc48 Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-02-21 11:11:28 +0100
• 3178f08bf0 GL - player can shoot, lookdir is now sent Erik Persson 2014-02-21 11:10:47 +0100
• 4072e7aca2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer Pontus Fransson 2014-02-21 11:00:21 +0100
• 54adb19eb8 Unnecessary get client Pontus Fransson 2014-02-21 10:54:30 +0100
• f8b8439874 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-21 10:49:46 +0100
• 0ade5fde25 GameClient UI base. TODO: make it look pretty lindaandersson 2014-02-21 10:49:02 +0100
• 93eb598012 Fixed dynamic objects not being updated on startup. Pontus Fransson 2014-02-21 10:48:09 +0100
• e73c988b81 Added ability to get previous velocity for rigid bodies Robin Engman 2014-02-21 09:54:32 +0100
• 623359dd66 Merge remote-tracking branch 'origin/GameClient' into GameLogic Erik Persson 2014-02-21 09:48:54 +0100
• 956c1a726c Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-21 09:44:29 +0100
• ac492b413b implementations Dander7BD 2014-02-21 09:36:43 +0100
• c718dc5a2b Started implementing broadcasting Pontus Fransson 2014-02-21 09:34:09 +0100
• a987c2e618 Merge branch 'Input' of https://github.com/dean11/Danbias into Input Dennis Andersen 2014-02-20 20:07:21 +0100
• ab70cb53c4 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem Dander7BD 2014-02-20 17:19:48 +0100
• 3bdb65f92a Misc - Added methods for extracting resource reference count and resource size dean11 2014-02-20 17:10:37 +0100
• 61ce9a9a3e New input system integrations Dander7BD 2014-02-20 16:55:34 +0100
• 9758456f92 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 16:54:47 +0100
• a1411bd9da Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 16:54:36 +0100
• 7d887d81b0 GameServer - Modified one row dean11 2014-02-20 16:54:24 +0100
• f84c996a52 GameLogic - Added disconnect messages and reuse of players dean11 2014-02-20 16:52:36 +0100
• 3bee35785a moved debug buttons to gameState lindaandersson 2014-02-20 16:51:14 +0100
• f03da77a55 Merge remote-tracking branch 'origin/Physics' into GameClientGraphics lindaandersson 2014-02-20 16:38:41 +0100
• d7a9772889 Merge with gameServer lindaandersson 2014-02-20 16:38:15 +0100
• 536f1a69da Merge remote-tracking branch 'origin/Input' into New-inputsystem Dander7BD 2014-02-20 16:36:06 +0100
• d83e545e58 Started adding GameUI lindaandersson 2014-02-20 16:35:49 +0100
• daa3f84c9c Added feature Input::Mouse::GetDeltaPosition Dander7BD 2014-02-20 16:34:45 +0100
• 708526a54b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer Pontus Fransson 2014-02-20 16:24:44 +0100
• 3e8595f52c branch jumping Dander7BD 2014-02-20 16:15:47 +0100
• 8583e40d2f Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-20 16:12:33 +0100
• 41cd83500c GL - deleteing cones in attatchmentMassdriver Erik Persson 2014-02-20 16:02:53 +0100
• f532514131 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer Pontus Fransson 2014-02-20 15:57:36 +0100
• dedd0e87c7 Added player disconnect protocol. Pontus Fransson 2014-02-20 15:47:11 +0100
• e3141cd1f9 Added move to limbo for custom bodies Robin Engman 2014-02-20 15:45:07 +0100
• a53b1deb0a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-20 15:43:09 +0100
• 67d150fce1 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-20 15:16:20 +0100
• a3c4099111 Global Tint lanariel 2014-02-20 15:15:54 +0100
• f8f656d7c9 Player now has better movement Robin Engman 2014-02-20 15:13:52 +0100
• fa2c4455f1 missed file Dander7BD 2014-02-20 14:59:24 +0100
• ccd1ce3ab1 jumping Dander7BD 2014-02-20 14:58:42 +0100
• 0aabd0b323 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem Dander7BD 2014-02-20 14:40:04 +0100
• 8993241408 Win32ApplicationKeyboard fully implemented Dander7BD 2014-02-20 14:39:12 +0100
• de70388dfb world matrix for RB on client fix lindaandersson 2014-02-20 13:35:51 +0100
• 2c8b52e0fa some implementations Dander7BD 2014-02-20 13:27:21 +0100
• 6414fc1a4f Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient dean11 2014-02-20 12:45:25 +0100
• ef35172bb9 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameClient dean11 2014-02-20 12:45:13 +0100
• 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 12:44:24 +0100
• a72a304c88 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic dean11 2014-02-20 12:42:39 +0100
• ab830f2293 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-20 12:08:31 +0100
• a965c66e13 Seperate Glow and Tint lanariel 2014-02-20 12:07:53 +0100
• 50fc2fcc29 Merge remote-tracking branch 'origin/GameLogic' into GameClient lindaandersson 2014-02-20 11:59:44 +0100
• 1079b20e15 Updating player pos and RB, moved camera pos for testing lindaandersson 2014-02-20 11:59:26 +0100
• 7ee63f887e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 11:58:08 +0100
• 4150ba0fc3 GameLogic - Added default scael 1:1 dean11 2014-02-20 11:57:26 +0100
• b570ca895e Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 11:48:09 +0100
• 84d2c4eb56 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-20 11:47:32 +0100
• bdf8c199a3 Removed check to not send rotation since it fucked up the rotation. Pontus Fransson 2014-02-20 11:47:18 +0100
• bf41bd38d4 Updating model worldMatrix lindaandersson 2014-02-20 11:34:29 +0100
• 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 11:32:57 +0100
• e954180e22 Merge branch 'Input' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 11:32:40 +0100
• 53dc42ffc4 Input - Added normalized cordinates dean11 2014-02-20 11:27:43 +0100
• d945eea992 Fixed left turn mirroring and filter turn signals Dander7BD 2014-02-20 11:17:11 +0100
• 89c52d34f4 Changed order of move call Robin Engman 2014-02-20 11:13:52 +0100
• a78a4f70f1 Dan doing stuff Dander7BD 2014-02-20 11:12:53 +0100
• ddbc800dbb Merge branches 'GameClient' and 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-20 11:12:16 +0100
• a2bba95003 GameClient sending rotation to server lindaandersson 2014-02-20 11:12:08 +0100
• a4de2ddbe2 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-20 11:01:38 +0100
• d1fb6a7718 Added udp connection if we want to implement broadcast. Pontus Fransson 2014-02-20 11:01:25 +0100
• e6cd1f1e5f GameClient now objects say to client that they have moved! lindaandersson 2014-02-20 10:33:27 +0100
• 9082666eba Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-20 10:13:08 +0100
• dd397ec752 GameClient set onMoveFunc for all objects lindaandersson 2014-02-20 10:13:01 +0100
• 263eba782b Found unmarked debug hack Dander7BD 2014-02-20 10:04:38 +0100
• 641442854e GameServer - Added debug traps dean11 2014-02-20 09:23:33 +0100
• d537bd6791 Last release gfx fix lanariel 2014-02-20 09:23:09 +0100
• 208885d4eb Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 09:22:03 +0100
• d22e736ea3 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-20 09:21:47 +0100
• 7b87707714 GmaeClient fix RBsphere radius lindaandersson 2014-02-20 09:21:38 +0100
• d80dec600b Memory leak dealt with + removed obsolete debug trap Dander7BD 2014-02-20 09:20:26 +0100
• d93d900d40 GameServer - Misc dean11 2014-02-20 09:14:42 +0100
• 0a4d1f76b5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Pontus Fransson 2014-02-20 09:07:44 +0100
• 3527d3acb0 Network - Fixed memory leak in NetworkServer. Pontus Fransson 2014-02-20 09:07:02 +0100
• 20cb3c61c5 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-20 09:02:57 +0100
• 745a3802dc touched up SSAO and fixed wireframe rendering in release lanariel 2014-02-20 09:00:02 +0100
• 9e26095dd0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 08:57:06 +0100
• 0c0fde51b0 GameClient Correct scaling on drawn RB lindaandersson 2014-02-20 08:56:36 +0100
• 80b2a9edd7 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-20 08:44:03 +0100
• 7414544774 GameClient exclude RB rendering from release lindaandersson 2014-02-20 08:43:54 +0100
• d6dfd7a115 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-20 08:40:36 +0100
• f872cfffd1 Added debug project to game server and some other stuff Dennis Andersen 2014-02-20 08:33:07 +0100
• 7ab3223280 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-02-19 22:44:46 +0100
• 4ac5cdd147 GameServer - Painly merge with GameLogic Dennis Andersen 2014-02-19 22:44:31 +0100