world.cpp
Testa merga efter detta

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

Conflicts:
	PacMan/PacMan/PacMan.cpp
fixade camera lite

Signed-off-by: unknown <hapb12@G311-0030.students.ad.bth.se>
Signed-off-by: unknown <sisv12@G311-0029.students.ad.bth.se>
Merge branch 'MasterRenderMarge' of https://github.com/Team-Quagga/PacMan.git
Signed-off-by: unknown <sisv12@G311-0022.students.ad.bth.se>
Har lagt till loadMap
Signed-off-by: unknown <sisv12@G311-0022.students.ad.bth.se>
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git

Conflicts:
	PacMan/PacMan/Candy.cpp
	PacMan/PacMan/Candy.h
	PacMan/PacMan/GameScreen.cpp
	PacMan/PacMan/IGameObject.h
	PacMan/PacMan/IGhost.h

Signed-off-by: unknown <sisv12@G311-0022.students.ad.bth.se>
Signed-off-by: unknown <sisv12@G311-0022.students.ad.bth.se>
Camera fix
Merge branch 'master' of https://github.com/Team-Quagga/PacMan.git
Lade upp glew32.dll eftersom alla datorer verkar behöva det första gången man kör

Signed-off-by: unknown <reku12@G311-0012.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
World klar!

Signed-off-by: Daniel och Filip <dahi12@G311-0022.students.ad.bth.se>