lanariel
ff1695497f
Debug From Home
2013-11-21 18:31:16 +01:00
lanariel
3ef36547a9
Merge branch 'RigidBody' of https://github.com/dean11/Danbias into Graphics
2013-11-21 15:21:03 +01:00
Dander7BD
dc9f4597e2
Added OrientationMatrix build methods + other stuff
2013-11-21 15:19:32 +01:00
lanariel
b419849fd4
Merged Obj and Engine Restructure
2013-11-21 14:17:03 +01:00
lanariel
9a0206bf35
More
2013-11-21 14:14:30 +01:00
lanariel
7b31377be8
Engine Sructured
2013-11-21 13:50:43 +01:00
Tobias Grundel
f08e9491ed
ObjReader
2013-11-21 13:45:11 +01:00
Tobias Grundel
ddbc808977
Re-fixed ObjReader
2013-11-21 12:47:47 +01:00
Dander7BD
938826b84e
Forgot to test compile RigidBody
...
Compile Errors is fixed
2013-11-21 11:47:20 +01:00
Dander7BD
f51d2312dd
RigidBody DONE
...
Needs only testing for confirmations
2013-11-21 11:39:11 +01:00
lanariel
a94429fd9d
Fixed Unresolved Externals from Hiarchy Flattening
2013-11-21 10:02:17 +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
Robin Engman
da6eda2a8c
Commented non-functional features.
2013-11-20 13:48:54 +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
dean11
33e7afabcd
Restructured folders to give a flexible solution for dependencies and added to ignore list
2013-11-18 15:41:09 +01:00