Mega päivitys

Kartta aikalailla kunnossa
Merge map
Megapäivityksen megapäivitys

Ei mennytkään se dirikka mikä piti päivitykseen, tässä oikeat kamat.
Ylimääräisen poisto

testi
t
kimeitä ääniä
sekalaisia korjauksia ja siistimisia, pelin vaikeusaste kasvaa aaltojen valilla.
pre-merge
Merge remote-tracking branch 'origin/sound2' into uusi_merge
healthbarit ja release version assetit
Paljon korjauksia ja parannuksia

Liikkuminen pitäisi olla kunnossa, eli pelaaja ja monsterit osaavat
liikkua oikein. Monstereilla kovakoodatut polut tiedostoista polku.txt
ja polku2.txt. Graafisia päivityksiä, esim. torni ja
taikasateenkaaririnkulan koon muutos. Muutoksia myös peliparametreihin,
että on helpompi pelata.
Merge branch 'origin/Mappi2'

Conflicts:
	defenceSolution/Debug/defence.exe
	defenceSolution/Debug/defence.ilk
	defenceSolution/Debug/defence.pdb
	defenceSolution/defence/Bullet.cpp
	defenceSolution/defence/Bullet.h
	defenceSolution/defence/Controller.cpp
	defenceSolution/defence/Controller.h
	defenceSolution/defence/Debug/CL.read.1.tlog
	defenceSolution/defence/Debug/CL.write.1.tlog
	defenceSolution/defence/Debug/System.obj
	defenceSolution/defence/Debug/cl.command.1.tlog
	defenceSolution/defence/Debug/defence.lastbuildstate
	defenceSolution/defence/Debug/defence.log
	defenceSolution/defence/Debug/link.command.1.tlog
	defenceSolution/defence/Debug/link.read.1.tlog
	defenceSolution/defence/Debug/link.write.1.tlog
	defenceSolution/defence/Debug/main.obj
	defenceSolution/defence/Debug/ui.obj
	defenceSolution/defence/Debug/vc110.idb
	defenceSolution/defence/Debug/vc110.pdb
	defenceSolution/defence/Enemy.cpp
	defenceSolution/defence/Enemy.h
	defenceSolution/defence/GameParameters.h
	defenceSolution/defence/Level1temp.txt
	defenceSolution/defence/Player.cpp
	defenceSolution/defence/Player.h
	defenceSolution/defence/Sprite.h
	defenceSolution/defence/Tiili.cpp
	defenceSolution/defence/Tiili.h
	defenceSolution/defence/TileMap.cpp
	defenceSolution/defence/TileMap.h
	defenceSolution/defence/Tower.cpp
	defenceSolution/defence/Tower.h
	defenceSolution/defence/defence.vcxproj
	defenceSolution/defence/defence.vcxproj.filters
	defenceSolution/defence/main.cpp
	defenceSolution/defence/player.png
	defenceSolution/defence/polku.txt
	defenceSolution/defence/roadmap.txt
	defenceSolution/defence/roadmap2.txt
	defenceSolution/defence/tower1.png
	defenceSolution/defence/ui.h
	defenceSolution/defenceSolution.sdf
	defenceSolution/defenceSolution.v11.suo
Final commit
Versio 0.5