Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6634 in orxonox.OLD for trunk/src/subprojects


Ignore:
Timestamp:
Jan 21, 2006, 1:18:19 AM (19 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

Location:
trunk/src/subprojects/network
Files:
4 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/subprojects/network/Makefile.am

    r6341 r6634  
    2727                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
    2828                  $(MAINSRCDIR)/lib/util/executor/executor.cc \
    29                   $(MAINSRCDIR)/lib/util/multi_type.cc
     29                  $(MAINSRCDIR)/lib/util/multi_type.cc \
     30                  \
     31                  \
     32                  $(MAINSRCDIR)/lib/coord/p_node.cc        \
     33                  $(MAINSRCDIR)/world_entities/world_entity.cc
     34                 
    3035
    3136

  • trunk/src/subprojects/network/read_sync.cc

    r6341 r6634  
    2929 */
    3030ReadSync::ReadSync(const char* name)
    31   : Synchronizeable(name)
     31  : Synchronizeable()
    3232{
    3333  /* define the local buffer size */

  • trunk/src/subprojects/network/simple_sync.cc

    r6341 r6634  
    2929 */
    3030SimpleSync::SimpleSync(const char* name)
    31   : Synchronizeable(name)
     31  : Synchronizeable()
    3232{
    3333  /* define the local buffer size */

  • trunk/src/subprojects/network/write_sync.cc

    r6341 r6634  
    2929 */
    3030WriteSync::WriteSync(const char* name)
    31   : Synchronizeable(name)
     31  : Synchronizeable()
    3232{
    3333  /* define the local buffer size */
Note: See TracChangeset for help on using the changeset viewer.