# # ChangeLog for code/branches/merger/Media/materials # # Generated by Trac 1.0.9 # Nov 14, 2024, 7:14:44 AM Wed, 28 Nov 2007 01:12:56 GMT nicolasc [300] * code/branches/merger/CMakeLists.txt (modified) * code/branches/merger/INSTALL (modified) * code/branches/merger/Media/materials (copied) * code/branches/merger/Media/materials/scripts (copied) * code/branches/merger/Media/materials/scripts/Example.material (copied) * code/branches/merger/Media/materials/scripts/Examples.compositor (copied) * code/branches/merger/Media/materials/scripts/Examples.program (copied) * code/branches/merger/Media/materials/scripts/Ogre.material (copied) * code/branches/merger/Media/materials/textures (copied) * code/branches/merger/Media/materials/textures/Dirt.jpg (copied) * code/branches/merger/Media/materials/textures/GreenSkin.jpg (copied) * code/branches/merger/Media/materials/textures/RustyBarrel.png (copied) * code/branches/merger/Media/materials/textures/RustySteel.jpg (copied) * code/branches/merger/Media/materials/textures/WeirdEye.png (copied) * code/branches/merger/Media/materials/textures/cursor.png (copied) * code/branches/merger/Media/materials/textures/dirt01.jpg (copied) * code/branches/merger/Media/materials/textures/flare.png (copied) * code/branches/merger/Media/materials/textures/nskingr.jpg (copied) * code/branches/merger/Media/materials/textures/ogreborder.png (copied) * code/branches/merger/Media/materials/textures/ogreborderUp.png (copied) * code/branches/merger/Media/materials/textures/ogrebordercenter.png (copied) * code/branches/merger/Media/materials/textures/ogrelogo-small.jpg (copied) * code/branches/merger/Media/materials/textures/ogrelogo.png (copied) * code/branches/merger/Media/materials/textures/smoke.png (copied) * code/branches/merger/Media/materials/textures/smokecolors.png (copied) * code/branches/merger/Media/materials/textures/spheremap.png (copied) * code/branches/merger/Media/materials/textures/steelhead.png (copied) * code/branches/merger/Media/models (copied) * code/branches/merger/Media/models/Barrel.mesh (copied) * code/branches/merger/Media/models/cube.mesh (copied) * code/branches/merger/Media/models/fish.mesh (copied) * code/branches/merger/Media/models/fish.skeleton (copied) * code/branches/merger/Media/models/ogrehead.mesh (copied) * code/branches/merger/Media/overlay (copied) * code/branches/merger/Media/overlay/EnergyBackground.png (copied) * code/branches/merger/Media/overlay/EnergyDistrBackground.png (copied) * code/branches/merger/Media/overlay/MapBackGround.png (copied) * code/branches/merger/Media/overlay/MyShip.png (copied) * code/branches/merger/Media/overlay/OrxonoxBlack.png (copied) * code/branches/merger/Media/overlay/OrxonoxHUD.overlay (copied) * code/branches/merger/Media/overlay/OrxonoxHUD1.1.overlay (copied) * code/branches/merger/Media/overlay/OrxonoxHUD1.2.overlay (copied) * code/branches/merger/Media/overlay/OrxonoxORANGE.png (copied) * code/branches/merger/Media/overlay/OrxonoxRED.png (copied) * code/branches/merger/Media/overlay/PrimalWeaponBackground.png (copied) * code/branches/merger/Media/overlay/PrimarBackground.png (copied) * code/branches/merger/Media/overlay/PrimarChoice.png (copied) * code/branches/merger/Media/overlay/PrimarSample.png (copied) * code/branches/merger/Media/overlay/Racket.png (copied) * code/branches/merger/Media/overlay/RacketBackground.png (copied) * code/branches/merger/Media/overlay/RacketBackground.pxi (copied) * code/branches/merger/Media/overlay/RacketGrid.png (copied) * code/branches/merger/Media/overlay/RedPoint.png (copied) * code/branches/merger/Media/overlay/ShildLeftBottom.png (copied) * code/branches/merger/Media/overlay/ShildLeftTop.png (copied) * code/branches/merger/Media/overlay/ShildRightBottom.png (copied) * code/branches/merger/Media/overlay/ShildRightTop.png (copied) * code/branches/merger/Media/overlay/TargetBackground.png (copied) * code/branches/merger/Media/overlay/TimeBackground.png (copied) * code/branches/merger/Media/overlay/backGround.png (copied) * code/branches/merger/Media/overlay/clock.png (copied) * code/branches/merger/Media/overlay/gun.png (copied) * code/branches/merger/Media/overlay/man.png (copied) * code/branches/merger/Media/overlay/shot.png (copied) * code/branches/merger/Media/overlay/superegg.png (copied) * code/branches/merger/Media/packs/cubemap.zip (copied) * code/branches/merger/Media/particle (copied) * code/branches/merger/Media/particle/Example-Water.particle (copied) * code/branches/merger/Media/particle/Example.particle (copied) * code/branches/merger/Media/particle/emitted_emitter.particle (copied) * code/branches/merger/Media/particle/smoke.particle (copied) * code/branches/merger/bin/CMakeCache.txt (copied) * code/branches/merger/bin/resources.cfg (modified) * code/branches/merger/src/CMakeLists.txt (modified) * code/branches/merger/src/class_hierarchy (copied) * code/branches/merger/src/class_hierarchy/BaseObject.cc (copied) * code/branches/merger/src/class_hierarchy/BaseObject.h (copied) * code/branches/merger/src/class_hierarchy/CMakeLists.txt (copied) * code/branches/merger/src/class_hierarchy/ClassHierarchy.cc (copied) * code/branches/merger/src/class_hierarchy/ClassHierarchy.h (copied) * code/branches/merger/src/class_hierarchy/Identifier.cc (copied) * code/branches/merger/src/class_hierarchy/Identifier.h (copied) * code/branches/merger/src/class_hierarchy/IdentifierIncludes.h (copied) * code/branches/merger/src/class_hierarchy/IdentifierList.cc (copied) * code/branches/merger/src/class_hierarchy/IdentifierList.h (copied) * code/branches/merger/src/class_hierarchy/ObjectList.cc (copied) * code/branches/merger/src/class_hierarchy/ObjectList.h (copied) * code/branches/merger/src/class_hierarchy/OrxonoxClass.cc (copied) * code/branches/merger/src/class_hierarchy/OrxonoxClass.h (copied) * code/branches/merger/src/class_hierarchy/Test.h (copied) * code/branches/merger/src/class_hierarchy/orxonox.cc (copied) * code/branches/merger/src/class_hierarchy/test1.cc (copied) * code/branches/merger/src/class_hierarchy/test1.h (copied) * code/branches/merger/src/class_hierarchy/test2.cc (copied) * code/branches/merger/src/class_hierarchy/test2.h (copied) * code/branches/merger/src/class_hierarchy/test3.cc (copied) * code/branches/merger/src/class_hierarchy/test3.h (copied) * code/branches/merger/src/hud/hud_overlay.h (modified) * code/branches/merger/src/hud/test_overlay.cc (copied) * code/branches/merger/src/hud/test_overlay.h (copied) * code/branches/merger/src/inertial_node.cc (copied) * code/branches/merger/src/inertial_node.h (copied) * code/branches/merger/src/main.cc (copied) * code/branches/merger/src/ogre_control.cc (copied) * code/branches/merger/src/ogre_control.h (copied) * code/branches/merger/src/orxonox.h (copied) * code/branches/merger/src/orxonox_prerequisites.h (copied) * code/branches/merger/src/orxonox_scene.cc (copied) * code/branches/merger/src/orxonox_scene.h (copied) * code/branches/merger/src/orxonox_ship.cc (copied) * code/branches/merger/src/orxonox_ship.h (copied) * code/branches/merger/src/run_manager.cc (copied) * code/branches/merger/src/run_manager.h (copied) * code/branches/merger/src/weapon (copied) * code/branches/merger/src/weapon/CMakeLists.txt (copied) * code/branches/merger/src/weapon/ammunition_dump.cc (copied) * code/branches/merger/src/weapon/ammunition_dump.h (copied) * code/branches/merger/src/weapon/barrel_gun.cc (copied) * code/branches/merger/src/weapon/barrel_gun.h (copied) * code/branches/merger/src/weapon/base_weapon.cc (copied) * code/branches/merger/src/weapon/base_weapon.h (copied) * code/branches/merger/src/weapon/bullet.cc (copied) * code/branches/merger/src/weapon/bullet.h (copied) * code/branches/merger/src/weapon/bullet_manager.cc (copied) * code/branches/merger/src/weapon/bullet_manager.h (copied) * code/branches/merger/src/weapon/weapon_station.cc (copied) * code/branches/merger/src/weapon/weapon_station.h (copied) initial merge of main_reto Tue, 27 Nov 2007 17:09:22 GMT rgrieder [270] * code/branches/main_reto/Media/materials/scripts/Ogre.material (modified) * code/branches/main_reto/Media/materials/textures/smoke.png (added) * code/branches/main_reto/Media/materials/textures/smokecolors.png (added) * code/branches/main_reto/Media/overlay (added) * code/branches/main_reto/Media/overlay/EnergyBackground.png (added) * code/branches/main_reto/Media/overlay/EnergyDistrBackground.png (added) * code/branches/main_reto/Media/overlay/MapBackGround.png (added) * code/branches/main_reto/Media/overlay/MyShip.png (added) * code/branches/main_reto/Media/overlay/OrxonoxBlack.png (added) * code/branches/main_reto/Media/overlay/OrxonoxHUD.overlay (added) * code/branches/main_reto/Media/overlay/OrxonoxHUD1.1.overlay (added) * code/branches/main_reto/Media/overlay/OrxonoxHUD1.2.overlay (added) * code/branches/main_reto/Media/overlay/OrxonoxORANGE.png (added) * code/branches/main_reto/Media/overlay/OrxonoxRED.png (added) * code/branches/main_reto/Media/overlay/PrimalWeaponBackground.png (added) * code/branches/main_reto/Media/overlay/PrimarBackground.png (added) * code/branches/main_reto/Media/overlay/PrimarChoice.png (added) * code/branches/main_reto/Media/overlay/PrimarSample.png (added) * code/branches/main_reto/Media/overlay/Racket.png (added) * code/branches/main_reto/Media/overlay/RacketBackground.png (added) * code/branches/main_reto/Media/overlay/RacketBackground.pxi (added) * code/branches/main_reto/Media/overlay/RacketGrid.png (added) * code/branches/main_reto/Media/overlay/RedPoint.png (added) * code/branches/main_reto/Media/overlay/ShildLeftBottom.png (added) * code/branches/main_reto/Media/overlay/ShildLeftTop.png (added) * code/branches/main_reto/Media/overlay/ShildRightBottom.png (added) * code/branches/main_reto/Media/overlay/ShildRightTop.png (added) * code/branches/main_reto/Media/overlay/TargetBackground.png (added) * code/branches/main_reto/Media/overlay/TimeBackground.png (added) * code/branches/main_reto/Media/overlay/backGround.png (added) * code/branches/main_reto/Media/overlay/clock.png (added) * code/branches/main_reto/Media/overlay/gun.png (added) * code/branches/main_reto/Media/overlay/man.png (added) * code/branches/main_reto/Media/overlay/shot.png (added) * code/branches/main_reto/Media/overlay/superegg.png (added) * code/branches/main_reto/Media/particle (added) * code/branches/main_reto/Media/particle/Example-Water.particle (added) * code/branches/main_reto/Media/particle/Example.particle (added) * code/branches/main_reto/Media/particle/emitted_emitter.particle (added) * code/branches/main_reto/Media/particle/smoke.particle (added) * code/branches/main_reto/bin/src (deleted) * code/branches/main_reto/src/CMakeLists.txt (modified) * code/branches/main_reto/src/class_hierarchy (added) * code/branches/main_reto/src/class_hierarchy/BaseObject.cc (added) * code/branches/main_reto/src/class_hierarchy/BaseObject.h (added) * code/branches/main_reto/src/class_hierarchy/CMakeLists.txt (added) * code/branches/main_reto/src/class_hierarchy/ClassHierarchy.cc (added) * code/branches/main_reto/src/class_hierarchy/ClassHierarchy.h (added) * code/branches/main_reto/src/class_hierarchy/Identifier.cc (added) * code/branches/main_reto/src/class_hierarchy/Identifier.h (added) * code/branches/main_reto/src/class_hierarchy/IdentifierIncludes.h (added) * code/branches/main_reto/src/class_hierarchy/IdentifierList.cc (added) * code/branches/main_reto/src/class_hierarchy/IdentifierList.h (added) * code/branches/main_reto/src/class_hierarchy/ObjectList.cc (added) * code/branches/main_reto/src/class_hierarchy/ObjectList.h (added) * code/branches/main_reto/src/class_hierarchy/OrxonoxClass.cc (added) * code/branches/main_reto/src/class_hierarchy/OrxonoxClass.h (added) * code/branches/main_reto/src/class_hierarchy/Test.h (added) * code/branches/main_reto/src/class_hierarchy/orxonox.cc (added) * code/branches/main_reto/src/class_hierarchy/test1.cc (added) * code/branches/main_reto/src/class_hierarchy/test1.h (added) * code/branches/main_reto/src/class_hierarchy/test2.cc (added) * code/branches/main_reto/src/class_hierarchy/test2.h (added) * code/branches/main_reto/src/class_hierarchy/test3.cc (added) * code/branches/main_reto/src/class_hierarchy/test3.h (added) * code/branches/main_reto/src/hud (added) * code/branches/main_reto/src/hud/CMakeLists.txt (added) * code/branches/main_reto/src/hud/hud_overlay.cc (added) * code/branches/main_reto/src/hud/hud_overlay.h (added) - added old version of class hierarchy in order to make things work ...