Changeset 10622 for code/trunk/data/particle

Timestamp:

Oct 4, 2015, 3:45:56 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/particle/FieldExplosion.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/FieldExplosion.particle)
• data/particle/GravityBombField.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/GravityBombField.particle)
• data/particle/orxonox_explosionAfterglow.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle)
• data/particle/orxonox_explosionFlame.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle)
• data/particle/orxonox_explosionFlame2.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle)
• data/particle/orxonox_explosionFlash.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle)
• data/particle/orxonox_explosionFlash2.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle)
• data/particle/orxonox_explosionShockwave.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle)
• data/particle/orxonox_explosionShockwave2.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle)
• data/particle/orxonox_explosionSparks.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle)
• data/particle/orxonox_explosionSparks2.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle)
• data/particle/orxonox_explosionStreak1.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle)
• data/particle/orxonox_explosionStreak2.particle (copied) (copied from code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle)