# # ChangeLog for code/branches/pCuts # # Generated by Trac 1.0.9 # May 18, 2024, 11:33:58 AM Sun, 10 Jun 2012 15:03:16 GMT jo [9285] * code/branches/pCuts/src/modules/pong/Pong.cc (modified) * code/branches/pCuts/src/modules/pong/Pong.h (modified) * code/branches/pCuts/src/modules/pong/PongScore.cc (modified) Adaptions for easier merge. Tue, 17 Apr 2012 21:51:21 GMT jo [9092] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisScore.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisScore.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) Tetris on the way to get completed. I fixed some bugs concerning ... Mon, 16 Apr 2012 20:42:57 GMT jo [9091] * code/branches/pCuts/src/modules/tetris/TetrisScore.cc (added) * code/branches/pCuts/src/modules/tetris/TetrisScore.h (added) Adding missing files. Mon, 16 Apr 2012 20:29:49 GMT jo [9090] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/pong/Pong.cc (modified) * code/branches/pCuts/src/modules/pong/Pong.h (modified) * code/branches/pCuts/src/modules/pong/PongScore.cc (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisPrereqs.h (modified) Fighting with the controller. 'Undefined reference to ... Sat, 14 Apr 2012 20:03:54 GMT jo [9089] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) Almost playable :-) Two obvious bugs are remaining concerning ... Sat, 14 Apr 2012 16:07:44 GMT jo [9088] * code/branches/pCuts/data/levels/tetris.oxw (modified) Still a long way to go. A short todo list can be found at the ... Sat, 14 Apr 2012 15:45:44 GMT jo [9087] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) Still a long way to go. A short todo list can be found at the ... Sat, 14 Apr 2012 13:32:56 GMT jo [9086] * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) Tetris contais almost the same features as before introducing bricks. ... Fri, 13 Apr 2012 15:44:29 GMT jo [9085] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) backup checkin - still the same bugs experiencable Thu, 12 Apr 2012 17:05:57 GMT jo [9084] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (modified) * code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc (modified) Rotating bricks works. Next step: repairing the collision detection. Wed, 11 Apr 2012 16:35:15 GMT jo [9083] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/pCuts/src/orxonox/worldentities/ControllableEntity.cc (modified) Camera works. Wed, 11 Apr 2012 13:53:43 GMT jo [9082] * code/branches/pCuts/data/levels/tetris.oxw (modified) * code/branches/pCuts/src/modules/tetris/CMakeLists.txt (modified) * code/branches/pCuts/src/modules/tetris/Tetris.cc (modified) * code/branches/pCuts/src/modules/tetris/Tetris.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisBrick.cc (added) * code/branches/pCuts/src/modules/tetris/TetrisBrick.h (added) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisCenterpoint.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisPrereqs.h (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.h (modified) Trying to create tetris bricks. Rough implementation done. Still ... Thu, 05 Apr 2012 09:12:08 GMT jo [9081] * code/branches/pCuts/src/modules/pong/Pong.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.cc (modified) * code/branches/pCuts/src/modules/tetris/TetrisStone.h (modified) Added rotation to the TetrisStones. Wed, 14 Mar 2012 22:21:04 GMT jo [9027] * code/branches/pCuts/data/levels/presentationHS11.oxw (modified) * code/branches/pCuts/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/pCuts/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/pCuts/src/orxonox/gametypes/TeamGametype.cc (modified) Added in game documentation for new group behaviour. Sun, 26 Feb 2012 21:36:04 GMT jo [9024] * code/branches/pCuts/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pCuts/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/pCuts/src/orxonox/gametypes/TeamDeathmatch.h (modified) I restructured the inheritance of gametypes: The base class of ... Sun, 26 Feb 2012 20:27:27 GMT jo [9023] * code/branches/pCuts (copied) Wed, 15 Feb 2012 22:51:58 GMT jo [9016] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (copied) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/asteroidField.lua (copied) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (copied) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/underAttackHUD.oxo (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (copied) * code/trunk/src/modules/gametypes/OldSpaceRace.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (copied) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (copied) * code/trunk/src/orxonox/controllers/FormationController.h (copied) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (copied) * code/trunk/src/orxonox/gametypes/Mission.h (copied) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (copied) * code/trunk/src/orxonox/gametypes/TeamGametype.h (copied) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merging presentation2011 branch to trunk. Please check for possible bugs.