Navigation Menu

Skip to content

Commit

Permalink
Syncing inventory, animations, position, 8 key attributes
Browse files Browse the repository at this point in the history
Created Package system
  • Loading branch information
Koncord committed Jul 7, 2016
1 parent e362e3e commit 1b259e2
Show file tree
Hide file tree
Showing 157 changed files with 31,940 additions and 298 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -21,6 +21,7 @@ Doxygen
.project
.settings
.directory
.idea
## qt-creator
CMakeLists.txt.user*

Expand Down
12 changes: 12 additions & 0 deletions CMakeLists.txt
Expand Up @@ -345,6 +345,12 @@ endif (APPLE)

# Other files

configure_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-client-default.cfg
"${OpenMW_BINARY_DIR}/tes3mp-client-default.cfg")

configure_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-server-default.cfg
"${OpenMW_BINARY_DIR}/tes3mp-server-default.cfg")

configure_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg
"${OpenMW_BINARY_DIR}/settings-default.cfg")

Expand Down Expand Up @@ -454,6 +460,11 @@ IF(NOT WIN32 AND NOT APPLE)
INSTALL(FILES "${OpenMW_BINARY_DIR}/resources/version" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")

INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-client-default" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-client.install" DESTINATION "${SYSCONFDIR}" RENAME "tes3mp-client.cfg" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-server-default" DESTINATION "${SYSCONFDIR}" COMPONENT "openmw-mp")
INSTALL(FILES "${OpenMW_BINARY_DIR}/tes3mp-server.install" DESTINATION "${SYSCONFDIR}" RENAME "tes3mp-server.cfg" COMPONENT "openmw-mp")

IF(BUILD_OPENCS)
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.cfg" DESTINATION "${SYSCONFDIR}" COMPONENT "opencs")
ENDIF(BUILD_OPENCS)
Expand All @@ -473,6 +484,7 @@ if(WIN32)
"${OpenMW_SOURCE_DIR}/Docs/license/GPL3.txt"
"${OpenMW_SOURCE_DIR}/Docs/license/DejaVu Font License.txt"
"${OpenMW_BINARY_DIR}/settings-default.cfg"
"${OpenMW_BINARY_DIR}/tes3mp-client-default.cfg"
"${OpenMW_BINARY_DIR}/gamecontrollerdb.txt"
"${OpenMW_BINARY_DIR}/Release/openmw.exe"
DESTINATION ".")
Expand Down
47 changes: 47 additions & 0 deletions OpenMW-mp changelog
@@ -0,0 +1,47 @@
Сделано:
0.0.1b
Пофикшен сегфолт при атаке НПЦ
Интерполляция движения
Lua скриптинг
Чат
0.0.1a
Анимация атаки.
Синхронизация атаки melee/throw/bow/crossbow
Синхронизация здоровья/маны/стамины/смерти
Синхронизация характеристик и навыков
0.0.1
Синхронизация рассовых признаков
Синхронизация положения в мире
Синхронизация состояния (оружие/заклинание/ничего)
Синхронизация анимации перемещния и прыжков


Сделать:
0.0.1b
Закончить пакет атаки (нокаут, нокдаун, заклинания и зачарования)
Улучшить синхронизацию координат при нокауте/нокдауне/смерти
Частичная синхронизация состояния предметов (не ломаемые)
Синхронизация заклинаний
0.0.2
Вампиризм
Оборотни
Синхронизация состояния предметов
Синхронизация замков
Открывание дверей
Отпирание дверей
Взаимодействие с активаторами (хук?)
0.0.2b
Чистка кода
0.0.3
Синхронизция контейнеров
Лут
Воровство у др. игроков.
Выбрасывание/подбор вещей.

Future
Отключаемая консоль (~)
клиентские скриптовые функции для синхронизации
Синхронизация погоды
Синхронизация времени
Синхронизация НПЦ
Трейд
25 changes: 25 additions & 0 deletions TES3MPTeam.md
@@ -0,0 +1,25 @@
Tes3mp Team
============

Programmers
-----------

Stanislav (Koncord) Zhukov - The main loafer and part-time Project Leader


Testers:
--------

Volk Milit aka Ja'Virr-Dar - Team Manager, Debian Linux
Shnatsel - Debian Linux
Goodevil - Mint and Xubuntu Linux


Public Relations and Translations
---------------------------------

Volk Milit aka Ja'Virr-Dar - Public relations & News Writer
Shnatsel - Translator & News Writer


Thanks to developers of OpenMW. They do amazing things.
90 changes: 90 additions & 0 deletions apps/opencs/main.cpp
@@ -0,0 +1,90 @@
#include "editor.hpp"

#include <exception>
#include <iostream>
#include <string>

#include <QApplication>
#include <QIcon>
#include <QMetaType>

#include "model/doc/messages.hpp"

#include "model/world/universalid.hpp"

#ifdef Q_OS_MAC
#include <QDir>
#endif

Q_DECLARE_METATYPE (std::string)

class Application : public QApplication
{
private:

bool notify (QObject *receiver, QEvent *event)
{
try
{
return QApplication::notify (receiver, event);
}
catch (const std::exception& exception)
{
std::cerr << "An exception has been caught: " << exception.what() << std::endl;
}

return false;
}

public:

Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
};

