Changeset 6634 in orxonox.OLD for trunk/src/world_entities/Makefile.am

Timestamp:

Jan 21, 2006, 1:18:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

• trunk/src/world_entities/Makefile.am (modified) (2 diffs)

trunk/src/world_entities/Makefile.am

@@ -23 +23 @@
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
+                  world_entities/image_entity.cc \
+                  world_entities/planet.cc \
                   \
                   world_entities/weapons/weapon_manager.cc \
@@ -72 +74 @@
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \
+                 world_entities/image_entity.h \
+                 world_entities/planet.h \
                  \
                  world_entities/weapons/weapon_manager.h \