Commit Graph

  • eb39008529 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-10 14:00:24 +0100
  • c87bab8808 GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) lindaandersson 2014-02-10 14:00:14 +0100
  • a3ba67e3c2 Fixed release compile and basic anim lanariel 2014-02-10 13:59:45 +0100
  • 05aa3cc9e9 Added on move functionality Robin Engman 2014-02-10 13:55:01 +0100
  • 4fb684019c Added ScalingMatrix function Dander7BD 2014-02-10 13:41:37 +0100
  • e5e99924d9 Updates for objects Robin Engman 2014-02-10 13:25:28 +0100
  • 0153be16d5 Added VS Filter Camera Dander7BD 2014-02-10 13:03:21 +0100
  • 800d5d0505 Camera_Basic stuff Dander7BD 2014-02-10 13:01:46 +0100
  • ba0d6ca73a Amazing merge with server Robin Engman 2014-02-10 12:42:31 +0100
  • da58165645 Added Basic camera Dander7BD 2014-02-10 12:02:48 +0100
  • abdb820b09 Added RotationMatrix for Float3x3 Dander7BD 2014-02-10 11:59:35 +0100
  • d0f36302cf Fixed 2d render comment lanariel 2014-02-10 11:53:44 +0100
  • c191c96ea8 Added bullet physics .lib Robin Engman 2014-02-10 11:24:38 +0100
  • 8c31c16e4d Commented away Robin Engman 2014-02-10 11:21:57 +0100
  • c16851f024 Using only lib and include Robin Engman 2014-02-10 11:14:45 +0100
  • 427ec3b716 Major overhaul fix Robin Engman 2014-02-10 10:52:08 +0100
  • adb273bd5b Fixed las bug in 2d rendering lanariel 2014-02-10 09:35:03 +0100
  • e6e56ba21b Done with 2D lanariel 2014-02-10 01:03:10 +0100
  • 99146430a4 Major overhaul Robin Engman 2014-02-09 21:24:09 +0100
  • 14bf3ede86 Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. Dennis Andersen 2014-02-09 18:58:14 +0100
  • 4abfdd70fe Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. Dennis Andersen 2014-02-09 18:58:07 +0100
  • 310ed3dfc5 GameServer - Multiplayer now working properly Dennis Andersen 2014-02-09 16:42:26 +0100
  • fb9e33fc9b Fixed warnings Robin Engman 2014-02-08 14:26:18 +0100
  • 1121bbdebf TODO:: lanariel 2014-02-07 16:51:35 +0100
  • 92447a6352 Very cool stuff Robin Engman 2014-02-07 16:01:43 +0100
  • 1de325c5a6 Fixed cleaning up Deffered.cpp lanariel 2014-02-07 15:52:07 +0100
  • ab9f81ac60 Collisions work better Robin Engman 2014-02-07 15:38:53 +0100
  • 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. Pontus Fransson 2014-02-07 15:20:34 +0100
  • fef40f58f9 GL - Fixed memory leaks in LevelLoader. Pontus Fransson 2014-02-07 14:44:25 +0100
  • 9bdf258c5d GL - Updated LevelLoader 2.0. Bounding volume 1.0 Pontus Fransson 2014-02-07 14:12:54 +0100
  • 898fc883e9 Merge branch 'Graphics2D' into Graphics lanariel 2014-02-07 13:48:46 +0100
  • d9133f459a 2d Almost working lanariel 2014-02-07 13:47:09 +0100
  • 016bf37459 First commit save jebuz Tobias Grundel 2014-02-07 13:46:55 +0100
  • 9a0f363146 framerate double lanariel 2014-02-07 13:15:38 +0100
  • 1633129a2c Commit to Dennis Robin Engman 2014-02-07 13:09:44 +0100
  • 5119b287d6 Small progress lanariel 2014-02-07 11:52:51 +0100
  • b225c53611 More cool stuff Robin Engman 2014-02-07 11:43:18 +0100
  • bab3ab0a78 Shader Restructure lanariel 2014-02-07 11:09:59 +0100
  • a7480ebf70 Proper Animation lanariel 2014-02-07 08:34:01 +0100
  • f372d3e05b Some cool stuff Robin Engman 2014-02-06 21:15:28 +0100
  • bfa54b9ccd Fixed Anim lanariel 2014-02-05 17:13:23 +0100
  • aafbfa01f3 Calculate Graphics Memory Usage lanariel 2014-02-05 16:54:57 +0100
  • 51711b86e3 Fixed Animate Skeleton, TODO Fix Skinning lanariel 2014-02-05 16:00:28 +0100
  • 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-05 15:54:56 +0100
  • 91db71fe0e GL - 20 boxes and a house lindaandersson 2014-02-05 15:54:48 +0100
  • a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-05 15:47:00 +0100
  • b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. Pontus Fransson 2014-02-05 15:46:45 +0100
  • 201a07f0dc GameServer - Merged with GameLogic Dennis Andersen 2014-02-05 15:16:31 +0100
  • 70a2cf27e3 GL - almost ok, at least on the top of the world lindaandersson 2014-02-05 11:53:38 +0100
  • 426444ca34 GL - added more boxes and weaponfunctionality lindaandersson 2014-02-05 11:46:04 +0100
  • 30c89ed330 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-05 09:06:44 +0100
  • 6818dda2b9 GL - testing lindaandersson 2014-02-05 09:06:33 +0100
  • 60736c52fe Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-02-04 22:34:07 +0100
  • db822fa832 GameServer - Merged with gamelogic Dennis Andersen 2014-02-04 22:33:39 +0100
  • b7f550859d GameServer - Merge with GameLogic Dennis Andersen 2014-02-04 22:13:07 +0100
  • 98644e3fa0 Minimised to potential skinning problem Robin Engman 2014-02-04 17:59:04 +0100
  • fb4025eb1a bug fix Dander7BD 2014-02-04 16:56:31 +0100
  • ac278555ea Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 16:39:21 +0100
  • b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 16:39:11 +0100
  • ec4d34b131 GL - added error checking lindaandersson 2014-02-04 16:39:01 +0100
  • c8e8d3510d Added debug traps Dander7BD 2014-02-04 16:38:42 +0100
  • 68dc5be9cb added lost rebound deltatime compensation Dander7BD 2014-02-04 16:33:52 +0100
  • 168539da08 Gameserver - Fixed minor merging isues Dennis Andersen 2014-02-04 16:27:18 +0100
  • b17b542ebc Gameserver - Fixed minor merging isues Dennis Andersen 2014-02-04 16:26:48 +0100
  • 4ad86ae83b GL - Added jumppad(implemented but not tested) Erik Persson 2014-02-04 16:24:37 +0100
  • 4de809a952 Added Resource support lanariel 2014-02-04 16:20:42 +0100
  • 6e0dd63d64 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 16:11:01 +0100
  • 1952ff9aba more fixes of potential bugs in Physics collision handling Dander7BD 2014-02-04 16:10:18 +0100
  • d364456189 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 16:08:53 +0100
  • d8c7220569 GL - added some testing things in player and more objects to the world lindaandersson 2014-02-04 16:08:28 +0100
  • de8c76f051 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect Dennis Andersen 2014-02-04 16:07:10 +0100
  • 61178e2803 GameServer - Fixed bugg where threads touched same data, n players should now be able to connect Dennis Andersen 2014-02-04 16:06:59 +0100
  • 9622d37d3f bug fixes in Physics collision handling Dander7BD 2014-02-04 15:43:17 +0100
  • e13410dced Fixed debug data, points in right direction lanariel 2014-02-04 15:06:50 +0100
  • 97a3792bff Anim Test Not working Joints lanariel 2014-02-04 14:59:51 +0100
  • b810fa1586 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-04 14:31:00 +0100
  • 8834f6a2ec GL - LevelLoader update. Pontus Fransson 2014-02-04 14:30:45 +0100
  • 502d0c8586 GL - actually fixed respawning(turned off) Erik Persson 2014-02-04 14:07:02 +0100
  • ad16d51f75 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 14:02:03 +0100
  • 15798bfca9 minor bug found and fixed in rebound Dander7BD 2014-02-04 14:00:33 +0100
  • bd9e4599cb GL - fixed respawning and also fixed weapon Erik Persson 2014-02-04 13:58:37 +0100
  • 9efa4fcb23 Commit error fix Dander7BD 2014-02-04 13:08:03 +0100
  • 54deef7f2b Project file fixes for GL Dander7BD 2014-02-04 12:16:06 +0100
  • 9d08ac7b98 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 11:54:44 +0100
  • f88e16c581 GL - merge lindaandersson 2014-02-04 11:53:40 +0100
  • e859df65d3 GL - compiles Erik Persson 2014-02-04 11:51:31 +0100
  • e2bac798c4 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 11:50:51 +0100
  • fa02814ca0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 11:50:40 +0100
  • d54cffee8e GL - camera follows player lindaandersson 2014-02-04 11:50:15 +0100
  • e39eb5fb4b RigidBody update adjusted Dander7BD 2014-02-04 11:48:50 +0100
  • 2897305dd0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-04 11:36:24 +0100
  • 1261ed734f GL - Updated level loader. Pontus Fransson 2014-02-04 11:36:10 +0100
  • 3bf9f59f5a GL - Player dies and respawns Erik Persson 2014-02-04 11:13:02 +0100
  • 07e8624807 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 10:39:09 +0100
  • 00400a7d32 GL - camera testing lindaandersson 2014-02-04 10:38:59 +0100
  • 42cb1dab1d API::SimpleBodyDescription API::SphericalBodyDescription fix Dander7BD 2014-02-04 10:32:43 +0100
  • fcadd5b4c3 GL - testing physics lindaandersson 2014-02-04 10:29:02 +0100
  • 9817f844ef Rebound adjustment trial Dander7BD 2014-02-04 10:23:14 +0100
  • 6e9423670f Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-04 08:56:32 +0100
  • d4bd72bb4a Friction fix Dander7BD 2014-02-04 08:55:57 +0100