int main(int argc, char *argv[])
{
#ifdef Q_OS_MAC
setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
#endif

try
{
// To allow background thread drawing in OSG
QApplication::setAttribute(Qt::AA_X11InitThreads, true);

Q_INIT_RESOURCE (resources);

qRegisterMetaType<std::string> ("std::string");
qRegisterMetaType<CSMWorld::UniversalId> ("CSMWorld::UniversalId");
qRegisterMetaType<CSMDoc::Message> ("CSMDoc::Message");

Application application (argc, argv);

#ifdef Q_OS_MAC
QDir dir(QCoreApplication::applicationDirPath());
if (dir.dirName() == "MacOS") {
dir.cdUp();
dir.cdUp();
dir.cdUp();
}
QDir::setCurrent(dir.absolutePath());
#endif

application.setWindowIcon (QIcon (":./openmw-cs.png"));

CS::Editor editor;

if(!editor.makeIPCServer())
{
editor.connectToIPCServer();
return 0;
}
return editor.run();
}
catch (std::exception& e)
{
std::cerr << "ERROR: " << e.what() << std::endl;
return 0;
}

}
124 changes: 124 additions & 0 deletions apps/openmw-mp/CMakeLists.txt
@@ -0,0 +1,124 @@
project(openmw-mp)

add_subdirectory(amx)

option(BUILD_WITH_PAWN "Enable Pawn language" OFF)
if(BUILD_WITH_PAWN)
#set(Pawn_ROOT ${CMAKE_SOURCE_DIR}/external/pawn/)
set(Pawn_INCLUDES ${Pawn_ROOT}/include)
set(Pawn_LIBRARY ${Pawn_ROOT}/lib/libamx.a)
set(PawnScript_Sources
Script/LangPawn/LangPAWN.cpp
Script/LangPawn/PawnFunc.cpp)
set(PawnScript_Headers ${Pawn_INCLUDES}
Script/LangPawn/LangPAWN.hpp
)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_PAWN -DPAWN_CELL_SIZE=64")
#include_directories(${Pawn_INCLUDES})
include_directories("./amx/linux")
endif(BUILD_WITH_PAWN)

option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
if(BUILD_WITH_LUA)
#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
find_package(Terra REQUIRED)
set(LuaScript_Sources
Script/LangLua/LangLua.cpp
Script/LangLua/LuaFunc.cpp)
set(LuaScript_Headers ${Terra_INCLUDES} ${CMAKE_SOURCE_DIR}/extern/LuaBridge ${CMAKE_SOURCE_DIR}/extern/LuaBridge/detail
Script/LangLua/LangLua.hpp)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA")
include_directories(${Terra_INCLUDES} ${CMAKE_SOURCE_DIR}/extern/LuaBridge)
endif(BUILD_WITH_LUA)

set(NativeScript_Sources
Script/LangNative/LangNative.cpp
)
set(NativeScript_Headers
Script/LangNative/LangNative.hpp
)

# local files
set(SERVER
main.cpp
Player.cpp
Networking.cpp
Utils.cpp
Script/Script.cpp Script/ScriptFunction.cpp
Script/ScriptFunctions.cpp
Script/Functions/Translocations.cpp Script/Functions/Stats.cpp Script/Functions/Items.cpp
Script/Functions/Timer.cpp Script/Functions/Chat.cpp
Script/API/TimerAPI.cpp Script/API/PublicFnAPI.cpp
${PawnScript_Sources}
${LuaScript_Sources}
${NativeScript_Sources}

)

set(SERVER_HEADER
Script/Types.hpp Script/Script.hpp Script/SystemInterface.hpp
Script/ScriptFunction.hpp Script/Platform.hpp
Script/ScriptFunctions.hpp Script/API/TimerAPI.hpp Script/API/PublicFnAPI.hpp
${PawnScript_Headers}
${LuaScript_Headers}
${NativeScript_Headers}
)
source_group(openmw-mp FILES ${SERVER} ${SERVER_HEADER})

include_directories("./")

# Main executable

add_executable(openmw-mp
${SERVER_FILES}
${SERVER} ${SERVER_HEADER}
${APPLE_BUNDLE_RESOURCES}
)
add_definitions(-std=gnu++11)

target_link_libraries(openmw-mp
${OSG_LIBRARIES}
${OPENTHREADS_LIBRARIES}
${OSGPARTICLE_LIBRARIES}
${OSGUTIL_LIBRARIES}
${OSGDB_LIBRARIES}
${OSGVIEWER_LIBRARIES}
${OSGGA_LIBRARIES}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${BULLET_LIBRARIES}
${RakNet_LIBRARY}
components
amx
${Terra_LIBRARY}
${Pawn_LIBRARY}
)

if (USE_SYSTEM_TINYXML)
target_link_libraries(openmw-mp ${TINYXML_LIBRARIES})
endif()

if (UNIX)
target_link_libraries(openmw-mp dl)
# Fix for not visible pthreads functions for linker with glibc 2.15
if(NOT APPLE)
target_link_libraries(openmw-mp ${CMAKE_THREAD_LIBS_INIT})
endif(NOT APPLE)
endif(UNIX)

if (BUILD_WITH_CODE_COVERAGE)
add_definitions (--coverage)
target_link_libraries(openmw-mp gcov)
endif()

if (MSVC)
# Debug version needs increased number of sections beyond 2^16
if (CMAKE_CL_64)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /bigobj")
endif (CMAKE_CL_64)
add_definitions("-D_USE_MATH_DEFINES")
endif (MSVC)

0 comments on commit 1b259e2

Please sign in to comment.