Danbias/Code/Game/GameLogic
Erik Persson c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic
Conflicts:
	Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
..
AttatchmentMassDriver.cpp updated weapon 2013-12-10 11:17:25 +01:00
AttatchmentMassDriver.h added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
AttatchmentSocket.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
AttatchmentSocket.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Camera.cpp Created the game modules 2013-12-03 12:07:37 +01:00
Camera.h Created the game modules 2013-12-03 12:07:37 +01:00
CollisionManager.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
CollisionManager.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
DynamicObject.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
DynamicObject.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Game.cpp GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
Game.h GL - added client objects 2013-12-09 11:05:47 +01:00
GameLogic.vcxproj GL - soleved merge errors in project files 2013-12-10 11:50:35 +01:00
GameLogicStates.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
GameMode.cpp made "interfaces" of most classes 2013-12-05 11:50:39 +01:00
GameMode.h made "interfaces" of most classes 2013-12-05 11:50:39 +01:00
IAttatchment.cpp added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
IAttatchment.h added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
IGame.cpp Created the game modules 2013-12-03 12:07:37 +01:00
IGame.h Created the game modules 2013-12-03 12:07:37 +01:00
Level.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Level.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Object.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Object.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Player.cpp Merge remote-tracking branch 'origin/Physics' into GameLogic 2013-12-12 10:10:52 +01:00
Player.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
RefManager.cpp Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-03 12:09:22 +01:00
RefManager.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
StaticObject.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
StaticObject.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
TestGLMain.cpp Created the game modules 2013-12-03 12:07:37 +01:00
Weapon.cpp updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00
Weapon.h updated the weapon system, collisionManager and redid the "object" heirarki 2013-12-12 09:36:14 +01:00