# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 22, 2024, 3:29:28 PM Fri, 20 Apr 2012 14:27:52 GMT mentzerf [9104] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * Changed TowerDefense superclass to DeathMatch * Updated oxw Fri, 20 Apr 2012 14:26:03 GMT mentzerf [9103] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (modified) * Changed TowerDefense superclass to DeathMatch * Updated oxw Fri, 20 Apr 2012 14:19:27 GMT huttemat [9101] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.h (modified) changing xml files Fri, 20 Apr 2012 14:06:09 GMT lkevin [9099] * code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/pickup2012/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup2012/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h (modified) Found a way to implement damage modifiers by adding a flag to the ... Fri, 20 Apr 2012 13:00:32 GMT mentzerf [9098] * code/branches/newlevel2012/data/levels/towerDefense.oxw (modified) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (added) * code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h (added) Added Gametype class Fri, 20 Apr 2012 12:28:46 GMT mentzerf [9097] * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (modified) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/playfield_top.png (added) Renamed playfield texture Fri, 20 Apr 2012 12:00:47 GMT mentzerf [9096] * code/branches/newlevel2012/.project (added) * code/branches/newlevel2012/data/levels/towerDefense.oxw (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/OgreXMLConverter.log (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield.material (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Playfield_ME.mesh.xml (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/Spielfeld.blend1 (added) * code/branches/newlevel2012/src/modules/towerdefense/Spielfeld Blender/plazfield_top.png (added) Added level files Fri, 20 Apr 2012 11:52:01 GMT mentzerf [9095] * code/branches/newlevel2012/data/levels/emptyLevel.oxw (modified) restored emptzlevel and added towerdefense test level\ Fri, 20 Apr 2012 11:43:35 GMT mentzerf [9094] * code/branches/newlevel2012/data/levels/emptyLevel.oxw (modified) Added Textures and Cube into empty level Fri, 20 Apr 2012 11:11:30 GMT scmoritz [9093] * code/branches/waypoints/src/orxonox/controllers/FormationController.cc (modified) Movement to Waypoint fixed. Speed still has to get adjusted 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. Mon, 02 Apr 2012 18:40:25 GMT dafrick [9079] * code/branches/questlog (copied) New branch to work on questlog/questmenu. Sun, 01 Apr 2012 19:05:30 GMT landauf [9078] * code/branches/testing/src/external/gtest/src/gtest.cc (modified) small fix in google-test that seems to prevent a windows dialog from ... Sun, 01 Apr 2012 16:48:06 GMT landauf [9077] * code/branches/testing/cmake/LibraryConfig.cmake (modified) * code/branches/testing/src/libraries/util/Math.h (modified) * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/CTestCustom.cmake (modified) reverted changes of r9020 in LibraryConfig.cmake fixed warning in ... Sun, 01 Apr 2012 09:07:02 GMT landauf [9076] * code/branches/testing/src/libraries/util/StringUtils.cc (modified) * code/branches/testing/src/libraries/util/StringUtils.h (modified) small fixes and adjustments of code and documentation Fri, 30 Mar 2012 14:28:52 GMT huttemat [9074] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) test Fri, 30 Mar 2012 13:58:16 GMT laumerf [9071] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) checkpoints Fri, 30 Mar 2012 13:52:42 GMT toliecht [9070] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) bla Fri, 30 Mar 2012 13:11:39 GMT weigeltm [9066] * code/branches/newlevel2012/src/modules/towerdefense (added) * code/branches/newlevel2012/src/modules/towerdefense/TDEnemy.h (added) derp Fri, 30 Mar 2012 11:51:55 GMT laumerf [9061] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) * code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt (modified) new collision shape Fri, 30 Mar 2012 11:21:49 GMT laumerf [9059] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) * code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt (added) added new files Fri, 23 Mar 2012 15:24:24 GMT huttemat [9057] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.cc (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.h (modified) test2 Fri, 23 Mar 2012 15:16:03 GMT laumerf [9056] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) Ebene eingefuegt Fri, 23 Mar 2012 15:02:52 GMT scmoritz [9054] * code/branches/waypoints/src/orxonox/controllers/FormationController.cc (modified) kein Zittern mehr, vereinzelte ungeplante Richtungsaenderungen Sun, 18 Mar 2012 17:43:24 GMT landauf [9047] * code/branches/testing/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/testing/src/libraries/util/SubString.cc (modified) * code/branches/testing/src/libraries/util/SubString.h (modified) * code/branches/testing/src/libraries/util/VA_NARGS.h (modified) * code/branches/testing/src/modules/notifications/dispatchers/CommandNotification.cc (modified) made SubString more standard compliant Sat, 17 Mar 2012 18:19:14 GMT huttemat [9046] * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) test Fri, 16 Mar 2012 15:54:46 GMT huttemat [9045] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua (added) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/src/orxonox/LevelInfo.cc (modified) added wip ship selection menu Fri, 16 Mar 2012 15:06:01 GMT scmoritz [9043] * code/branches/waypoints/src/orxonox/controllers/FormationController.cc (modified) Fri, 16 Mar 2012 14:35:58 GMT toliecht [9041] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) test Fri, 16 Mar 2012 14:35:44 GMT fmauro [9040] * code/branches/captureTheFlag (copied) Created captureTheFlag branch Fri, 16 Mar 2012 14:33:05 GMT huttemat [9039] * code/branches/shipSelection/data/gui/layouts/ShipSelectionMenu.layout (added) * code/branches/shipSelection/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/shipSelection/data/levels/tutorial.oxw (modified) Added ShipSelectionMenu.layout Fri, 16 Mar 2012 14:22:27 GMT fmauro [9038] * code/branches/shipSelection (copied) Created shipSelection branch Fri, 16 Mar 2012 13:55:29 GMT toliecht [9037] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) test Fri, 16 Mar 2012 13:50:16 GMT laumerf [9036] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (modified) Test Fri, 16 Mar 2012 13:43:36 GMT laumerf [9035] * code/branches/surfaceRace/data/levels/surfaceRace.oxw (added) Created new Level (surfaceRace.oxw) Fri, 16 Mar 2012 13:42:13 GMT pianezza [9034] * code/branches/dialogsystem2012 (copied) Fri, 16 Mar 2012 13:32:17 GMT weigeltm [9033] * code/branches/newlevel2012 (copied) Fri, 16 Mar 2012 13:11:02 GMT fmauro [9032] * code/branches/waypoints (copied) Created waypoints branch Fri, 16 Mar 2012 13:08:27 GMT smerkli [9031] * code/branches/spacebomb (copied) Fri, 16 Mar 2012 13:04:15 GMT smerkli [9030] * code/branches/spacegate (copied) Fri, 16 Mar 2012 12:50:11 GMT lkevin [9029] * code/branches/pickup2012 (copied) Fri, 16 Mar 2012 12:47:59 GMT fmauro [9028] * code/branches/surfaceRace (copied) Added surfaceRace branch 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, 11 Mar 2012 20:19:47 GMT landauf [9026] * code/branches/testing/src/libraries/util/Math.h (modified) * code/branches/testing/test/util/MathTest.cc (modified) removed obsolete (and wrong for negative values) round() function ... Sun, 11 Mar 2012 19:26:30 GMT landauf [9025] * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/CTestCustom.cmake (added) * code/branches/testing/test/util (added) * code/branches/testing/test/util/CMakeLists.txt (added) * code/branches/testing/test/util/MathTest.cc (added) - added CTestCustom.cmake to add dependencies to $PATH when executing ... 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) Sun, 26 Feb 2012 15:22:54 GMT landauf [9022] * code/branches/testing/test/CMakeLists.txt (modified) * code/branches/testing/test/gtest_samples (added) * code/branches/testing/test/gtest_samples/prime_tables.h (added) * code/branches/testing/test/gtest_samples/sample1.cc (added) * code/branches/testing/test/gtest_samples/sample1.h (added) * code/branches/testing/test/gtest_samples/sample1_unittest.cc (added) * code/branches/testing/test/gtest_samples/sample2.cc (added) * code/branches/testing/test/gtest_samples/sample2.h (added) * code/branches/testing/test/gtest_samples/sample2_unittest.cc (added) * code/branches/testing/test/gtest_samples/sample3-inl.h (added) * code/branches/testing/test/gtest_samples/sample3_unittest.cc (added) * code/branches/testing/test/gtest_samples/sample4.cc (added) * code/branches/testing/test/gtest_samples/sample4.h (added) * code/branches/testing/test/gtest_samples/sample4_unittest.cc (added) sample tests with google test Sun, 26 Feb 2012 15:10:12 GMT landauf [9021] * code/branches/testing/src/external/CMakeLists.txt (modified) * code/branches/testing/src/external/gmock (added) * code/branches/testing/src/external/gmock/CMakeLists.txt (added) * code/branches/testing/src/external/gmock/CONTRIBUTORS (added) * code/branches/testing/src/external/gmock/COPYING (added) * code/branches/testing/src/external/gmock/README (added) * code/branches/testing/src/external/gmock/include (added) * code/branches/testing/src/external/gmock/include/gmock (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-actions.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-cardinalities.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-generated-actions.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-generated-function-mockers.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-generated-matchers.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-generated-nice-strict.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-matchers.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-more-actions.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock-spec-builders.h (added) * code/branches/testing/src/external/gmock/include/gmock/gmock.h (added) * code/branches/testing/src/external/gmock/include/gmock/internal (added) * code/branches/testing/src/external/gmock/include/gmock/internal/gmock-generated-internal-utils.h (added) * code/branches/testing/src/external/gmock/include/gmock/internal/gmock-internal-utils.h (added) * code/branches/testing/src/external/gmock/include/gmock/internal/gmock-port.h (added) * code/branches/testing/src/external/gmock/src (added) * code/branches/testing/src/external/gmock/src/gmock-all.cc (added) * code/branches/testing/src/external/gmock/src/gmock-cardinalities.cc (added) * code/branches/testing/src/external/gmock/src/gmock-internal-utils.cc (added) * code/branches/testing/src/external/gmock/src/gmock-matchers.cc (added) * code/branches/testing/src/external/gmock/src/gmock-spec-builders.cc (added) * code/branches/testing/src/external/gmock/src/gmock.cc (added) * code/branches/testing/src/external/gmock/src/gmock_main.cc (added) * code/branches/testing/src/external/gtest (added) * code/branches/testing/src/external/gtest/CMakeLists.txt (added) * code/branches/testing/src/external/gtest/CONTRIBUTORS (added) * code/branches/testing/src/external/gtest/COPYING (added) * code/branches/testing/src/external/gtest/README (added) * code/branches/testing/src/external/gtest/include (added) * code/branches/testing/src/external/gtest/include/gtest (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-death-test.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-message.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-param-test.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-printers.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-spi.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-test-part.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest-typed-test.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest_pred_impl.h (added) * code/branches/testing/src/external/gtest/include/gtest/gtest_prod.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-death-test-internal.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-filepath.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-internal.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-linked_ptr.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-param-util-generated.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-param-util.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-port.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-string.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-tuple.h (added) * code/branches/testing/src/external/gtest/include/gtest/internal/gtest-type-util.h (added) * code/branches/testing/src/external/gtest/src (added) * code/branches/testing/src/external/gtest/src/gtest-all.cc (added) * code/branches/testing/src/external/gtest/src/gtest-death-test.cc (added) * code/branches/testing/src/external/gtest/src/gtest-filepath.cc (added) * code/branches/testing/src/external/gtest/src/gtest-internal-inl.h (added) * code/branches/testing/src/external/gtest/src/gtest-port.cc (added) * code/branches/testing/src/external/gtest/src/gtest-printers.cc (added) * code/branches/testing/src/external/gtest/src/gtest-test-part.cc (added) * code/branches/testing/src/external/gtest/src/gtest-typed-test.cc (added) * code/branches/testing/src/external/gtest/src/gtest.cc (added) * code/branches/testing/src/external/gtest/src/gtest_main.cc (added) added google test and google mock to external libraries Sat, 25 Feb 2012 19:13:19 GMT landauf [9020] * code/branches/testing/cmake/LibraryConfig.cmake (modified) * code/branches/testing/test/BoostTest.cc (added) * code/branches/testing/test/CMakeLists.txt (modified) sample tests with boost test Thu, 23 Feb 2012 19:52:57 GMT jo [9019] * code/branches/tutorial2/data/levels/tutorial.oxw (modified) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h (added) Copied trunk & added files for the coding tutorial in order to update ... Thu, 23 Feb 2012 19:12:10 GMT jo [9018] * code/branches/tutorial2 (copied) Mon, 20 Feb 2012 21:17:56 GMT landauf [9017] * code/branches/testing/CMakeLists.txt (modified) * code/branches/testing/test (added) * code/branches/testing/test/CMakeLists.txt (added) * code/branches/testing/test/SampleTest.cc (added) sample tests with ctest Sun, 12 Feb 2012 17:24:32 GMT landauf [9015] * code/branches/testing (copied) creating branch to experiment with testing frameworks Wed, 21 Dec 2011 08:42:58 GMT smerkli [9014] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Scaled up the collision shape for the planet in asteroidFieldTest to ... Wed, 21 Dec 2011 07:13:29 GMT jo [9013] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Added more enemies. Tue, 20 Dec 2011 22:10:32 GMT jo [9012] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Level update - now with improved concept. Tue, 20 Dec 2011 21:53:13 GMT smerkli [9011] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Built saturn-like thing in asteriodfieldtest Tue, 20 Dec 2011 21:41:35 GMT jo [9010] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) First draft. How it works: activate the bots by flying through the ... Tue, 20 Dec 2011 21:03:15 GMT jo [9009] * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.h (modified) Quick fix for the rocket. Taking care of this issue later. Tue, 20 Dec 2011 20:39:41 GMT jo [9008] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS11.oxw (modified) Working on the levels. Tue, 20 Dec 2011 20:29:09 GMT smerkli [9007] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) Added a planet with orbitting space trash to level. Mon, 19 Dec 2011 23:03:21 GMT jo [9006] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS11.oxw (added) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) Repairing setbotlevel command. Start of a presentation level. Mon, 19 Dec 2011 13:43:04 GMT willis [9005] * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.cc (modified) fixed merging some merging bugs and some other bugs... Sun, 18 Dec 2011 17:19:02 GMT jo [9003] * code/branches/presentation2011/data/levels/Spacerace2.oxw (modified) Spacerace level update. Sun, 18 Dec 2011 16:45:04 GMT jo [9001] * code/branches/presentation2011/data/levels/missionOne.oxw (modified) Papercut in the tutorial level. Sun, 18 Dec 2011 14:24:21 GMT jo [9000] * code/branches/presentation2011/src/modules/gametypes/OldRaceCheckPoint.cc (added) * code/branches/presentation2011/src/modules/gametypes/OldRaceCheckPoint.h (added) * code/branches/presentation2011/src/modules/gametypes/OldSpaceRace.cc (added) * code/branches/presentation2011/src/modules/gametypes/OldSpaceRace.h (added) Forgot to add new files. Sun, 18 Dec 2011 14:22:43 GMT jo [8999] * code/branches/presentation2011/data/levels/spaceRace.oxw (modified) * code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/gametypes/GametypesPrereqs.h (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.h (modified) Old version of the SpaceRace added. Sun, 18 Dec 2011 13:35:02 GMT jo [8998] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/levels/Spacerace2.oxw (copied) * code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/presentation2011/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRace.h (modified) * code/branches/presentation2011/src/modules/gametypes/SpaceRaceManager.cc (copied) * code/branches/presentation2011/src/modules/gametypes/SpaceRaceManager.h (copied) * code/branches/presentation2011/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/presentation2011/src/modules/objects/triggers/MultiTrigger.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2011/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/presentation2011/src/orxonox/infos/PlayerInfo.cc (modified) Merged SpaceraceTwo. Old racelevel does not work anymore. Sun, 18 Dec 2011 12:58:58 GMT jo [8997] * code/branches/presentation2011/src/orxonox/gametypes/Mission.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) Small edits. Documentation. Sun, 18 Dec 2011 00:18:51 GMT jo [8996] * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) Repaired xml-interface in order to set a bot's team directly in the ... Sat, 17 Dec 2011 22:49:36 GMT jo [8995] * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (modified) check to prevent crashes. Sat, 17 Dec 2011 00:03:45 GMT jo [8994] * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/overlays/underAttackHUD.oxo (modified) * code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc (modified) Removing tansporter's healthbar. Fri, 16 Dec 2011 23:35:33 GMT jo [8993] * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.h (modified) Repairing the radar. Fri, 16 Dec 2011 19:36:41 GMT jo [8992] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (copied) * code/branches/presentation2011/src/orxonox/controllers/FormationController.h (copied) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.cc (modified) Merged Formation branch. There are still some bugs (just have a look ... Fri, 16 Dec 2011 15:56:15 GMT jo [8991] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.h (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) Works. (Seperate/independent states are used to manage the behaviour). Fri, 16 Dec 2011 15:25:28 GMT jo [8990] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/AIController.h (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) * code/branches/formation/src/orxonox/controllers/FormationController.h (modified) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/NewHumanController.cc (modified) Rough adding of both concepts. Further work on the states is needed. ... Wed, 14 Dec 2011 18:13:09 GMT jo [8989] * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (modified) Preparation before merging. Wed, 14 Dec 2011 15:45:22 GMT smerkli [8988] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentation2011/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation2011/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation2011/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.cc (modified) merged hud branch Wed, 14 Dec 2011 15:33:22 GMT mspaling [8987] * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.cc (added) * code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.h (added) added missing files Wed, 14 Dec 2011 15:22:57 GMT mspaling [8986] * code/branches/hud/src/orxonox/controllers/NewHumanController.h (modified) EnemyHealthBar is done! :) Wed, 14 Dec 2011 15:02:06 GMT smerkli [8985] * code/branches/formation/src/orxonox/controllers/Masterable.cc (deleted) * code/branches/formation/src/orxonox/controllers/Masterable.h (deleted) Removed Masterable.* files Wed, 14 Dec 2011 14:53:15 GMT eceline [8983] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.h (modified) * code/branches/spaceraceTwo/src/orxonox/controllers/WaypointPatrolController.cc (modified) a few changes Wed, 14 Dec 2011 14:20:50 GMT jo [8982] * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) pirateattck.oxw fixed Wed, 14 Dec 2011 14:17:58 GMT jo [8981] * code/branches/presentation2011/data/levels/asteroidField.oxw (modified) * code/branches/presentation2011/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) Fixed level preview screenshots & levelinfo tags Wed, 14 Dec 2011 13:38:37 GMT jo [8980] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2011/data/levels/fightInOurBack.oxw (modified) * code/branches/presentation2011/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentation2011/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStandingII.oxw (modified) * code/branches/presentation2011/data/levels/missionOne.oxw (modified) * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2011/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentation2011/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2011/src/modules/pong/Pong.cc (modified) * code/branches/presentation2011/src/modules/pong/Pong.h (modified) * code/branches/presentation2011/src/modules/pong/PongAI.h (modified) * code/branches/presentation2011/src/modules/pong/PongScore.cc (modified) * code/branches/presentation2011/src/modules/pong/PongScore.h (modified) * code/branches/presentation2011/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2011/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/AIController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2011/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/presentation2011/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2011/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/Mission.cc (copied) * code/branches/presentation2011/src/orxonox/gametypes/Mission.h (copied) * code/branches/presentation2011/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc (copied) * code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.h (copied) * code/branches/presentation2011/src/orxonox/infos/GametypeInfo.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/Pawn.h (modified) teamgametype merged into trunk Wed, 14 Dec 2011 13:16:45 GMT eceline [8979] * code/branches/spaceraceTwo/data/levels/Spacerace2.oxw (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/RaceCheckPoint.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified) * code/branches/spaceraceTwo/src/modules/gametypes/SpaceRaceManager.cc (modified) not much changed Wed, 14 Dec 2011 13:15:45 GMT willis [8978] * code/branches/formation/src/orxonox/controllers/AIController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/formation/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/formation/src/orxonox/controllers/FormationController.cc (added) * code/branches/formation/src/orxonox/controllers/FormationController.h (added) * code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) * code/branches/formation/src/orxonox/controllers/HumanController.h (modified) renamed Masterable to FormationController, some minor changes Wed, 14 Dec 2011 13:12:11 GMT smerkli [8977] * code/branches/presentation2011 (modified) * code/branches/presentation2011/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation2011/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/presentation2011/data/gui/layouts/SingleplayerConfigMenu.layout (copied) * code/branches/presentation2011/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentation2011/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/presentation2011/data/gui/scripts/SingleplayerConfigMenu.lua (copied) * code/branches/presentation2011/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2011/data/levels/FPSTest.oxw (modified) * code/branches/presentation2011/data/levels/asteroids.oxw (modified) * code/branches/presentation2011/data/levels/docking.oxw (modified) * code/branches/presentation2011/data/levels/dynamicMatch.oxw (modified) * code/branches/presentation2011/data/levels/earth.oxw (modified) * code/branches/presentation2011/data/levels/emptyLevel.oxw (modified) * code/branches/presentation2011/data/levels/events.oxw (modified) * code/branches/presentation2011/data/levels/lastManStanding.oxw (modified) * code/branches/presentation2011/data/levels/lastTeamStanding.oxw (modified) * code/branches/presentation2011/data/levels/myTestLevel.oxw (modified) * code/branches/presentation2011/data/levels/notifications.oxw (modified) * code/branches/presentation2011/data/levels/pickups.oxw (modified) * code/branches/presentation2011/data/levels/pirateAttack.oxw (modified) * code/branches/presentation2011/data/levels/planets.oxw (modified) * code/branches/presentation2011/data/levels/pong.oxw (modified) * code/branches/presentation2011/data/levels/portals.oxw (modified) * code/branches/presentation2011/data/levels/presentation.oxw (modified) * code/branches/presentation2011/data/levels/presentation09.oxw (modified) * code/branches/presentation2011/data/levels/presentation09b.oxw (modified) * code/branches/presentation2011/data/levels/presentationDM.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS102.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS10Ed.oxw (modified) * code/branches/presentation2011/data/levels/presentationFS11.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2011/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation2011/data/levels/princessAeryn.oxw (modified) * code/branches/presentation2011/data/levels/quests.oxw (modified) * code/branches/presentation2011/data/levels/screenshot.oxw (modified) * code/branches/presentation2011/data/levels/shieldTest.oxw (modified) * code/branches/presentation2011/data/levels/sound.oxw (modified) * code/branches/presentation2011/data/levels/spaceRace.oxw (modified) * code/branches/presentation2011/data/levels/teamBaseMatch.oxw (modified) * code/branches/presentation2011/data/levels/teamDeathMatch.oxw (modified) * code/branches/presentation2011/data/levels/testStars.oxw (modified) * code/branches/presentation2011/data/levels/testSwallow.oxw (modified) * code/branches/presentation2011/data/levels/tetris.oxw (modified) * code/branches/presentation2011/data/levels/theTimeMachine.oxw (modified) * code/branches/presentation2011/data/levels/tutorial.oxw (modified) * code/branches/presentation2011/data/levels/underAttack.oxw (modified) * code/branches/presentation2011/data/levels/waypoints.oxw (modified) * code/branches/presentation2011/src/orxonox/Level.cc (modified) * code/branches/presentation2011/src/orxonox/Level.h (modified) * code/branches/presentation2011/src/orxonox/LevelInfo.cc (modified) * code/branches/presentation2011/src/orxonox/LevelInfo.h (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/branches/presentation2011/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) Merged menue