Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 26, 2005, 3:20:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/physics/src/world_entities/test_gun.cc

    r4178 r4301  
    3131#include "list.h"
    3232#include "animation3d.h"
     33
     34#include "object_manager.h"
    3335
    3436using namespace std;
     
    8789    }
    8890
     91  BaseObject* p = new TestBullet(this);
     92  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, *p);
     93  ObjectManager::getInstance()->debug();
    8994}
    9095
Note: See TracChangeset for help on using the changeset viewer.