started
Collision classes and functions are added
CollisionWorks! see description

if you can't get the program to work then there are probably files
missing that are on my comp so you'll probs have to text me.
few things
libs
Merge branch 'SceneConstruction'

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.pdb
	source/ogregraphics/Debug/CL.read.1.tlog
	source/ogregraphics/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/FrameListener.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/IObject.obj
	source/ogregraphics/Debug/IScene.obj
	source/ogregraphics/Debug/LinearMotion.obj
	source/ogregraphics/Debug/OgreGraphics.obj
	source/ogregraphics/Debug/RigidBodyObject.obj
	source/ogregraphics/Debug/RotationalMotion.obj
	source/ogregraphics/Debug/SceneManager.obj
	source/ogregraphics/Debug/TestObject.obj
	source/ogregraphics/Debug/TestScene.obj
	source/ogregraphics/Debug/Vector3.obj
	source/ogregraphics/Debug/cl.command.1.tlog
	source/ogregraphics/Debug/link.command.1.tlog
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/link.write.1.tlog
	source/ogregraphics/Debug/stdafx.obj
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
	source/ogregraphics/ogregraphics.vcxproj.filters
It works, just need to figure out why the first person camera always starts at 0, 0, 0.
derp
collision
Working first person camera.
Merge branch 'master' of https://github.com/HATtrick-games/ICT312

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.exp
	source/Debug/ogregraphics.lib
	source/Debug/ogregraphics.pdb
	source/ogregraphics/Debug/CL.read.1.tlog
	source/ogregraphics/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/TestObject.obj
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
derp
New line added in IT Building Scene.
Merge branch 'master' of https://github.com/HATtrick-games/ICT312

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.exp
	source/Debug/ogregraphics.lib
	source/Debug/ogregraphics.pdb
	source/ogregraphics/Debug/CollisionObject.obj
	source/ogregraphics/Debug/CollisionWorldSingleton.obj
	source/ogregraphics/Debug/FrameListener.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/GenericObject.obj
	source/ogregraphics/Debug/IObject.obj
	source/ogregraphics/Debug/IScene.obj
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/LinearMotion.obj
	source/ogregraphics/Debug/OgreGraphics.obj
	source/ogregraphics/Debug/RigidBodyObject.obj
	source/ogregraphics/Debug/RotationalMotion.obj
	source/ogregraphics/Debug/SceneManager.obj
	source/ogregraphics/Debug/TemporaryPlayerObject.obj
	source/ogregraphics/Debug/TestObject.obj
	source/ogregraphics/Debug/TestScene.obj
	source/ogregraphics/Debug/Vector3.obj
	source/ogregraphics/Debug/cl.command.1.tlog
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/stdafx.obj
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
fixed
Tables in place.
Merge branch 'master' of https://github.com/HATtrick-games/ICT312

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.exp
	source/Debug/ogregraphics.lib
	source/Debug/ogregraphics.pdb
	source/ogregraphics/CollisionWorldSingleton.cpp
	source/ogregraphics/Debug/CL.read.1.tlog
	source/ogregraphics/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/CollisionWorldSingleton.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
	source/ogregraphics/Game.cpp
commit
moar boxes
Sofas in