[Orxonox-commit 3971] r8645 - in code/branches/presentation/src: libraries/core modules/docking modules/gametypes modules/notifications modules/objects modules/pickup/items modules/portals modules/tetris modules/weapons/projectiles orxonox/interfaces

landauf at orxonox.net landauf at orxonox.net
Sat May 28 18:56:56 CEST 2011


Author: landauf
Date: 2011-05-28 18:56:56 +0200 (Sat, 28 May 2011)
New Revision: 8645

Modified:
   code/branches/presentation/src/libraries/core/ThreadWin.cc
   code/branches/presentation/src/modules/docking/CMakeLists.txt
   code/branches/presentation/src/modules/docking/Dock.cc
   code/branches/presentation/src/modules/docking/Dock.h
   code/branches/presentation/src/modules/docking/DockToShip.cc
   code/branches/presentation/src/modules/docking/DockToShip.h
   code/branches/presentation/src/modules/docking/DockingAnimation.cc
   code/branches/presentation/src/modules/docking/DockingAnimation.h
   code/branches/presentation/src/modules/docking/DockingController.cc
   code/branches/presentation/src/modules/docking/DockingController.h
   code/branches/presentation/src/modules/docking/DockingEffect.cc
   code/branches/presentation/src/modules/docking/DockingEffect.h
   code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h
   code/branches/presentation/src/modules/docking/DockingPrereqs.h
   code/branches/presentation/src/modules/docking/DockingTarget.cc
   code/branches/presentation/src/modules/docking/DockingTarget.h
   code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc
   code/branches/presentation/src/modules/docking/MoveToDockingTarget.h
   code/branches/presentation/src/modules/gametypes/CMakeLists.txt
   code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h
   code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h
   code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc
   code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h
   code/branches/presentation/src/modules/gametypes/SpaceRace.cc
   code/branches/presentation/src/modules/gametypes/SpaceRace.h
   code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc
   code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h
   code/branches/presentation/src/modules/objects/SpaceBoundaries.cc
   code/branches/presentation/src/modules/objects/SpaceBoundaries.h
   code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc
   code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h
   code/branches/presentation/src/modules/portals/CMakeLists.txt
   code/branches/presentation/src/modules/portals/PortalEndPoint.cc
   code/branches/presentation/src/modules/portals/PortalEndPoint.h
   code/branches/presentation/src/modules/portals/PortalLink.cc
   code/branches/presentation/src/modules/portals/PortalLink.h
   code/branches/presentation/src/modules/portals/PortalsPrecompiledHeaders.h
   code/branches/presentation/src/modules/portals/PortalsPrereqs.h
   code/branches/presentation/src/modules/tetris/CMakeLists.txt
   code/branches/presentation/src/modules/tetris/Tetris.cc
   code/branches/presentation/src/modules/tetris/Tetris.h
   code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc
   code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h
   code/branches/presentation/src/modules/tetris/TetrisPrereqs.h
   code/branches/presentation/src/modules/tetris/TetrisStone.cc
   code/branches/presentation/src/modules/tetris/TetrisStone.h
   code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc
   code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h
   code/branches/presentation/src/orxonox/interfaces/NotificationListener.cc
Log:
set svn:eol-style to native, removed svn:executable property. no code changes.


Property changes on: code/branches/presentation/src/libraries/core/ThreadWin.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/Dock.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/Dock.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockToShip.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockToShip.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingAnimation.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingAnimation.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingController.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingController.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingEffect.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingEffect.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingPrecompiledHeaders.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingPrereqs.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingTarget.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/DockingTarget.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/docking/MoveToDockingTarget.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/GametypesPrecompiledHeaders.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/GametypesPrereqs.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/RaceCheckPoint.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/RaceCheckPoint.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/SpaceRace.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/gametypes/SpaceRace.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/objects/SpaceBoundaries.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/objects/SpaceBoundaries.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalEndPoint.cc
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalEndPoint.h
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalLink.cc
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalLink.h
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalsPrecompiledHeaders.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/portals/PortalsPrereqs.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/Tetris.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/Tetris.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/TetrisCenterpoint.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/TetrisCenterpoint.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/TetrisPrereqs.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/TetrisStone.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/tetris/TetrisStone.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc
===================================================================
--- code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc	2011-05-28 16:46:18 UTC (rev 8644)
+++ code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc	2011-05-28 16:56:56 UTC (rev 8645)
@@ -119,7 +119,7 @@
                     ParticleSpawner* effect = new ParticleSpawner(owner->getCreator());
                     effect->setDestroyAfterLife(true);
                     effect->setSource("Orxonox/Shield");
-                    effect->setLifetime(0.5f);
+                    effect->setLifetime(0.5f);
                     victim->attach(effect);
                 }
             }


Property changes on: code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.cc
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/modules/weapons/projectiles/BasicProjectile.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/src/orxonox/interfaces/NotificationListener.cc
___________________________________________________________________
Added: svn:eol-style
   + native




More information about the Orxonox-commit mailing list