Changes

Summary

1. placed new trunk from mergeFS18
2. Shader merge
3. Merging OrxoKart
4. merged Wagnis

Revision 12201 by Philip Wiese: placed new trunk from mergeFS18
Change Type	Path in Repository	Path in Workspace
	/code/trunk	.
Revision 12197 by merholzl: Shader merge
Change Type	Path in Repository	Path in Workspace
	/code/branches/mergeFS18	N/A
	/code/branches/mergeFS18/data/levels/BumpMap.oxw	N/A
	/code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw	N/A
	/code/branches/mergeFS18/data/levels/tutorial.oxw	N/A
	/code/branches/mergeFS18/src/libraries/tools/Mesh.cc	N/A
Revision 12194 by merholzl: Merging OrxoKart
Change Type	Path in Repository	Path in Workspace
	/code/branches/mergeFS18	N/A
	/code/branches/mergeFS18/data/levels/OrxoKart1.oxw	N/A
	/code/branches/mergeFS18/data/levels/OrxoKart2.oxw	N/A
	/code/branches/mergeFS18/data/levels/includes/weaponSettingsHover.oxi	N/A
	/code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw	N/A
	/code/branches/mergeFS18/data/levels/templates/OrxoKartKart.oxt	N/A
	/code/branches/mergeFS18/data/overlays/OrxoKartHUD.oxo	N/A
	/code/branches/mergeFS18/data/tcl/orxokart_highscores.txt	N/A
	/code/branches/mergeFS18/src/modules/CMakeLists.txt	N/A
	/code/branches/mergeFS18/src/modules/orxokart	N/A
	/code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt	N/A
Revision 12191 by merholzl: merged Wagnis
Change Type	Path in Repository	Path in Workspace
	/code/branches/mergeFS18	N/A
	/code/branches/mergeFS18/data/levels/Wagnis.oxw	N/A
	/code/branches/mergeFS18/data/levels/templates/wagnisCursor.oxt	N/A
	/code/branches/mergeFS18/data/overlays/WagnisHUD.oxo	N/A
	/code/branches/mergeFS18/src/libraries/tools/Timer.cc	N/A
	/code/branches/mergeFS18/src/libraries/tools/Timer.h	N/A
	/code/branches/mergeFS18/src/modules/CMakeLists.txt	N/A
	/code/branches/mergeFS18/src/modules/wagnis	N/A
	/code/branches/mergeFS18/src/modules/weapons/projectiles/CMakeLists.txt	N/A
	/code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.cc	N/A
	/code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.h	N/A
	/code/branches/mergeFS18/src/modules/weapons/weaponmodes/CMakeLists.txt	N/A
	/code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.cc	N/A
	/code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.h	N/A