# # ChangeLog for code/branches/resource2/data # # Generated by Trac 1.0.9 # Nov 30, 2024, 7:03:05 AM Sat, 29 Aug 2009 20:04:04 GMT rgrieder [5689] * code/branches/resource2/cmake/LibraryConfig.cmake (modified) * code/branches/resource2/data/particle/Example-Water.particle (modified) * code/branches/resource2/data/particle/Example.particle (modified) * code/branches/resource2/data/particle/ExplosionComp1.particle (modified) * code/branches/resource2/data/particle/ExplosionComp2.particle (modified) * code/branches/resource2/data/particle/ExplosionComp4.particle (modified) * code/branches/resource2/data/particle/FireComp2.particle (modified) * code/branches/resource2/data/particle/LaserGun.particle (modified) * code/branches/resource2/data/particle/ThrusterFire.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part1.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part2.particle (modified) * code/branches/resource2/data/particle/bigexplosion1part3.particle (modified) * code/branches/resource2/data/particle/emitted_emitter.particle (modified) * code/branches/resource2/data/particle/engineglow.particle (modified) * code/branches/resource2/data/particle/explosion1.particle (modified) * code/branches/resource2/data/particle/explosion2.particle (modified) * code/branches/resource2/data/particle/explosion2b.particle (modified) * code/branches/resource2/data/particle/explosion3.particle (modified) * code/branches/resource2/data/particle/fairytwirl.particle (modified) * code/branches/resource2/data/particle/fire3.particle (modified) * code/branches/resource2/data/particle/fire4.particle (modified) * code/branches/resource2/data/particle/forcefield.particle (modified) * code/branches/resource2/data/particle/ray1.particle (modified) * code/branches/resource2/data/particle/ray2.particle (modified) * code/branches/resource2/data/particle/repairGold.particle (modified) * code/branches/resource2/data/particle/repairSilver.particle (modified) * code/branches/resource2/data/particle/shot1.particle (modified) * code/branches/resource2/data/particle/shot2.particle (modified) * code/branches/resource2/data/particle/shot2_small.particle (modified) * code/branches/resource2/data/particle/shot3_small.particle (modified) * code/branches/resource2/data/particle/shotTest.particle (modified) * code/branches/resource2/data/particle/smoke1.particle (modified) * code/branches/resource2/data/particle/smoke2.particle (modified) * code/branches/resource2/data/particle/smoke3.particle (modified) * code/branches/resource2/data/particle/smoke4.particle (modified) * code/branches/resource2/data/particle/smoke5.particle (modified) * code/branches/resource2/data/particle/smoke6.particle (modified) * code/branches/resource2/data/particle/smoke7.particle (modified) * code/branches/resource2/data/particle/sparks.particle (modified) * code/branches/resource2/data/particle/thruster1.particle (modified) * code/branches/resource2/data/particle/thruster2.particle (modified) * code/branches/resource2/data/particle/thruster3.particle (modified) * code/branches/resource2/src/core/CMakeLists.txt (modified) * code/branches/resource2/src/core/CorePrereqs.h (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/MemoryArchive.cc (added) * code/branches/resource2/src/core/MemoryArchive.h (added) Experimental support for OGRE v1.6 "Shoggoth". I had to write a ... Wed, 19 Aug 2009 10:27:59 GMT rgrieder [5662] * code/branches/resource2/data/CMakeLists.txt (modified) * code/branches/resource2/src/core/Game.cc (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/orxonox/tools/ResourceCollection.cc (modified) Fixed build and a few issues and removed a warning. Tue, 18 Aug 2009 22:19:11 GMT rgrieder [5661] * code/branches/resource2/data/gui/layouts/MainMenu.layout (moved) * code/branches/resource2/data/gui/scripts/BasicGUI.lua (moved) * code/branches/resource2/data/gui/scripts/IConsole.lua (deleted) * code/branches/resource2/data/gui/scripts/InitialiseGUI.lua (moved) * code/branches/resource2/data/gui/scripts/InstancedInit.lua (deleted) * code/branches/resource2/data/gui/scripts/MainMenu.lua (moved) * code/branches/resource2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/resource2/data/gui/scripts/demo8.lua (deleted) * code/branches/resource2/data/gui/scripts/inGameTest.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI.lua (deleted) * code/branches/resource2/data/gui/scripts/loadGUI_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_2.lua (deleted) * code/branches/resource2/data/gui/scripts/mainmenu_3.lua (deleted) * code/branches/resource2/data/lua/LuaStateInit.lua (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GUIManager.h (modified) * code/branches/resource2/src/core/LuaState.cc (modified) * code/branches/resource2/src/core/LuaState.h (modified) * code/branches/resource2/src/orxonox/gamestates/GSMainMenu.cc (modified) Cleaned out the lua script files for the GUI. Also replaced ... Mon, 17 Aug 2009 19:12:54 GMT rgrieder [5657] * code/branches/resource2/data/resources.oxr (modified) * code/branches/resource2/data/resources_graphics.oxr (deleted) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * data/branches/media_stripped/resources.oxr (modified) * data/branches/media_stripped/resources_graphics.oxr (deleted) Dividing the resource locations isn't necessary after all: The trick ... Mon, 17 Aug 2009 18:50:41 GMT rgrieder [5656] * code/branches/resource2/data/overlays (moved) * code/branches/resource2/data/resources.oxr (modified) Renamed "overlay" folder to "overlays" to keep it consistent with ... Mon, 17 Aug 2009 14:37:10 GMT rgrieder [5654] * code/branches/resource2/data/levels/empty_level.oxw (modified) * code/branches/resource2/data/levels/gametype_asteroids.oxw (modified) * code/branches/resource2/data/levels/gametype_underattack.oxw (modified) * code/branches/resource2/data/levels/old/CuboidSpaceStation.oxw (modified) * code/branches/resource2/data/levels/old/physicstest2.oxw (modified) * code/branches/resource2/data/levels/old/planettest.oxw (modified) * code/branches/resource2/data/levels/old/presentation_physics.oxw (modified) * code/branches/resource2/data/levels/old/princessaeryn.oxw (modified) * code/branches/resource2/data/levels/old/questsystem.oxw (modified) * code/branches/resource2/data/levels/old/sample4.oxw (modified) * code/branches/resource2/data/levels/pickuptest.oxw (modified) * code/branches/resource2/data/levels/presentation.oxw (modified) * code/branches/resource2/data/levels/presentation09.oxw (modified) * code/branches/resource2/data/levels/presentation09b.oxw (modified) * code/branches/resource2/data/levels/presentation_dm.oxw (modified) * code/branches/resource2/data/levels/presentation_pong.oxw (modified) * code/branches/resource2/data/levels/teambasematchlevel.oxw (modified) * code/branches/resource2/data/levels/teamdeathmatch.oxw (modified) * code/branches/resource2/data/levels/templates/spaceship_H2.oxt (modified) * code/branches/resource2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/resource2/data/levels/templates/spaceship_pirate.oxt (modified) * code/branches/resource2/data/levels/tutorial.oxw (modified) * code/branches/resource2/data/levels/waypoints.oxw (modified) * code/branches/resource2/data/lua (added) * code/branches/resource2/data/lua/LuaStateInit.lua (added) * code/branches/resource2/data/resources.cfg (deleted) * code/branches/resource2/data/resources.oxr (modified) * code/branches/resource2/data/resources_graphics.oxr (copied) * code/branches/resource2/src/core/CMakeLists.txt (modified) * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/CorePrereqs.h (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.cc (modified) * code/branches/resource2/src/core/GraphicsManager.h (modified) * code/branches/resource2/src/core/Loader.cc (modified) * code/branches/resource2/src/core/Loader.h (modified) * code/branches/resource2/src/core/LuaState.cc (moved) * code/branches/resource2/src/core/LuaState.h (moved) * code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/resource2/src/orxonox/objects/Level.cc (modified) * code/branches/resource2/src/orxonox/objects/Script.cc (modified) * code/branches/resource2/src/orxonox/objects/Script.h (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.cc (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.h (modified) * data/branches/media_stripped/resources.cfg (deleted) * data/branches/media_stripped/resources.oxr (modified) * data/branches/media_stripped/resources_graphics.oxr (copied) - Implemented file management via resource manager and loading of ... Thu, 13 Aug 2009 20:54:59 GMT rgrieder [5646] * code/branches/resource2/data (moved) It seems that TortoiseSVN made a terrible mess of the media folder. I ... Thu, 13 Aug 2009 20:50:07 GMT rgrieder [5645] * code/branches/resource2 (modified) * code/branches/resource2/CMakeLists.txt (modified) * code/branches/resource2/cmake/BuildConfig.cmake (modified) * code/branches/resource2/media/CMakeLists.txt (modified) * code/branches/resource2/media/DataInstallScript.cmake (moved) * code/branches/resource2/src/SpecialConfig.h.in (modified) * code/branches/resource2/src/core/ConfigFileManager.cc (modified) * code/branches/resource2/src/core/Core.cc (modified) * code/branches/resource2/src/core/Core.h (modified) * code/branches/resource2/src/core/GUIManager.cc (modified) * code/branches/resource2/src/core/LuaBind.cc (modified) * code/branches/resource2/src/orxonox/LevelManager.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/resource2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/resource2/src/orxonox/objects/Level.cc (modified) * code/branches/resource2/src/orxonox/sound/SoundBase.cc (modified) Renamed media to data to restore consistency with game/data/trunk ...