Commit Graph

  • 50d28a5784 Misc - Still having problems with template with eventhandler. Pontus Fransson 2014-02-04 08:46:20 +0100
  • 1f28c05983 GL - added jump lindaandersson 2014-02-03 16:30:47 +0100
  • 03385f486b Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-03 16:22:11 +0100
  • cf73524e3b Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-03 16:21:57 +0100
  • e21cfe4cd4 GL - merge with Erik lindaandersson 2014-02-03 16:21:48 +0100
  • 2c3b1e5038 GL - using real dmg algorithm Erik Persson 2014-02-03 16:20:50 +0100
  • 358cddfd9a SnapAngularAxis fix Dander7BD 2014-02-03 16:20:16 +0100
  • ab962eea99 GL - added error check lindaandersson 2014-02-03 16:20:05 +0100
  • 7f29b62c6f GL - YOU CAN NOW SHOOT STUFF YAAAAY Erik Persson 2014-02-03 16:19:24 +0100
  • c08c3d2b53 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-03 15:52:15 +0100
  • a3886c4f1f GL - added models and started to fix camera movement lindaandersson 2014-02-03 15:52:00 +0100
  • 8b0e1b2426 Big patch! New feature :) Dander7BD 2014-02-03 15:48:42 +0100
  • d77b3d92d8 GL - using movetolimbo in massdriver pickup functionallity Erik Persson 2014-02-03 15:45:48 +0100
  • f1f56fc769 Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-02-03 15:38:36 +0100
  • 99b041f165 GL - first implementation of weapons forcepull with pickup functionallity Erik Persson 2014-02-03 15:32:46 +0100
  • dc5b408196 Network - Updated network api with comment. Pontus Fransson 2014-02-03 15:32:20 +0100
  • f527d329a2 Added limbo functionality Robin Engman 2014-02-03 15:15:47 +0100
  • e7fee8b2e7 GL - Updated LevelLoader. Added lights. Pontus Fransson 2014-02-03 14:50:15 +0100
  • 34f58d4140 Anim Testing lanariel 2014-02-03 12:09:11 +0100
  • b8e6b83148 Momentum "fall-off" added Robin Engman 2014-02-03 11:10:04 +0100
  • 8f234611d2 GL - mergeissues fixed Erik Persson 2014-02-03 10:48:12 +0100
  • 50d895d37c Applied friction Robin Engman 2014-02-03 10:45:25 +0100
  • ef71b365ab asd Erik Persson 2014-02-03 10:42:40 +0100
  • 9671eb8ee9 Misc - Having problems with template with events. Pontus Fransson 2014-02-03 10:41:54 +0100
  • 33b69525e0 GameServer - 1 file was missed on commit... Dennis Andersen 2014-01-31 22:53:33 +0100
  • a673e64694 GameServer - Pre-merge with graphic Dennis Andersen 2014-01-31 22:52:52 +0100
  • 5aede62af6 Gameserver - Merge with gamelogic Dennis Andersen 2014-01-31 22:36:43 +0100
  • 83ca3c2ff2 GL - remove buttons from GL branch lindaandersson 2014-01-31 16:43:18 +0100
  • 5b263caccd GL - merge with GL lindaandersson 2014-01-31 16:42:25 +0100
  • 89a538e887 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-31 16:33:32 +0100
  • e327f64702 GL - can play with two characters lindaandersson 2014-01-31 16:33:16 +0100
  • 069acee8cc Anim Error lanariel 2014-01-31 16:29:50 +0100
  • fabf471e76 Removed malign obsolete hack fix Dander7BD 2014-01-31 15:58:02 +0100
  • 6f264f5e7b Misc - EventHandler fixed all errors. Pontus Fransson 2014-01-31 15:38:12 +0100
  • 0ae551f2d8 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-31 15:31:03 +0100
  • 8f576c9a75 Removed malign obsolete hack fix Dander7BD 2014-01-31 15:30:23 +0100
  • e82e61374a Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-31 15:18:19 +0100
  • 7b503bcb52 GL - working with snap lindaandersson 2014-01-31 15:17:09 +0100
  • b3656a0527 Gravity fix Dander7BD 2014-01-31 15:15:08 +0100
  • e7d592e71a Merge branch 'GameLogic-MessageHandler' of https://github.com/dean11/Danbias into GameLogic-MessageHandler Pontus Fransson 2014-01-31 15:07:55 +0100
  • dbe8b4706b Misc - Changed to no template/template Pontus Fransson 2014-01-31 15:06:30 +0100
  • e76dfc73f2 Misc - EventButton changed to inheritance Sam Mario Svensson 2014-01-31 15:06:25 +0100
  • c318223bcf Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-31 14:41:24 +0100
  • 2a816469d5 SnapAngularAxis fix Dander7BD 2014-01-31 14:40:09 +0100
  • d5f285c089 Misc - Test Pontus Fransson 2014-01-31 14:31:27 +0100
  • 26fed11910 Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-31 14:30:53 +0100
  • 8f83dcd413 GL- Eventbutton implemented Sam Mario Svensson 2014-01-31 14:29:29 +0100
  • 22d0722dfa SnapAngularFix Dander7BD 2014-01-31 14:29:49 +0100
  • 79872a45ee SnapAngularAxis fix + added overload Dander7BD 2014-01-31 14:27:33 +0100
  • a864ad81e7 Misc - EventHandler, EventCollection updated. Pontus Fransson 2014-01-31 14:16:58 +0100
  • 16f535bfa3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2014-01-31 14:16:32 +0100
  • b753387649 asd Erik Persson 2014-01-31 14:14:20 +0100
  • 16a342da49 GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network Erik Persson 2014-01-31 14:05:52 +0100
  • 57c230d458 GL - will merge with physics lindaandersson 2014-01-31 13:56:22 +0100
  • 7a62121fa0 SnapAngularAxis fix Dander7BD 2014-01-31 13:49:09 +0100
  • ac635ccaef SnapAngularAxis fix Dander7BD 2014-01-31 13:47:40 +0100
  • 190f7e2882 SnapAngularAxis introduced Dander7BD 2014-01-31 13:42:17 +0100
  • c7bc7281d8 Prefix for "sinking" objects Robin Engman 2014-01-31 13:41:06 +0100
  • d6769ac62f Misc - EventHandler, EventCollection Pontus Fransson 2014-01-31 13:06:11 +0100
  • 8ee8374169 Misc - EventHandler Pontus Fransson 2014-01-31 11:28:01 +0100
  • e3376eba7c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-01-31 11:11:48 +0100
  • da9b615994 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-01-31 11:10:35 +0100
  • 21cb7731b7 Merge with GL Dennis Andersen 2014-01-31 11:03:45 +0100
  • cac38decca MISC - Fixed a bug in ResourceLoader Dennis Andersen 2014-01-31 11:00:04 +0100
  • fa7f400c71 GL - test this robin lindaandersson 2014-01-31 10:58:03 +0100
  • c9c562fda6 GameServer - Added some functionality in windowshell Dennis Andersen 2014-01-31 10:50:38 +0100
  • e718048f7f GL - Lan State Pontus Fransson 2014-01-31 10:49:52 +0100
  • 4df6b849a6 GL - working with new models and server lindaandersson 2014-01-31 09:39:44 +0100
  • 34b6b29fc4 GameLogic - Merged with GL Dennis Andersen 2014-01-31 09:24:16 +0100
  • 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2014-01-31 09:17:54 +0100
  • a6ff6eba42 GL - merge with server lindaandersson 2014-01-31 09:14:55 +0100
  • c30db71e94 GL - more testing and changes to the level and using the physics API Erik Persson 2014-01-31 09:12:15 +0100
  • 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. Dennis Andersen 2014-01-31 08:41:08 +0100
  • cec022b381 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-01-30 23:24:16 +0100
  • 3c1eed0f3f GL - Added LanMenuState Pontus Fransson 2014-01-30 23:23:37 +0100
  • 3b8a8e9c09 Network - Fixed receiving parts of packages. Pontus Fransson 2014-01-30 23:22:46 +0100
  • bb8e92ec36 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-30 15:20:44 +0100
  • 0aa39275e3 GL - only client with server update server. Update recieverfunction lindaandersson 2014-01-30 15:20:35 +0100
  • ae6a570a12 GL - trying to make walking nice Erik Persson 2014-01-30 15:12:53 +0100
  • 4167b6a93b GL- merge fix Sam Mario Svensson 2014-01-30 15:02:02 +0100
  • 77932ecce7 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-01-30 14:59:38 +0100
  • 2bb2d0cd56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-30 14:58:30 +0100
  • 0a04c1c9f1 Added document Dander7BD 2014-01-30 14:52:40 +0100
  • e043d03a59 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-01-30 14:40:04 +0100
  • 713dc269d1 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-30 14:18:00 +0100
  • 05e24d0514 GL - uppdate server lindaandersson 2014-01-30 14:17:50 +0100
  • 09f39ec26d GameServer - Added acces directly to clients in network session Dennis Andersen 2014-01-30 14:15:25 +0100
  • 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic Sam Mario Svensson 2014-01-30 13:44:18 +0100
  • c78bbba3eb GL- Removed commentet unnecessary code Sam Mario Svensson 2014-01-30 13:33:59 +0100
  • 2a69af5c9f GL - merge lindaandersson 2014-01-30 12:01:48 +0100
  • 1ccf98e3eb GL - added loginstate lindaandersson 2014-01-30 11:58:44 +0100
  • d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-30 11:13:42 +0100
  • 323b7322fa GL - testing Erik Persson 2014-01-30 11:11:45 +0100
  • 05740665da GameServer - Fixed a small error regarding not reaching some data Dennis Andersen 2014-01-30 11:11:04 +0100
  • a249e7ede9 GL - merge with new serverAPI lindaandersson 2014-01-30 10:57:44 +0100
  • 09693c7f35 GL - merge lindaandersson 2014-01-30 09:40:58 +0100
  • 7d9d8e4615 GL - added jump lindaandersson 2014-01-30 09:07:56 +0100
  • fa29cd7307 GameServer - Merged with GameLogic Dennis Andersen 2014-01-30 00:19:00 +0100
  • c593fd2225 Merge remote-tracking branch 'origin/Physics' into GameLogic lindaandersson 2014-01-29 16:02:11 +0100
  • 44ba45bcc2 GL - added setCollisionfunc to object lindaandersson 2014-01-29 16:01:56 +0100