2c395807cd
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
2013-11-21 10:04:47 +01:00
229741e707
merge with graphics
2013-11-21 09:46:26 +01:00
dc9c448150
Fix compile Errors
2013-11-21 09:43:53 +01:00
16be725743
Project Include Model
2013-11-20 16:55:13 +01:00
adfec528bf
Fixing Render Namespace, See, todo in Resources.cpp
2013-11-20 16:51:53 +01:00
96245fc52e
merged with wapon, static and dynamic
2013-11-20 16:01:39 +01:00
28da371b80
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
2013-11-20 15:47:31 +01:00
68d516cc86
adding IGame interface
2013-11-20 15:47:11 +01:00
717b425147
split worldObject into dynamic and static types
2013-11-20 14:25:37 +01:00
abf81b7c3c
added weapon and connected it to player
...
changed player
2013-11-20 14:18:31 +01:00
ce9746f10c
worldObject update
2013-11-20 12:23:45 +01:00
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
425a838f31
Core Update
2013-11-20 10:22:01 +01:00
27e5b07ef6
object and worldObject
2013-11-19 18:35:35 +01:00
86aac0c72a
Link error fixed and ObjReader
2013-11-19 13:30:46 +01:00
ea0f3f05b4
added level and player
2013-11-19 11:07:14 +01:00
33f9a86945
Added Game
...
cpp and h files
2013-11-19 09:52:36 +01:00
c9e6bbf899
Forgot to update git ignore x)
2013-11-18 15:44:46 +01:00
33e7afabcd
Restructured folders to give a flexible solution for dependencies and added to ignore list
2013-11-18 15:41:09 +01:00
a628d8a488
Merge branch 'master' of https://github.com/dean11/Danbias into Graphics
2013-11-18 14:18:25 +01:00
7275b52609
Preliminary Rigidbody
...
Absolutly not done, but it compiles
2013-11-18 14:06:27 +01:00
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
74aee284f9
PhysicsAPI created
2013-11-18 14:06:17 +01:00
ab70bed60b
Shader main Rename
2013-11-15 11:05:19 +01:00
ed3ad9fef3
GraphicTestTri
2013-11-15 08:41:11 +01:00
19522d8ff6
References in solution adjusted
...
All references to ::Utility::Memory changed to ::Utility::DynamicMemory
2013-11-13 14:50:08 +01:00
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
fa43650439
Forgot to #include the inline implementation file For Utilities
2013-11-13 13:56:25 +01:00
ac1fb8bab9
UniquePointer and UniqueArray
...
UniquePointer - removed hazardous members.
UniqueArray - added
All Documented
2013-11-13 12:07:21 +01:00
d9bc8ce640
Moved to Graphics Test Environment
2013-11-13 10:27:37 +01:00
55879138c4
Big Patch
...
Tons of stuff like fixing Pär's linking errors
2013-11-12 12:33:52 +01:00
d5414d1443
Big Pack
2013-11-12 00:10:48 +01:00
056fadbf79
Merge branch 'master' of https://github.com/dean11/Danbias
2013-11-11 21:16:52 +01:00
f0b464bccf
Frustrum fix
2013-11-11 21:14:52 +01:00
0ba290a385
Latest updates to Graphics, need to do test run
2013-11-11 20:02:00 +01:00
29e45ba113
Excluded Shaders from Project
2013-11-10 17:08:10 +01:00
d8e5e7b56f
Merge branch 'master' of https://github.com/dean11/Danbias
2013-11-10 16:28:17 +01:00
2d91e0745f
Got Network client and Dependencies to compile
2013-11-10 16:27:46 +01:00
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
c021187db9
Fixed OysterGraphics to compile.
...
New baseline for engine.
2013-11-10 03:19:46 +01:00
9edd98d2b9
Fixed OysterGraphics Projects Settings
2013-11-10 02:39:11 +01:00
065352e898
Merge branch 'Collision3D'
2013-11-10 02:28:46 +01:00
7cf658f9a5
oops .. missed including these in the last one
2013-11-10 02:28:07 +01:00
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
f2ab3da7b9
Merge branch 'Collision3D'
2013-11-10 00:18:10 +01:00
036224f812
Behöver uppdatera Masterns' LinearMath snabbt
2013-11-10 00:17:28 +01:00
2ff7e4d687
Merge remote-tracking branch 'origin/master' into Collision3D
2013-11-10 00:01:35 +01:00
a16f311751
Merge branch 'Collision3D'
2013-11-10 00:01:07 +01:00
8d12b415d3
Minor changes
...
Needed to merge->rebranch to get the new UniquePointer
2013-11-09 23:58:48 +01:00
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
Linda Andersson
lanariel
Erik Persson
Tobias Grundel
dean11
Dander7BD