Installing Eluna git merged problems

[veluar]

hello i got some problems with git. I added eluna as remote and tried too pull but i get this error:

Automatic merge failed; fix conflicts and then commit the result.


someone can help me please?

Veluar

 

[Tommy]

hello i got some problems with git. I added eluna as remote and tried too pull but i get this error:

Automatic merge failed; fix conflicts and then commit the result.


someone can help me please?

Veluar

Just download TrinityCore's source and then download Eluna's source and merge the files from Eluna's folder to TrinityCore's source. Here's a video on how to merge them (not hard at all): https://www.youtube.com/watch?v=8wGHf7FbhSw&feature=c4-overview&list=UUdnkF1mGg_IbIqFxJrzw2WA

 

[veluar]

already tried with ftp to copy and overwrite them but get 2 errors at compiling clean trinitycore dont get errors only if i use eluna to compile in sry for bad english

the error was at cs_reload he doesnt find anything i compile again and send you the errors

 

[veluar]

/source/src/server/scripts/Commands/cs_reload.cpp:29:32: fatal error: CreatureEventAIMgr.h: No such file or directory
compilation terminated.
make[2]: *** [src/server/scripts/CMakeFiles/scripts.dir/Commands/cs_reload.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
[ 23%] Building CXX object src/server/game/CMakeFiles/game.dir/Battlegrounds/Zones/BattlegroundBE.cpp.o
make[1]: *** [src/server/scripts/CMakeFiles/scripts.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

 

[Hyperion]

/source/src/server/scripts/Commands/cs_reload.cpp:29:32: fatal error: CreatureEventAIMgr.h: No such file or directory
compilation terminated.
make[2]: *** [src/server/scripts/CMakeFiles/scripts.dir/Commands/cs_reload.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
[ 23%] Building CXX object src/server/game/CMakeFiles/game.dir/Battlegrounds/Zones/BattlegroundBE.cpp.o
make[1]: *** [src/server/scripts/CMakeFiles/scripts.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

What OS is this

 

[veluar]

Ubuntu 12.04 (64bit)

 

[Tommy]

I updated the file: https://github.com/ElunaLuaEngine/Eluna/commit/188a1ad10aae50926e0b5583e5642374baa0e4c6

Pull the update and remerge the file.

 

[veluar]

thanks very much this errors is fixed but got now 2 new errors

/source/src/LuaEngine/LuaEngine.cpp: In member function 'void Eluna::StartEluna(bool)':
/source/src/LuaEngine/LuaEngine.cpp:68:44: warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
/source/src/LuaEngine/LuaEngine.cpp: In member function 'void Eluna::LoadDirectory(char*, LoadedScripts*)':
/source/src/LuaEngine/LuaEngine.cpp:200:13: error: 'LOG_FILTER_SERVER_LOADING' was not declared in this scope
[ 63%] Building CXX object src/server/scripts/CMakeFiles/scripts.dir/EasternKingdoms/Karazhan/boss_netherspite.cpp.o
/source/src/LuaEngine/UnitMethods.cpp: In function 'int LuaUnit::SendAreaTriggerMessage(lua_State*, Unit*)':
/source/src/LuaEngine/UnitMethods.cpp:4451:57: warning: format not a string literal and no format arguments [-Wformat-security]
/source/src/LuaEngine/UnitMethods.cpp: In function 'int LuaUnit::SendNotification(lua_State*, Unit*)':
/source/src/LuaEngine/UnitMethods.cpp:4461:51: warning: format not a string literal and no format arguments [-Wformat-security]
[ 63%] Building CXX object src/server/scripts/CMakeFiles/scripts.dir/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp.o
[ 63%] Building CXX object src/server/scripts/CMakeFiles/scripts.dir/EasternKingdoms/Karazhan/boss_midnight.cpp.o
make[2]: *** [src/LuaEngine/CMakeFiles/LuaEngine.dir/LuaEngine.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....


[ 99%] Built target scripts
make: *** [all] Error 2

 

[Tommy]

Fixed: https://github.com/ElunaLuaEngine/Eluna/commit/636a840f23f24bd6304e33cedc168b4b24eb385c

Thanks for the error reports.

 

[veluar]

wow nice! no problem and thanks for very nice support you are the best

 

[Tommy]

No problem. If you run into anymore, let us know.