[Jenkins]Jenkins

SuccessChanges

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 TypePath in RepositoryPath in Workspace
The file was added/code/trunk.
Revision 12197 by merholzl:
Shader merge
Change TypePath in RepositoryPath in Workspace
The file was modified/code/branches/mergeFS18N/A
The file was added/code/branches/mergeFS18/data/levels/BumpMap.oxwN/A
The file was removed/code/branches/mergeFS18/data/levels/kart_alpha0.1.oxwN/A
The file was modified/code/branches/mergeFS18/data/levels/tutorial.oxwN/A
The file was modified/code/branches/mergeFS18/src/libraries/tools/Mesh.ccN/A
Revision 12194 by merholzl:
Merging OrxoKart
Change TypePath in RepositoryPath in Workspace
The file was modified/code/branches/mergeFS18N/A
The file was added/code/branches/mergeFS18/data/levels/OrxoKart1.oxwN/A
The file was added/code/branches/mergeFS18/data/levels/OrxoKart2.oxwN/A
The file was modified/code/branches/mergeFS18/data/levels/includes/weaponSettingsHover.oxiN/A
The file was added/code/branches/mergeFS18/data/levels/kart_alpha0.1.oxwN/A
The file was added/code/branches/mergeFS18/data/levels/templates/OrxoKartKart.oxtN/A
The file was added/code/branches/mergeFS18/data/overlays/OrxoKartHUD.oxoN/A
The file was added/code/branches/mergeFS18/data/tcl/orxokart_highscores.txtN/A
The file was modified/code/branches/mergeFS18/src/modules/CMakeLists.txtN/A
The file was added/code/branches/mergeFS18/src/modules/orxokartN/A
The file was modified/code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txtN/A
Revision 12191 by merholzl:
merged Wagnis
Change TypePath in RepositoryPath in Workspace
The file was modified/code/branches/mergeFS18N/A
The file was added/code/branches/mergeFS18/data/levels/Wagnis.oxwN/A
The file was added/code/branches/mergeFS18/data/levels/templates/wagnisCursor.oxtN/A
The file was added/code/branches/mergeFS18/data/overlays/WagnisHUD.oxoN/A
The file was modified/code/branches/mergeFS18/src/libraries/tools/Timer.ccN/A
The file was modified/code/branches/mergeFS18/src/libraries/tools/Timer.hN/A
The file was modified/code/branches/mergeFS18/src/modules/CMakeLists.txtN/A
The file was added/code/branches/mergeFS18/src/modules/wagnisN/A
The file was modified/code/branches/mergeFS18/src/modules/weapons/projectiles/CMakeLists.txtN/A
The file was added/code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.ccN/A
The file was added/code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.hN/A
The file was modified/code/branches/mergeFS18/src/modules/weapons/weaponmodes/CMakeLists.txtN/A
The file was added/code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.ccN/A
The file was added/code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.hN/A