# # ChangeLog for code # # Generated by Trac 1.0.9 # Apr 27, 2024, 4:33:02 PM Thu, 20 Sep 2018 13:11:38 GMT patricwi [12021] * code/branches/cegui0.8_ogre1.9/cmake/LibraryConfigTardis.cmake (modified) Changed cmake config file to ogre 1.9 Wed, 30 May 2018 12:56:24 GMT patricwi [12020] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/PresentationFS18/data/levels/testMultiplayerLevel.oxw (copied) * code/branches/PresentationFS18/data/levels/testMultiplayerLevelLTS.oxw (copied) * code/branches/PresentationFS18/data/overlays/lastTeamStandingHUD.oxo (modified) * code/branches/PresentationFS18/src/libraries/network/Client.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Client.h (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnection.h (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/PresentationFS18/src/libraries/network/Connection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Connection.h (modified) * code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.h (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateHandler.cc (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateHandler.h (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateManager.cc (modified) * code/branches/PresentationFS18/src/libraries/network/GamestateManager.h (modified) * code/branches/PresentationFS18/src/libraries/network/Host.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Host.h (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.h (modified) * code/branches/PresentationFS18/src/libraries/network/LANDiscovery.cc (modified) * code/branches/PresentationFS18/src/libraries/network/MasterServer.cc (modified) * code/branches/PresentationFS18/src/libraries/network/MasterServerComm.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Server.cc (modified) * code/branches/PresentationFS18/src/libraries/network/Server.h (modified) * code/branches/PresentationFS18/src/libraries/network/ServerConnection.cc (modified) * code/branches/PresentationFS18/src/libraries/network/ServerConnection.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Chat.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Chat.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/ClassID.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Packet.cc (modified) * code/branches/PresentationFS18/src/libraries/network/packet/Packet.h (modified) * code/branches/PresentationFS18/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/PresentationFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/PresentationFS18/src/orxonox/graphics/Model.cc (modified) Merged Masterserver Wed, 30 May 2018 12:48:17 GMT patricwi [12019] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/Hover.oxw (modified) * code/branches/PresentationFS18/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/PresentationFS18/src/modules/hover/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/hover/Hover.cc (modified) * code/branches/PresentationFS18/src/modules/hover/HoverWall.cc (deleted) * code/branches/PresentationFS18/src/modules/hover/HoverWall.h (deleted) * code/branches/PresentationFS18/src/modules/hover/MazeGenerator.cc (deleted) * code/branches/PresentationFS18/src/modules/hover/MazeGenerator.h (deleted) Merged Hover Wed, 30 May 2018 12:44:47 GMT patricwi [12018] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/towerDefense.oxw (modified) * code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) Merged TowerDefense Wed, 30 May 2018 12:41:42 GMT patricwi [12017] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/SOB.oxw (modified) * code/branches/PresentationFS18/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOB.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBItem.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/PresentationFS18/src/modules/superorxobros/SOBTube.cc (copied) * code/branches/PresentationFS18/src/modules/superorxobros/SOBTube.h (copied) Merged SuperOrxoBros Wed, 30 May 2018 12:37:02 GMT patricwi [12016] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (copied) * code/branches/PresentationFS18/data/levels/ScriptableControllerTestSpawn.oxw (copied) * code/branches/PresentationFS18/data/levels/scriptController.oxw (modified) * code/branches/PresentationFS18/data/levels/scriptableControllerTest.oxw (copied) * code/branches/PresentationFS18/data/levels/scripts (copied) * code/branches/PresentationFS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (copied) * code/branches/PresentationFS18/src/libraries/core/BaseObject.cc (modified) * code/branches/PresentationFS18/src/libraries/core/BaseObject.h (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.cc (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.h (modified) * code/branches/PresentationFS18/src/orxonox/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/Level.cc (modified) * code/branches/PresentationFS18/src/orxonox/Level.h (modified) * code/branches/PresentationFS18/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/PresentationFS18/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/PresentationFS18/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/controllers/Controller.cc (modified) * code/branches/PresentationFS18/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/PresentationFS18/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/PresentationFS18/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/PresentationFS18/src/orxonox/items/ShipPart.cc (modified) * code/branches/PresentationFS18/src/orxonox/scriptablecontroller (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged Scriptable Controller Wed, 30 May 2018 12:23:47 GMT patricwi [12015] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/PresentationFS18/data/levels/presentationHS12.oxw (modified) * code/branches/PresentationFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied) * code/branches/PresentationFS18/data/levels/templates/fastship.oxt (modified) * code/branches/PresentationFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.cc (modified) * code/branches/PresentationFS18/src/libraries/tools/Timer.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRace.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceController.h (modified) * code/branches/PresentationFS18/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/PresentationFS18/src/orxonox/items/Engine.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/PresentationFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Added RacingBots Wed, 30 May 2018 12:09:58 GMT patricwi [12014] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/OrxyRoad.oxw (copied) * code/branches/PresentationFS18/data/levels/templates/OrxyRoadPattern.oxt (copied) * code/branches/PresentationFS18/data/levels/templates/spaceshipOrxyRoad.oxt (copied) * code/branches/PresentationFS18/data/overlays/OrxyRoadHUD.oxo (copied) * code/branches/PresentationFS18/src/modules/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/orxyroad (copied) Merged OrxyRoad Wed, 30 May 2018 11:55:34 GMT patricwi [12013] * code/branches/PresentationFS18 (modified) * code/branches/PresentationFS18/data/levels/3DPacman.oxw (copied) * code/branches/PresentationFS18/data/levels/templates/PacmanGelb.oxt (copied) * code/branches/PresentationFS18/data/overlays/PacmanHUD.oxo (copied) * code/branches/PresentationFS18/src/modules/CMakeLists.txt (modified) * code/branches/PresentationFS18/src/modules/pacman (copied) Merged 3DPacman Wed, 30 May 2018 11:01:48 GMT patricwi [12012] * code/branches/PresentationFS18 (copied) Created presentation branch Fri, 25 May 2018 13:06:32 GMT seilerra [12011] * code/branches/Hover_FS18/src/modules/hover/Hover.cc (modified) last version with deleted comments Fri, 25 May 2018 13:04:08 GMT seilerra [12010] * code/branches/Hover_FS18/data/levels/Hover.oxw (modified) last version Fri, 25 May 2018 08:17:11 GMT dreherm [12009] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) FinalVersion Thu, 24 May 2018 15:25:09 GMT seilerra [12008] * code/branches/Hover_FS18/data/levels/Hover.oxw (modified) final version Thu, 24 May 2018 15:02:32 GMT dreherm [12007] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) Test 2 Thu, 24 May 2018 14:42:43 GMT adamc [12006] * code/branches/ScriptableController_FS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (moved) * code/branches/ScriptableController_FS18/data/levels/ScriptableControllerTestSpawn.oxw (moved) * code/branches/ScriptableController_FS18/data/levels/scripts/ScriptableControllerMoveKill.lua (moved) * code/branches/ScriptableController_FS18/data/levels/scripts/ScriptableControllerSpawn.lua (moved) * code/branches/ScriptableController_FS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (moved) * code/branches/ScriptableController_FS18/src/orxonox/Level.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (moved) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (moved) first final draft Thu, 24 May 2018 14:22:49 GMT dreherm [12003] * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) Test 2 Thu, 24 May 2018 14:06:39 GMT adamc [12000] * code/branches/ScriptableController_FS18/src/orxonox/Level.h (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) Removed unnecessary core modifications Thu, 24 May 2018 13:59:22 GMT adamc [11999] * code/branches/ScriptableController_FS18/data/levels/AAAScriptableControllerTest.oxw (modified) * code/branches/ScriptableController_FS18/data/levels/BBBScriptableControllerTest.oxw (modified) * code/branches/ScriptableController_FS18/data/levels/scripts/AAAScriptableControllerTest.lua (modified) * code/branches/ScriptableController_FS18/data/levels/templates/AAAAutonomousDroneTemplate.oxt (modified) * code/branches/ScriptableController_FS18/src/libraries/core/BaseObject.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/Level.h (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) Spawning pawn works now, BUT still incompatible with moving spawned pawn Thu, 24 May 2018 13:57:37 GMT jacobsr [11998] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h (modified) Changed names Thu, 24 May 2018 13:56:47 GMT andera [11997] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) Thu, 24 May 2018 13:54:42 GMT jacobsr [11996] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) Changed parameters for velocity Thu, 24 May 2018 13:43:28 GMT seilerra [11995] * code/branches/Hover_FS18/data/levels/Hover.oxw (modified) * code/branches/Hover_FS18/data/levels/templates/spaceshipHover.oxt (modified) final version Thu, 24 May 2018 13:42:53 GMT sehirsch [11994] * code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt (modified) * code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt (modified) Changed size of spaceship and improved collisionshapes Thu, 24 May 2018 13:36:40 GMT dreherm [11992] * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPrereqs.h (modified) Testversion 1 Thu, 24 May 2018 13:24:00 GMT mdedial [11990] * code/branches/Masterserver_FS18/src/libraries/network/ClientConnection.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/ClientConnection.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/Connection.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/FunctionCallManager.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/Host.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/LANDiscoverable.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/LANDiscovery.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/MasterServer.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/MasterServerComm.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/Server.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/Server.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/ServerConnection.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/ClassID.cc (modified) Clean up code, remove TODOs and dead code. Thu, 24 May 2018 13:20:52 GMT andera [11989] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) new headlines at the beginning of the game Thu, 24 May 2018 13:05:14 GMT micwagne [11988] * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBTube.cc (added) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBTube.h (added) Tube files Thu, 24 May 2018 13:03:43 GMT micwagne [11987] * code/branches/SuperOrxoBros_FS18/data/levels/SOB.oxw (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOB.cc (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBItem.h (modified) * code/branches/SuperOrxoBros_FS18/src/modules/superorxobros/SOBPrereqs.h (modified) added Tube Function in Game Thu, 24 May 2018 13:03:31 GMT arismu [11986] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.h (modified) messages Thu, 24 May 2018 12:39:49 GMT jacobsr [11985] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) distance variation between obejcts\ Thu, 24 May 2018 12:25:15 GMT dreherm [11984] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.h (modified) Added level info Thu, 24 May 2018 11:57:50 GMT varyo [11983] * code/branches/Masterserver_FS18/src/libraries/network/Client.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/synchronisable/Synchronisable.h (modified) Only removed old commented-out code Thu, 24 May 2018 11:56:22 GMT arismu [11982] * code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/RacingBots_FS18/data/levels/templates/SpaceRaceTemplates.oxt (added) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.h (modified) SpaceRaceTemplates Thu, 24 May 2018 11:43:38 GMT sehirsch [11981] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) Changed controls Thu, 24 May 2018 11:39:12 GMT jacobsr [11980] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) fixed control Tue, 22 May 2018 11:04:40 GMT dreherm [11979] * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) Debugged levelup Fri, 18 May 2018 10:38:37 GMT dreherm [11978] * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGelb.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) HUd and Ghost rotations Thu, 17 May 2018 14:24:48 GMT arismu [11977] * code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.h (modified) updated endthe Game Thu, 17 May 2018 14:14:35 GMT dreherm [11976] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) HUD erweitert Thu, 17 May 2018 14:10:30 GMT sehirsch [11975] * code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw (modified) * code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) Added more traffic objects Thu, 17 May 2018 14:04:14 GMT adamc [11974] * code/branches/ScriptableController_FS18/data/levels/AAAScriptableControllerTest.oxw (modified) * code/branches/ScriptableController_FS18/data/levels/scripts/AAAScriptableControllerTest.lua (modified) * code/branches/ScriptableController_FS18/data/levels/templates/AAAAutonomousDroneTemplate.oxt (modified) * code/branches/ScriptableController_FS18/src/orxonox/Level.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/Level.h (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.h (modified) can Thu, 17 May 2018 14:03:22 GMT mdedial [11973] * code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) Add comment about probable origin of a bug for future students. Good ... Thu, 17 May 2018 13:58:17 GMT jacobsr [11972] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) changed control, traffic distance, randomly choose type and template Thu, 17 May 2018 13:55:27 GMT seilerra [11971] * code/branches/Hover_FS18/data/levels/Hover.oxw (modified) * code/branches/Hover_FS18/data/levels/templates/spaceshipHover.oxt (modified) version3 Thu, 17 May 2018 12:48:18 GMT sehirsch [11970] * code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw (modified) * code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) Updated traffic objects, changed scenery Thu, 17 May 2018 12:45:14 GMT andera [11969] * code/branches/RacingBots_FS18/botpointer4.mesh (added) mesh botpntr Thu, 17 May 2018 12:44:29 GMT andera [11968] * code/branches/RacingBots_FS18/botpointer4.material (added) mesh material botpointer4 Thu, 17 May 2018 12:31:38 GMT andera [11967] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h (modified) SpaceRace.h updated Thu, 17 May 2018 12:30:20 GMT andera [11966] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) SpaceRaceController.cc updated Thu, 17 May 2018 12:29:38 GMT andera [11965] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc (modified) SpaceRaceController.cc updated Thu, 17 May 2018 12:28:58 GMT andera [11964] * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.h (modified) SpaceRaceController.h updated Thu, 17 May 2018 11:35:46 GMT varyo [11963] * code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) deleted typo preventing successful build Thu, 17 May 2018 11:30:14 GMT varyo [11962] * code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw (modified) * code/branches/Masterserver_FS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) updated Multiplayer map Mon, 14 May 2018 11:08:06 GMT dreherm [11961] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (modified) HUD work Sat, 12 May 2018 22:56:52 GMT dreherm [11960] * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (modified) HUD test 3 Sat, 12 May 2018 22:52:00 GMT dreherm [11959] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) HUD test 2 Sat, 12 May 2018 22:39:06 GMT dreherm [11958] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (modified) * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (modified) HUD test 1 Fri, 11 May 2018 23:31:25 GMT dreherm [11957] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) Added all Powersphere Fri, 11 May 2018 11:44:20 GMT dreherm [11956] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointSphere.cc (modified) Collisionshapes and Powerpoints Tue, 08 May 2018 11:53:11 GMT dreherm [11955] * code/branches/3DPacman_FS18/New Material/mesh/PacmanPointAfraid.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointAfraid.mesh (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointAfraid.mesh.xml (added) Ghost changements 2 Tue, 08 May 2018 11:20:49 GMT dreherm [11954] * code/branches/3DPacman_FS18/New Material/meshes/OgreXMLConverter.log (modified) * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) Added Ghostchange Tue, 08 May 2018 09:44:09 GMT dreherm [11953] * code/branches/3DPacman_FS18/New Material/image/PacmanPointAfraid.PNG (added) * code/branches/3DPacman_FS18/New Material/material/PacmanPointAfraid.material (added) * code/branches/3DPacman_FS18/New Material/mesh/PacmanPointAfraid.mesh.xml (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointAfraid.PNG (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointAfraid.blend (added) * code/branches/3DPacman_FS18/New Material/meshes/PacmanPointAfraid.pptx (added) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) Test Data Exceede Fri, 04 May 2018 22:33:41 GMT dreherm [11952] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 14 Fri, 04 May 2018 22:30:41 GMT dreherm [11951] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Afraid Test 13 Fri, 04 May 2018 22:29:25 GMT dreherm [11950] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 12 Fri, 04 May 2018 22:26:38 GMT dreherm [11949] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 11 Fri, 04 May 2018 22:16:26 GMT dreherm [11948] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 10 Fri, 04 May 2018 22:14:59 GMT dreherm [11947] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 9 Fri, 04 May 2018 22:13:52 GMT dreherm [11946] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 8 Fri, 04 May 2018 22:12:36 GMT dreherm [11945] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Afraid Test 7 Fri, 04 May 2018 21:42:09 GMT dreherm [11944] * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Afraid Test 6 Fri, 04 May 2018 21:39:18 GMT dreherm [11943] * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) Afraid Test 5 Fri, 04 May 2018 21:36:54 GMT dreherm [11942] * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) Afraid Test 4 Fri, 04 May 2018 21:34:28 GMT dreherm [11941] * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) Afraid Test 3 Fri, 04 May 2018 21:28:41 GMT dreherm [11940] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Afraid Test 2 Fri, 04 May 2018 21:22:50 GMT dreherm [11939] * code/branches/3DPacman_FS18/src/modules/pacman/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (modified) Afraid Test 1 Thu, 03 May 2018 14:09:37 GMT arismu [11938] * code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw (modified) * code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) checkpoints, boost, AI Thu, 03 May 2018 14:02:58 GMT mdedial [11937] * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.cc (modified) Another attempt at fixing random segfaults. Thu, 03 May 2018 14:01:23 GMT adamc [11936] * code/branches/ScriptableController_FS18/data/levels/AAAScriptableControllerTest.oxw (modified) * code/branches/ScriptableController_FS18/data/levels/scripts/AAAScriptableControllerTest.lua (modified) * code/branches/ScriptableController_FS18/data/levels/scripts/BBBScriptableControllerTest.lua (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) Trying to spawn entity (2nd attempt) Thu, 03 May 2018 13:57:08 GMT jacobsr [11935] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.h (modified) new functin for generating streets Thu, 03 May 2018 13:47:08 GMT sehirsch [11934] * code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt (modified) * code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadShip.cc (modified) updated camera and cube pattern Thu, 03 May 2018 13:45:20 GMT dreherm [11933] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanPointAfraid.h (added) Afraid Ghosts Thu, 03 May 2018 13:16:09 GMT adamc [11932] * code/branches/ScriptableController_FS18/data/levels/BBBScriptableControllerTest.oxw (modified) * code/branches/ScriptableController_FS18/data/levels/scripts/BBBScriptableControllerTest.lua (modified) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/AAAAutonomousDrone.cc (modified) Fixed killing and moving of entities & commit issue Thu, 03 May 2018 12:57:35 GMT dreherm [11931] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (modified) * code/branches/3DPacman_FS18/data/overlays/PacmanHUD.oxo (added) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.cc (added) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanHUDinfo.h (added) HUD first commit Thu, 03 May 2018 12:47:26 GMT mdedial [11930] * code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc (modified) Fix a bug that was trying to load mesh files with empty filenames. Thu, 03 May 2018 11:48:27 GMT mdedial [11929] * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.cc (modified) Fix intermittent segfault caused by insufficient checking of pointer ... Thu, 03 May 2018 11:46:20 GMT adamc [11928] * code/branches/ScriptableController_FS18/data/levels/AAAScriptableControllerTest.oxw (added) * code/branches/ScriptableController_FS18/data/levels/BBBScriptableControllerTest.oxw (added) * code/branches/ScriptableController_FS18/data/levels/scripts/AAAScriptableControllerTest.lua (added) * code/branches/ScriptableController_FS18/data/levels/scripts/BBBScriptableControllerTest.lua (added) * code/branches/ScriptableController_FS18/data/levels/scripts/empty.lua (added) * code/branches/ScriptableController_FS18/data/levels/templates/AAAAutonomousDroneTemplate.oxt (added) * code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller_api.cc (modified) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/AutonomousDrone.h (added) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/AAAAutonomousDrone.cc (added) * code/branches/ScriptableController_FS18/src/orxonox/worldentities/pawns/AAAAutonomousDrone.h (added) Level & Script backup Sun, 29 Apr 2018 12:07:18 GMT dreherm [11927] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 8 Sun, 29 Apr 2018 12:05:34 GMT dreherm [11926] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 7 Sun, 29 Apr 2018 12:04:08 GMT dreherm [11925] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 6 Sun, 29 Apr 2018 12:02:24 GMT dreherm [11924] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 5 Sun, 29 Apr 2018 12:01:19 GMT dreherm [11923] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 4 Sun, 29 Apr 2018 11:57:24 GMT dreherm [11922] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 3 Sun, 29 Apr 2018 11:55:17 GMT dreherm [11921] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Disk quota test 2 Sun, 29 Apr 2018 11:41:52 GMT dreherm [11920] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Disk quota test Sun, 29 Apr 2018 11:21:26 GMT dreherm [11919] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h (modified) Added movements 2 Sat, 28 Apr 2018 23:38:20 GMT dreherm [11918] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) Added Collsionshapes Sat, 28 Apr 2018 23:12:17 GMT dreherm [11917] * code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc (modified) Ghost movements complet Thu, 26 Apr 2018 14:13:28 GMT jacobsr [11916] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) experimental moving cubes 2