Changeset 2211 for code/branches/network64/src/network
- Timestamp:
- Nov 14, 2008, 4:13:06 PM (16 years ago)
- Location:
- code/branches/network64/src/network
- Files:
-
- 2 added
- 8 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network64/src/network/CMakeLists.txt
r2131 r2211 11 11 PacketBuffer.cc 12 12 Server.cc 13 Synchronisable.cc14 13 Host.cc 15 14 ) 16 15 17 16 ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES packet) 17 ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES synchronisable) 18 18 19 19 20 IF(WIN32) -
code/branches/network64/src/network/Client.cc
r2171 r2211 43 43 #include "Client.h" 44 44 #include "Host.h" 45 #include " Synchronisable.h"45 #include "synchronisable/Synchronisable.h" 46 46 #include "core/CoreIncludes.h" 47 47 #include "packet/Packet.h" -
code/branches/network64/src/network/ConnectionManager.cc
r2171 r2211 52 52 #include "util/Sleep.h" 53 53 #include "ClientInformation.h" 54 #include " Synchronisable.h"54 #include "synchronisable/Synchronisable.h" 55 55 #include "packet/ClassID.h" 56 56 -
code/branches/network64/src/network/GamestateClient.cc
r2171 r2211 35 35 #include "core/BaseObject.h" 36 36 #include "core/Iterator.h" 37 #include " Synchronisable.h"37 #include "synchronisable/Synchronisable.h" 38 38 #include "packet/Acknowledgement.h" 39 39 -
code/branches/network64/src/network/GamestateManager.cc
r2171 r2211 49 49 #include "core/BaseObject.h" 50 50 #include "ClientInformation.h" 51 #include " Synchronisable.h"51 #include "synchronisable/Synchronisable.h" 52 52 53 53 namespace orxonox -
code/branches/network64/src/network/packet/DeleteObjects.cc
r2171 r2211 30 30 #include "DeleteObjects.h" 31 31 #include <enet/enet.h> 32 #include "network/ Synchronisable.h"32 #include "network/synchronisable/Synchronisable.h" 33 33 #include "core/CoreIncludes.h" 34 34 #include <assert.h> -
code/branches/network64/src/network/packet/Gamestate.h
r2171 r2211 34 34 35 35 #include "Packet.h" 36 #include "network/ Synchronisable.h"36 #include "network/synchronisable/Synchronisable.h" 37 37 #include <map> 38 38 #ifndef NDEBUG -
code/branches/network64/src/network/packet/Welcome.cc
r2171 r2211 32 32 #include "Welcome.h" 33 33 #include "network/Host.h" 34 #include "network/ Synchronisable.h"34 #include "network/synchronisable/Synchronisable.h" 35 35 #include "core/CoreIncludes.h" 36 36 #include <assert.h> -
code/branches/network64/src/network/synchronisable/NetworkCallback.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/NetworkCallback.h merged eligible /code/branches/objecthierarchy/src/network/NetworkCallback.h merged eligible /code/branches/pickups/src/network/NetworkCallback.h merged eligible /code/branches/questsystem/src/network/NetworkCallback.h merged eligible /code/branches/weapon/src/network/NetworkCallback.h merged eligible /code/branches/core3/src/network/NetworkCallback.h 1572-1739 /code/branches/gcc43/src/network/NetworkCallback.h 1580 /code/branches/gui/src/network/NetworkCallback.h 1635-1723 /code/branches/input/src/network/NetworkCallback.h 1629-1636 /code/branches/script_trigger/src/network/NetworkCallback.h 1295-1953,1955
r2210 r2211 2 2 #define _NETWORK_CALLBACK__ 3 3 4 #include " NetworkPrereqs.h"4 #include "network/NetworkPrereqs.h" 5 5 6 6 namespace orxonox{ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/network64/src/network/synchronisable/Synchronisable.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/Synchronisable.cc merged eligible /code/branches/objecthierarchy/src/network/Synchronisable.cc merged eligible /code/branches/pickups/src/network/Synchronisable.cc merged eligible /code/branches/questsystem/src/network/Synchronisable.cc merged eligible /code/branches/script_trigger/src/network/Synchronisable.cc merged eligible /code/branches/weapon/src/network/Synchronisable.cc merged eligible /code/branches/core3/src/network/Synchronisable.cc 1572-1739 /code/branches/gcc43/src/network/Synchronisable.cc 1580 /code/branches/gui/src/network/Synchronisable.cc 1635-1723 /code/branches/input/src/network/Synchronisable.cc 1629-1636
r2210 r2211 50 50 // #include "core/Identifier.h" 51 51 52 #include " Host.h"52 #include "network/Host.h" 53 53 namespace orxonox 54 54 { -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/network64/src/network/synchronisable/Synchronisable.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/Synchronisable.h merged eligible /code/branches/objecthierarchy/src/network/Synchronisable.h merged eligible /code/branches/pickups/src/network/Synchronisable.h merged eligible /code/branches/questsystem/src/network/Synchronisable.h merged eligible /code/branches/script_trigger/src/network/Synchronisable.h merged eligible /code/branches/weapon/src/network/Synchronisable.h merged eligible /code/branches/core3/src/network/Synchronisable.h 1572-1739 /code/branches/gcc43/src/network/Synchronisable.h 1580 /code/branches/gui/src/network/Synchronisable.h 1635-1723 /code/branches/input/src/network/Synchronisable.h 1629-1636
r2210 r2211 30 30 #define _Synchronisable_H__ 31 31 32 #include " NetworkPrereqs.h"32 #include "network/NetworkPrereqs.h" 33 33 34 34 #include <list> -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.