Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6222 in orxonox.OLD for trunk/src/lib/particles


Ignore:
Timestamp:
Dec 21, 2005, 1:49:06 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore set to
      Makefile.in
      Makefile
      configure
      *.kdevelop
      Doxyfile
      config.log
      config.h
      config.status
      stamp-h1
      autom4te.cache
      aclocal.m4

  • trunk/src

    • Property svn:ignore set to
      .deps
      orxonox
      Makefile
      Makefile.in

  • trunk/src/lib

    • Property svn:ignore set to
      Makefile
      Makefile.in
      .deps
      libORXlibs.a

  • trunk/src/lib/particles

    • Property svn:ignore set to
      Makefile
      Makefile.in
      .deps
      libORX*

  • trunk/src/lib/particles/particle_system.cc

    r5994 r6222  
    130130  LoadParam(root, "type", this, ParticleSystem, setType)
    131131      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
     132
     133  LoadParam(root, "texture", this, ParticleSystem, setMaterialTexture);
    132134
    133135  LOAD_PARAM_START_CYCLE(root, element);
Note: See TracChangeset for help on using the changeset viewer.