Commit Graph

  • 6becd58833 DanBiasGame_Impl overhauled Dander7BD 2014-02-12 11:19:25 +0100
  • 9f64a1b441 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 11:03:33 +0100
  • 5d29979875 Fixed which body to send Robin Engman 2014-02-12 10:57:55 +0100
  • 7394f68769 GL - fixed what some asshole did in weapon Erik Persson 2014-02-12 10:57:43 +0100
  • 1db41a863b Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 10:44:13 +0100
  • 0d643a890d GL - massdriver Erik Persson 2014-02-12 10:43:41 +0100
  • af85a6efdc Compiler fixes in State classes Dander7BD 2014-02-12 10:43:06 +0100
  • 5e4532d50e Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 10:34:56 +0100
  • 2a214f5305 Added cone to apply effect Robin Engman 2014-02-12 10:31:50 +0100
  • f0178cf558 Added apply effect functionality Robin Engman 2014-02-12 10:23:07 +0100
  • 3324da528d GFERIK - added icollideable cone Erik Persson 2014-02-12 10:16:00 +0100
  • 8e07475434 GL - Buttons is now using one texture per button type. Fixed button state when spamming the button. Pontus Fransson 2014-02-12 10:02:52 +0100
  • fdb7a7e1b6 Added General Protocol to DataRecieved overloads Dander7BD 2014-02-12 09:54:33 +0100
  • d4b7fbf1b4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-12 09:52:46 +0100
  • 0bae7b9c6b Misc - Fixed a few errors that can occur Pontus Fransson 2014-02-12 09:49:57 +0100
  • 6bf7bc898e some more of those overhauls Dander7BD 2014-02-12 09:49:08 +0100
  • 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 09:32:22 +0100
  • e6316f3239 removed some old stuff, respect animation looping state lanariel 2014-02-12 09:32:15 +0100
  • bdc5b5e736 GL - fixed graphics, collision with house, locked to 30 fps on client, jump added lindaandersson 2014-02-12 09:32:13 +0100
  • f92bed35f5 Colored Text and Tinted Gui elements lanariel 2014-02-12 09:24:37 +0100
  • d7c381cc85 GL- fixed subscription Erik Persson 2014-02-12 09:23:14 +0100
  • 8dc22c854c Overhaul of LobbyState Dander7BD 2014-02-12 09:15:41 +0100
  • 291e60d7b4 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-12 09:11:11 +0100
  • d0955b2f4e GL - Button delete update. Pontus Fransson 2014-02-12 09:08:38 +0100
  • 4d78e30fb8 Overhaul of GameState Dander7BD 2014-02-12 09:02:44 +0100
  • 4c9d62b163 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 08:56:39 +0100
  • 7541994419 Added support for applying impulse Robin Engman 2014-02-12 08:50:10 +0100
  • ebf313ccd6 2D transparancy lanariel 2014-02-12 08:35:21 +0100
  • 4a6cd390eb Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 08:26:56 +0100
  • 474744c72a Fixed wierd ambience, 2DText Render and Lighting lanariel 2014-02-12 08:24:24 +0100
  • 6fc110c2e8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-11 15:07:10 +0100
  • 1725f05c4b GUI - GUI testing. Pontus Fransson 2014-02-11 15:06:46 +0100
  • 56205ff774 GL - mergeerror with button handling lindaandersson 2014-02-11 15:03:27 +0100
  • 5ebac80ec1 GL - animated character and some textrendering lindaandersson 2014-02-11 15:00:52 +0100
  • 3be98e6647 Merge remote-tracking branch 'origin/GameServer' into Camera Dander7BD 2014-02-11 14:56:43 +0100
  • 0f3c5af04a pre merge Dander7BD 2014-02-11 14:47:57 +0100
  • 813a97cfbf Merge remote-tracking branch 'origin/GamePhysics' into Camera Dander7BD 2014-02-11 14:15:00 +0100
  • 46d1fa13e1 premerge Dander7BD 2014-02-11 14:14:06 +0100
  • a99a9b3e2e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-11 14:13:49 +0100
  • 696d6997f6 GL - Button system done, only need to add 2d rendering to it. Pontus Fransson 2014-02-11 14:13:35 +0100
  • c3b2c1e912 premerge Dander7BD 2014-02-11 14:13:24 +0100
  • 058eada44c Added missing include lines Dander7BD 2014-02-11 14:12:14 +0100
  • 89189f93d8 asd Erik Persson 2014-02-11 14:03:14 +0100
  • 5d245d7151 Added quaternion to angular axis in Math Robin Engman 2014-02-11 14:00:38 +0100
  • 1aa66dc79f Quaternion to angular axis complete Robin Engman 2014-02-11 13:53:44 +0100
  • d771a5181d GL - rotation and gravity fixed lindaandersson 2014-02-11 13:41:38 +0100
  • 398be8361b Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 13:36:49 +0100
  • 7075e6add6 Gravity well Robin Engman 2014-02-11 13:36:14 +0100
  • f0df377bcd Basic 2d Render + Anim Updates lanariel 2014-02-11 13:29:19 +0100
  • 03ab4affb7 Minor fixes Dander7BD 2014-02-11 13:27:33 +0100
  • 7c0a597ed3 GameServer - Merge with Gamelogic dean11 2014-02-11 13:26:51 +0100
  • 289439b768 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 13:22:17 +0100
  • 322f752deb Merge remote-tracking branch 'origin/GameServer' into Camera Dander7BD 2014-02-11 13:21:44 +0100
  • 70c388779e Lib change for bullet Robin Engman 2014-02-11 13:21:22 +0100
  • f9a4fce5aa Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 13:12:35 +0100
  • 462413b527 Added support for gravity change Robin Engman 2014-02-11 13:09:46 +0100
  • de4ea0a830 GameServer - Merged with GameLogic, some stuff is broken dean11 2014-02-11 13:03:37 +0100
  • b883e2de39 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 11:46:17 +0100
  • 528a591fab GL - almost rotating lindaandersson 2014-02-11 11:46:06 +0100
  • b5631457d3 Fixed up functions again Robin Engman 2014-02-11 11:45:16 +0100
  • 2d22d5d274 Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 10:50:12 +0100
  • ee1dc530fa Fixed up functions Robin Engman 2014-02-11 10:49:37 +0100
  • 3274727923 GameServer - Added more gameplay protocols and structured the old mess dean11 2014-02-11 10:21:47 +0100
  • dc5783ad4f Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 10:21:11 +0100
  • 071624779e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-11 10:11:57 +0100
  • d16d223c2b GL - player moving lindaandersson 2014-02-11 10:11:38 +0100
  • 5ddafc7fc2 Merge remote-tracking branch 'origin/GameLogic' into Camera Dander7BD 2014-02-11 09:34:17 +0100
  • d5e85b4258 minor refractoring Dander7BD 2014-02-11 09:32:49 +0100
  • 10a227ff9c Merge remote-tracking branch 'origin/GameLogic-MessageHandler' into GameLogic Pontus Fransson 2014-02-11 09:25:10 +0100
  • 489115840d GL - base for lvl loading lindaandersson 2014-02-11 09:17:16 +0100
  • 9a82b70020 Misc - Button system working. (Logic) Pontus Fransson 2014-02-11 09:16:01 +0100
  • 985dcf9691 Set up and stop angular movement support added Robin Engman 2014-02-11 09:15:21 +0100
  • 399e0d049c GameServer - Merged with Graphics Dennis Andersen 2014-02-10 23:10:31 +0100
  • 450f4249f3 Documentation - Updated uml diagrams Dennis Andersen 2014-02-10 22:25:31 +0100
  • f53926444f Merge remote-tracking branch 'origin/GameLogic' into Camera-merge-attempt Dander7BD 2014-02-10 17:00:45 +0100
  • 1e70640d6e Premerge Dander7BD 2014-02-10 16:30:47 +0100
  • f473136ae1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-10 16:29:04 +0100
  • bfb763501d GL - i think this is working, not using the lvl loader. put models in /Content/Models and /textures lindaandersson 2014-02-10 16:28:25 +0100
  • 26755f8b0b GL- level format more updates.... Sam Mario Svensson 2014-02-10 16:24:05 +0100
  • cc55a3471f Fixed Const View Proj lanariel 2014-02-10 16:22:23 +0100
  • e0f3031187 Pointlight no pointer Model render pointer lanariel 2014-02-10 16:08:03 +0100
  • a12146215d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-10 15:54:46 +0100
  • b731c206f4 GL - physics merge 2 lindaandersson 2014-02-10 15:54:38 +0100
  • 26e151f9b4 Fixed state problem Robin Engman 2014-02-10 15:46:55 +0100
  • b435818567 Added Camera_FPS Dander7BD 2014-02-10 15:19:55 +0100
  • 77eceaf285 Camera_Basic edits Dander7BD 2014-02-10 15:19:42 +0100
  • 1a86ed23cc Float3 SnapAngular compile error fix Dander7BD 2014-02-10 15:19:06 +0100
  • b80f594440 Changed Animated model lanariel 2014-02-10 15:11:33 +0100
  • c75493b6ce GL - Levelformat updated 3.0 with new format! Sam Mario Svensson 2014-02-10 14:58:39 +0100
  • 8ff81fb06a Fixed compatability with Gamelogic lanariel 2014-02-10 14:54:54 +0100
  • 1b5e8e11cb Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-10 14:52:46 +0100
  • 6d7893c6e9 GL - merge with physics lindaandersson 2014-02-10 14:52:34 +0100
  • 55a2c6593c Added states Robin Engman 2014-02-10 14:50:40 +0100
  • 49d29d87a5 GL - merge with bullet physics and updated server lindaandersson 2014-02-10 14:41:43 +0100
  • 7167d042ac Merge remote-tracking branch 'origin/GameLogic' into Graphics lanariel 2014-02-10 14:41:04 +0100
  • bd8722f107 Options for rigid bodies are now set directly Robin Engman 2014-02-10 14:39:45 +0100
  • 77c3ba06aa Framerate fix in release lanariel 2014-02-10 14:39:26 +0100
  • 30196aebc2 Float3 SnapAngularAxis fix Dander7BD 2014-02-10 14:30:15 +0100
  • 8547d17d0f Friction and restitution is now set Robin Engman 2014-02-10 14:22:10 +0100
  • c18eb668aa Added more data for bodies and added cylinder Robin Engman 2014-02-10 14:18:45 +0100