Changeset 8196 for code/branches/dockingsystem2/src/modules/docking

Timestamp:

Apr 6, 2011, 4:39:29 PM (15 years ago)

Author:

dafrick

Message:

Merging old dockingsystem branch into new one.
Do
svn switch ​https://svn.orxonox.net/game/code/branches/dockingsystem2
in your old branch.

Location:

code/branches/dockingsystem2

Files:

• . (modified) (1 prop)
• src/modules/docking (copied) (copied from code/branches/dockingsystem/src/modules/docking)
• src/modules/docking/CMakeLists.txt (copied) (copied from code/branches/dockingsystem/src/modules/docking/CMakeLists.txt)
• src/modules/docking/Dock.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/Dock.cc)
• src/modules/docking/Dock.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/Dock.h)
• src/modules/docking/DockToShip.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockToShip.cc)
• src/modules/docking/DockToShip.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockToShip.h)
• src/modules/docking/DockingEffect.cc (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingEffect.cc)
• src/modules/docking/DockingEffect.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingEffect.h)
• src/modules/docking/DockingPrecompiledHeaders.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h)
• src/modules/docking/DockingPrereqs.h (copied) (copied from code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h)