Commit Graph

103 Commits

Author SHA1 Message Date
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
Dander7BD 4f14c5662e Frustrum::Split & Frustrum::WriteToByte edited
Their paramlists did not follow coding practice standard. Now corrected.
Old versions still available as inline methods and is marked DEPRECATED.
2013-11-10 13:34:35 +01:00
lanariel c021187db9 Fixed OysterGraphics to compile.
New baseline for engine.
2013-11-10 03:19:46 +01:00
lanariel 9edd98d2b9 Fixed OysterGraphics Projects Settings 2013-11-10 02:39:11 +01:00
Dander7BD 065352e898 Merge branch 'Collision3D' 2013-11-10 02:28:46 +01:00
Dander7BD 7cf658f9a5 oops .. missed including these in the last one 2013-11-10 02:28:07 +01:00
Dander7BD 2cb74c8d19 Major update of Collision in OysterPhysics3D
Works with Misc and OysterMath now. Builds for all platforms
Follows code standard
Needs more documentation
Needs testing
+ fixed some project settings Dennis forgot
2013-11-10 02:27:16 +01:00
Dander7BD f2ab3da7b9 Merge branch 'Collision3D' 2013-11-10 00:18:10 +01:00
Dander7BD 036224f812 Behöver uppdatera Masterns' LinearMath snabbt 2013-11-10 00:17:28 +01:00
Dander7BD 2ff7e4d687 Merge remote-tracking branch 'origin/master' into Collision3D 2013-11-10 00:01:35 +01:00
Dander7BD a16f311751 Merge branch 'Collision3D' 2013-11-10 00:01:07 +01:00
Dander7BD 8d12b415d3 Minor changes
Needed to merge->rebranch to get the new UniquePointer
2013-11-09 23:58:48 +01:00
Dander7BD 44634d67b1 Misc updated and fixed
Follows coding practice doc now.
missing documentation
Added feature: Utility::Memory::UniquePointer
2013-11-09 23:36:38 +01:00
Dander7BD 0ad4bca1b4 Oops .. cpp were needed afterall
* Turns out that VS wont generate a lib file if there is no cpp file.
* last letter in all FloatN::standard_unit_C constants were in
uppercase. Breach against documented coding practice. (N = 2..4, C =
{x,y,z,w} )
2013-11-09 14:59:10 +01:00
Dander7BD 60f448e97a Oystermath updated
Needs to be tested though.
removed OysterMath.cpp because it was not needed anymore
2013-11-09 01:23:30 +01:00
dean11 426a45a47c Added Gamelogic project 2013-11-07 14:20:05 +01:00
dean11 e7c3d1603d Added *.filters files, removed from .ignore 2013-11-07 11:03:31 +01:00
dean11 53b1908377 Updated gitIgnore and added project files 2013-11-07 10:56:31 +01:00
dean11 9ee656d270 New initial commit with reorganized structer 2013-11-06 22:52:00 +01:00
CarlDenisAndersen 94c1ae23f1 Deleted old files 2013-11-06 15:05:35 +01:00