NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 8bbdb1156a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-14 11:34:47 +0100
  • 2bfcda3b50 MousePos available in all relevant states Dander7BD 2014-02-14 11:32:16 +0100
  • 9dd7aa2b5d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-14 11:28:02 +0100
  • 53f4848ea1 GL - merge with graphics. no SSAO. no TextRendering lindaandersson 2014-02-14 11:27:52 +0100
  • 22f8a6c9ea Revert "Revert this" Dander7BD 2014-02-14 11:27:23 +0100
  • 6f9483041b Temporary mouse pos add + other stuff Dander7BD 2014-02-14 11:26:50 +0100
  • 431faff684 Merge Conficts btween projects lanariel 2014-02-14 11:17:30 +0100
  • 7791dc076e GL - static and dynamic objects can now set extraDamageOnCollision in constructor Erik Persson 2014-02-14 11:16:02 +0100
  • 975894b037 GL - init objects lindaandersson 2014-02-14 11:11:49 +0100
  • 9038277a2c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-14 11:07:11 +0100
  • 1a01dbd760 GL - initiating objects lindaandersson 2014-02-14 11:07:03 +0100
  • 8d8fa78da0 GL - fixed portal constructor Erik Persson 2014-02-14 11:04:01 +0100
  • c5e4580ada GL - include error fixed Erik Persson 2014-02-14 10:59:33 +0100
  • 30317ec365 Moved project to Stand alone server folder. Pontus Fransson 2014-02-14 10:59:01 +0100
  • f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector Erik Persson 2014-02-14 10:56:38 +0100
  • 5579b8a73c Merge branch 'StandaloneServer' of https://github.com/dean11/Danbias into StandaloneServer Pontus Fransson 2014-02-14 10:49:04 +0100
  • e7cd44e75e Server - Added CLI project Pontus Fransson 2014-02-14 10:48:49 +0100
  • 4f849bddb3 Folder and Launcher Added lanariel 2014-02-14 10:46:23 +0100
  • 78f47cd3ae Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-14 10:34:00 +0100
  • de6c5a1185 Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer Dander7BD 2014-02-14 10:32:56 +0100
  • 50d07a102d GL - initiate lvl lindaandersson 2014-02-14 10:32:41 +0100
  • 76f0b712b1 Revert this Dander7BD 2014-02-14 10:32:25 +0100
  • 5eec9fdd75 compilation fix Dander7BD 2014-02-14 10:11:39 +0100
  • 1fc6f16409 GL - rotation testing lindaandersson 2014-02-14 10:09:03 +0100
  • 8e78308820 New Vertex format NOT STABLE UNTIL NEW MODELS lanariel 2014-02-14 10:08:39 +0100
  • 5defe7c0f7 GL - fixed compile errors Erik Persson 2014-02-14 10:08:29 +0100
  • 14661a86f8 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-14 10:02:25 +0100
  • 59697bfcea GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction Erik Persson 2014-02-14 09:53:02 +0100
  • f6d97054cf Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer Dander7BD 2014-02-14 09:55:07 +0100
  • b9895f8c7f All states fix Dander7BD 2014-02-14 09:54:05 +0100
  • d4139e265e MainState fix Dander7BD 2014-02-14 09:46:17 +0100
  • 06ae4d29dd GL - Fixed some warnings. Pontus Fransson 2014-02-14 09:44:21 +0100
  • 49fc55be60 Textfield and Bunch of fixes Dander7BD 2014-02-14 09:40:53 +0100
  • 063f57133f Set mass added Robin Engman 2014-02-14 08:29:49 +0100
  • ff951d2183 Moving fixed Robin Engman 2014-02-13 19:49:33 +0100
  • 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. lindaandersson 2014-02-13 16:33:26 +0100
  • e71264b806 New text render lanariel 2014-02-13 16:27:53 +0100
  • 3b225ea054 Merge Dander7BD 2014-02-13 15:32:54 +0100
  • 805f90d926 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-13 15:25:07 +0100
  • 491dc88bd1 Fixed Glow Mapping lanariel 2014-02-13 15:24:19 +0100
  • 3139d6d409 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer Dander7BD 2014-02-13 15:21:49 +0100
  • d01acbcbe0 Misc - Added text and textcolor to buttons, seperate render function. Pontus Fransson 2014-02-13 15:21:05 +0100
  • 95e08e84c3 Network - Overloaded Connect in NetworkClient to use std::wstring. Pontus Fransson 2014-02-13 13:51:27 +0100
  • cccaf68672 premerge Dander7BD 2014-02-13 15:21:02 +0100
  • d705e73dc5 Added LobbyAdminState + other stuff Dander7BD 2014-02-13 13:30:14 +0100
  • d60fd65805 Overhaul LanMenuState Dander7BD 2014-02-13 10:14:44 +0100
  • bd6b531418 GL - added Portal and started on crystalformation Erik Persson 2014-02-13 09:58:14 +0100
  • 6c667f32cd some fixes Dander7BD 2014-02-13 09:45:45 +0100
  • c2f67f6f77 Merge branch 'Camera-test-merge' into Camera Dander7BD 2014-02-13 08:49:45 +0100
  • 45f6d983ad Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge Dander7BD 2014-02-13 08:48:34 +0100
  • 8744c751a8 resized buttons Dander7BD 2014-02-13 08:43:47 +0100
  • 5d4d66cf06 stuff Dander7BD 2014-02-12 17:20:42 +0100
  • 63bc360645 stuff Dander7BD 2014-02-12 16:31:15 +0100
  • 5fbb901c69 Model Tint added lanariel 2014-02-12 16:21:46 +0100
  • 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. Pontus Fransson 2014-02-12 15:44:27 +0100
  • 7a218c61d8 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-12 15:12:28 +0100
  • b9c4fe1849 GL - Eventhandler does not delete collections any more. Pontus Fransson 2014-02-12 15:12:01 +0100
  • 587fe62b8e Removed obosolete functions Dander7BD 2014-02-12 15:05:36 +0100
  • 573a0109e3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Sam Mario Svensson 2014-02-12 15:03:40 +0100
  • 492205b24a Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera lanariel 2014-02-12 15:02:57 +0100
  • 20c4833126 Fix start render lanariel 2014-02-12 15:02:29 +0100
  • 9d9481b87a stuff Dander7BD 2014-02-12 14:52:31 +0100
  • 64b2d688bd Försök till merge men det är cp Sam Mario Svensson 2014-02-12 14:48:58 +0100
  • 6cbec3e2ac GL - jumppad testing Erik Persson 2014-02-12 14:45:10 +0100
  • 5ff8661843 Bugs and Compilation errors dealt with Dander7BD 2014-02-12 14:33:56 +0100
  • 14d492f22e changes in massdriver Erik Persson 2014-02-12 14:00:53 +0100
  • 7c44e8ba17 GL - added jumppad model and rigidbody lindaandersson 2014-02-12 13:37:21 +0100
  • 5e1bc2264c Fixed set position Robin Engman 2014-02-12 14:10:17 +0100
  • b95e1d6b7a changes in massdriver Erik Persson 2014-02-12 14:00:53 +0100
  • 8f627f8a71 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 13:57:01 +0100
  • 777c1183c5 Fixed set transformation Robin Engman 2014-02-12 13:55:43 +0100
  • 11b6f6eddc Fixed Spec coefficient lanariel 2014-02-12 13:53:52 +0100
  • 97c3097fc7 GL - added jumppad model and rigidbody lindaandersson 2014-02-12 13:37:21 +0100
  • d7102fe7e6 Merge remote-tracking branch 'origin/GamePhysics' into Camera-test-merge Dander7BD 2014-02-12 13:30:03 +0100
  • 3e181cd34e post merge Dander7BD 2014-02-12 13:27:34 +0100
  • 60d1fdba97 Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge Dander7BD 2014-02-12 13:23:50 +0100
  • d4fa29e8a8 Fixed project files Robin Engman 2014-02-12 13:21:59 +0100
  • 14077c6d4e GL - moved camera for testing lindaandersson 2014-02-12 13:17:27 +0100
  • 88341eaff7 Fixed incorrect settings for vld in some projects Dander7BD 2014-02-12 13:14:28 +0100
  • 25590566d1 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 13:13:40 +0100
  • b34df93e49 GL - Massdriver updates Erik Persson 2014-02-12 13:12:51 +0100
  • 57ef395bd2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 13:11:43 +0100
  • e8536cc5d4 GL - removed before collision event, sending look and right dir to server lindaandersson 2014-02-12 13:11:35 +0100
  • 26a6bde42a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 12:43:08 +0100
  • 93453529b7 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 12:39:11 +0100
  • 15cc7cb85e Fixed collision for object not in world Robin Engman 2014-02-12 12:38:52 +0100
  • 6bbb988268 Merge remote-tracking branch 'origin/GamePhysics' into GameLogic Erik Persson 2014-02-12 12:37:02 +0100
  • 1841685edb Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GamePhysics Robin Engman 2014-02-12 12:34:04 +0100
  • cc4e3f947c GL - playermovement fixed, can walk in diagonal directions lindaandersson 2014-02-12 12:16:16 +0100
  • 134994447f Fixed compilation error Dander7BD 2014-02-12 12:11:23 +0100
  • da5b9c7306 Nomal Mapping For TA lanariel 2014-02-12 12:05:27 +0100
  • d21a03f621 Merge remote-tracking branch 'origin/GamePhysics' into Camera Dander7BD 2014-02-12 11:56:02 +0100
  • 295568d5e7 Fixed incorrect project settings Dander7BD 2014-02-12 11:54:47 +0100
  • 377c752c46 Fixed Target Build table in solution file Dander7BD 2014-02-12 11:50:36 +0100
  • 786c6bb3c1 Merge remote-tracking branch 'origin/GamePhysics' into Camera Dander7BD 2014-02-12 11:45:48 +0100
  • 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-02-12 11:36:19 +0100
  • fa16f71a26 GL - forgot to commit files lindaandersson 2014-02-12 11:36:08 +0100
  • f2a444507c GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. Pontus Fransson 2014-02-12 11:35:48 +0100
  • c1757eef21 GL - moving character lindaandersson 2014-02-12 11:35:34 +0100
  • 3a80a71143 GL - working on weapon Erik Persson 2014-02-12 11:32:30 +0100