GL - going to merge

Code/Game/DanBiasGame/GameClientState/LobbyState.cpp

@@ -39,6 +39,12 @@ bool LobbyState::Init(Oyster::Network::NetworkClient* nwClient)
 }
 bool LobbyState::LoadModels(std::wstring file)
 {
+	Oyster::Graphics::Definitions::Pointlight plight;
+	plight.Pos = Oyster::Math::Float3(-2,3,0);
+	plight.Color = Oyster::Math::Float3(0,1,0);
+	plight.Radius = 10;
+	plight.Bright = 3;
+	Oyster::Graphics::API::AddLight(plight);
 	// open file
 	// read file 
 	// init models

Code/Game/GameLogic/Game.cpp

@@ -55,13 +55,15 @@ void Game::GetAllPlayerPos()
 
 Game::PlayerData Game::CreatePlayer()
 {
-<<<<<<< HEAD
-	SmartPointer<Player> newPlayer = new Player();
 
-	myData->players.Push(newPlayer);
-=======
+	//SmartPointer<Player> newPlayer = new Player();
+
+
+
+	//myData->players.Push(newPlayer);
+
 	return PlayerData();
->>>>>>> eb6ed13cceff0ce4380699391759883acf487107
+
 }
 
 void Game::CreateTeam()

Code/Game/GameLogic/GameLogic.vcxproj

@@ -193,6 +193,7 @@
     <ClCompile Include="DynamicObject.cpp" />
     <ClCompile Include="Game.cpp" />
     <ClCompile Include="GameMode.cpp" />
+    <ClCompile Include="Game_PlayerData.cpp" />
     <ClCompile Include="IAttatchment.cpp" />
     <ClCompile Include="Level.cpp" />
     <ClCompile Include="Object.cpp" />