Signed-off-by: unknown <sisv12@G311-0011.students.ad.bth.se>
ritat ut världen
Signed-off-by: unknown <dahi12@G311-0013.students.ad.bth.se>
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/Tile.h
	PacMan/PacMan/World.cpp
	PacMan/PacMan/World.h
har lagt till en värld O.0
objektfiler
Ghost AI typ klar

Signed-off-by: unknown <sisv12@G311-0012.students.ad.bth.se>
World klar!

Signed-off-by: Daniel och Filip <dahi12@G311-0022.students.ad.bth.se>
Merge branch 'Ghost' of https://github.com/Team-Quagga/PacMan.git
Signed-off-by: unknown <reku12@G311-0024.students.ad.bth.se>
Merge branch 'Ghost' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/Blinky.cpp
	PacMan/PacMan/Pinky.cpp

Signed-off-by: unknown <reku12@G311-0024.students.ad.bth.se>
Merge branch 'MasterRenderMarge' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/GameScreen.h
Looks... better? Fixed point light +SOIL
Signed-off-by: unknown <dahi12@G311-0023.students.ad.bth.se>
Merge branch 'PacuManuPlayer' of https://github.com/Team-Quagga/PacMan.git
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git into MasterRenderMarge

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/Player.h
	PacMan/PacMan/World.cpp
player.cpp
Merge branch 'PacuManuPlayer' of https://github.com/Team-Quagga/PacMan.git into MasterRenderMarge

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/Player.cpp
	PacMan/PacMan/Player.h
Merge branch 'RendererBranch' of https://github.com/Team-Quagga/PacMan.git into MasterRenderMarge

Conflicts:
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/PacMan.vcxproj
	PacMan/PacMan/World.cpp
PACMAN FUNKAAAAAAR
Signed-off-by: unknown <reku12@G311-0024.students.ad.bth.se>
soil och ghost.mtl + ghost.obj fusk vt