Changeset 490

Timestamp:

Dec 12, 2007, 10:33:38 PM (16 years ago)

Author:

nicolasc

Message:

merged particle branch

Location:

code/branches/merger

Files:

• Media/material (copied) (copied from code/branches/particle/Media/material)
• Media/material/PE_materials.material (copied) (copied from code/branches/particle/Media/material/PE_materials.material)
• Media/particle/rauch.particle (copied) (copied from code/branches/particle/Media/particle/rauch.particle)
• Media/particle/schuss.particle (copied) (copied from code/branches/particle/Media/particle/schuss.particle)
• Media/particle/strahl.particle (copied) (copied from code/branches/particle/Media/particle/strahl.particle)
• Media/particle/strahl2.particle (copied) (copied from code/branches/particle/Media/particle/strahl2.particle)
• Media/particle/treibwerk.particle (copied) (copied from code/branches/particle/Media/particle/treibwerk.particle)
• Media/textures (copied) (copied from code/branches/particle/Media/textures)
• Media/textures/Thumbs.db (copied) (copied from code/branches/particle/Media/textures/Thumbs.db)
• Media/textures/bigflame.png (copied) (copied from code/branches/particle/Media/textures/bigflame.png)
• Media/textures/black.png (copied) (copied from code/branches/particle/Media/textures/black.png)
• Media/textures/explosion.png (copied) (copied from code/branches/particle/Media/textures/explosion.png)
• Media/textures/flare.png (copied) (copied from code/branches/particle/Media/textures/flare.png)
• Media/textures/flaretrail.png (copied) (copied from code/branches/particle/Media/textures/flaretrail.png)
• Media/textures/ring_flare.png (copied) (copied from code/branches/particle/Media/textures/ring_flare.png)
• Media/textures/ring_flare2.png (copied) (copied from code/branches/particle/Media/textures/ring_flare2.png)
• Media/textures/smoke.png (copied) (copied from code/branches/particle/Media/textures/smoke.png)
• Media/textures/streak.png (copied) (copied from code/branches/particle/Media/textures/streak.png)
• bin/resources.cfg (modified) (2 diffs)
• src/particle (copied) (copied from code/branches/particle/src/particle)
• src/particle/ParticleInterface.cc (copied) (copied from code/branches/particle/src/particle/ParticleInterface.cc)
• src/particle/ParticleInterface.h (copied) (copied from code/branches/particle/src/particle/ParticleInterface.h)

code/branches/merger/bin/resources.cfg

@@ -13 +13 @@
 FileSystem=../Media/models
 FileSystem=../Media/overlay
-#FileSystem=../Media/particle
+FileSystem=../Media/particle
 FileSystem=../Media/gui
 Zip=../Media/packs/cubemap.zip
@@ -22 +22 @@
 Zip=../Media/packs/skybox.zip
 
-# # Resource locations to be added to the 'boostrap' path
-# # This also contains the minimum you need to use the Ogre example framework
-# [Bootstrap]
-# Zip=../Media/packs/OgreCore.zip
-#
-# # Resource locations to be added to the default path
-# [General]
-# FileSystem=../Media
-# FileSystem=../Media/fonts
-# FileSystem=../Media/materials/programs
-# FileSystem=../Media/materials/scripts
-# FileSystem=../Media/materials/textures
-# FileSystem=../Media/models
-# FileSystem=../Media/overlays
-# FileSystem=../Media/particle
-# FileSystem=../Media/gui
-# FileSystem=../Media/DeferredShading../Media
-# Zip=../Media/packs/cubemap.zip
-# Zip=../Media/packs/cubemapsJS.zip
-# Zip=../Media/packs/dragon.zip
-# Zip=../Media/packs/fresneldemo.zip
-# Zip=../Media/packs/ogretestmap.zip
-# Zip=../Media/packs/skybox.zip