NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
172 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

172 Commits

Author SHA1 Message Date
Linda Andersson a220faf7b6 Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:05:48 +01:00
Linda Andersson 8f0d6ec139 core update 2013-11-21 10:05:40 +01:00
Linda Andersson 2c395807cd Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:04:47 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00
Linda Andersson 229741e707 merge with graphics 2013-11-21 09:46:26 +01:00
lanariel dc9c448150 Fix compile Errors 2013-11-21 09:43:53 +01:00
Dander7BD d90074d909 Minor changes 
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
 2013-11-20 17:40:12 +01:00
Dander7BD 8dee300dc8 Merge remote-tracking branch 'origin/Physics' into RigidBody 2013-11-20 17:01:12 +01:00
Dander7BD baec4b0392 Box updated 
orientation Matrix have been split into a rotation Matrix and a
translation Vector
 2013-11-20 16:59:12 +01:00
lanariel 16be725743 Project Include Model 2013-11-20 16:55:13 +01:00
lanariel adfec528bf Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
Linda Andersson 96245fc52e merged with wapon, static and dynamic 2013-11-20 16:01:39 +01:00
Linda Andersson 28da371b80 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-20 15:47:31 +01:00
Linda Andersson 68d516cc86 adding IGame interface 2013-11-20 15:47:11 +01:00
Erik Persson 717b425147 split worldObject into dynamic and static types 2013-11-20 14:25:37 +01:00
Erik Persson abf81b7c3c added weapon and connected it to player 
changed player
 2013-11-20 14:18:31 +01:00
Robin Engman da6eda2a8c Commented non-functional features. 2013-11-20 13:48:54 +01:00
Erik Persson ce9746f10c worldObject update 2013-11-20 12:23:45 +01:00
Dander7BD 687fb6835a TangentialImpulseAcceleration 
fixed selfexplanatory documentation
 2013-11-20 11:58:27 +01:00
Robin Engman 80301ae02e Robin's fix part of RigidBody.cpp DONE 2013-11-20 11:48:54 +01:00
Dander7BD 2149ca8ab5 Dans fix part of RigidBody.cpp DONE 2013-11-20 11:44:54 +01:00
Dander7BD e41d16cc03 Task assignment in RigidBody.cpp 2013-11-20 11:36:17 +01:00
Dander7BD b8d0a106b3 Physics branch disaster Patch 
critical changes in Sprint1 branch caused major problems for the physics
patch. Files had to be backed up, Physics branch destroyed along with
it's log data. So that a new Physics branch could be made from the new
Sprint1. This patch is those copied files put back into the new physics
branch. .. logdata and 3hours lost (1h/person)
 2013-11-20 11:09:27 +01:00
lanariel 3512121f52 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/OysterGraphics.vcxproj
	Debug/Tester.ilk
	Debug/Tester.pdb
	OysterGraphics/Core/ShaderManager.cpp
	OysterGraphics/OysterGraphics.vcxproj.filters
	Tester/Debug/CL.read.1.tlog
	Tester/Debug/CL.write.1.tlog
	Tester/Debug/cl.command.1.tlog
	Tester/Debug/link.command.1.tlog
	Tester/Debug/link.read.1.tlog
	Tester/Debug/link.write.1.tlog
	Tester/Tester.vcxproj
 2013-11-20 10:35:00 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
Erik Persson 27e5b07ef6 object and worldObject 2013-11-19 18:35:35 +01:00
Tobias Grundel 86aac0c72a Link error fixed and ObjReader 2013-11-19 13:30:46 +01:00
Erik Persson ea0f3f05b4 added level and player 2013-11-19 11:07:14 +01:00
Erik Persson 33f9a86945 Added Game 
cpp and h files
 2013-11-19 09:52:36 +01:00
dean11 c9e6bbf899 Forgot to update git ignore x) 2013-11-18 15:44:46 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00
lanariel a628d8a488 Merge branch 'master' of https://github.com/dean11/Danbias into Graphics 2013-11-18 14:18:25 +01:00
Dander7BD 7275b52609 Preliminary Rigidbody 
Absolutly not done, but it compiles
 2013-11-18 14:06:27 +01:00
Dander7BD d4b4973d3f GameLogic Properties edited 
Now they will be properly linked to Physics, and everything else Physics
depends on
 2013-11-18 14:06:22 +01:00
Dander7BD 74aee284f9 PhysicsAPI created 2013-11-18 14:06:17 +01:00
lanariel ab70bed60b Shader main Rename 2013-11-15 11:05:19 +01:00
lanariel ed3ad9fef3 GraphicTestTri 2013-11-15 08:41:11 +01:00
Dander7BD 19522d8ff6 References in solution adjusted 
All references to ::Utility::Memory changed to ::Utility::DynamicMemory
 2013-11-13 14:50:08 +01:00
Dander7BD 893e6427a5 UniquePointer and UniqeArray ready to use 
All compile errors fixed.
Tested against Visual Leak detector. No leak detected!
 2013-11-13 14:48:24 +01:00
Dander7BD fa43650439 Forgot to #include the inline implementation file For Utilities 2013-11-13 13:56:25 +01:00
Dander7BD ac1fb8bab9 UniquePointer and UniqueArray 
UniquePointer - removed hazardous members.
UniqueArray - added
All Documented
 2013-11-13 12:07:21 +01:00
lanariel d9bc8ce640 Moved to Graphics Test Environment 2013-11-13 10:27:37 +01:00
Dander7BD 55879138c4 Big Patch 
Tons of stuff like fixing Pär's linking errors
 2013-11-12 12:33:52 +01:00
Dander7BD d5414d1443 Big Pack 2013-11-12 00:10:48 +01:00
Dander7BD 056fadbf79 Merge branch 'master' of https://github.com/dean11/Danbias 2013-11-11 21:16:52 +01:00
Dander7BD f0b464bccf Frustrum fix 2013-11-11 21:14:52 +01:00
lanariel 0ba290a385 Latest updates to Graphics, need to do test run 2013-11-11 20:02:00 +01:00
lanariel 29e45ba113 Excluded Shaders from Project 2013-11-10 17:08:10 +01:00
lanariel d8e5e7b56f Merge branch 'master' of https://github.com/dean11/Danbias 2013-11-10 16:28:17 +01:00
lanariel 2d91e0745f Got Network client and Dependencies to compile 2013-11-10 16:27:46 +01:00