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 |
|
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 |
|
Erik Persson
|
ce9746f10c
|
worldObject update
|
2013-11-20 12:23:45 +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 |
|
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
|
33e7afabcd
|
Restructured folders to give a flexible solution for dependencies and added to ignore list
|
2013-11-18 15:41:09 +01:00 |