Merge remote-tracking branch 'ElunaMangosTbc/master'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/game/LuaEngine"]
+	path = src/game/LuaEngine
+	url = https://github.com/ElunaLuaEngine/Eluna.git

.travis.yml

@@ -26,9 +26,9 @@ git:
 sudo: false
 
 # only run travis on the master branch
-branches:
-  only:
-    - master
+# branches:
+#   only:
+#     - master
 
 compiler:
   - gcc
@@ -58,11 +58,3 @@ script:
   - cd _build
   - cmake -DCMAKE_INSTALL_PREFIX=../_install ..
   - make -j4
-
-# if this configuration file is not in one of the offical CMaNGOS repositories at http://github.com/cmangos/, PLEASE remove the notifications or point them to another IRC channel!
-notifications:
-  irc:
-    channels:
-      - "irc.rizon.net#cmangos"
-    on_success: never
-    on_failure: always

README.md

@@ -1,4 +1,4 @@
-# C(ontinued)-MaNGOS -- README [![Build Status](https://travis-ci.org/cmangos/mangos-tbc.svg?branch=master)](https://travis-ci.org/cmangos/mangos-tbc)
+# C(ontinued)-MaNGOS -- README  [![Build Status](https://travis-ci.org/ElunaLuaEngine/ElunaMangosTbc.svg?branch=master)](https://travis-ci.org/ElunaLuaEngine/ElunaMangosTbc)
 
 This file is part of the CMaNGOS Project. See [AUTHORS](AUTHORS.md) file for Copyright information
 
@@ -83,6 +83,13 @@ To be able to accomplish these goals, we support and promote:
   * [Contributing Guidelines](CONTRIBUTING.md)
   * Documentation can be found in the doc/ subdirectory and on the github wiki
 
+# ![logo](https://dl.dropbox.com/u/98478761/eluna-DBCA-Designs.png)
+
+  You can find further information about Eluna at the following places:
+  * [Eluna Wiki](http://wiki.emudevs.com/doku.php?id=eluna)
+  * [Eluna Support Forum](http://emudevs.com)
+  * [Eluna Github](https://github.com/ElunaLuaEngine)
+
 ## License
 
   CMaNGOS is free software; you can redistribute it and/or modify
@@ -116,3 +123,7 @@ To be able to accomplish these goals, we support and promote:
   modify this file, you may extend this exception to your version of the
   file, but you are not obligated to do so.  If you do not wish to do
   so, delete this exception statement from your version.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/eluna-dev-mangos/elunacoretbc/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

cmake/platform/unix/settings.cmake

@@ -20,3 +20,7 @@ elseif(CMAKE_C_COMPILER MATCHES "clang")
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()
+
+message(STATUS "UNIX: Use c++11")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -Wno-narrowing -Wno-deprecated-register")

contrib/lua_scripts/masterscript.lua

@@ -0,0 +1,31 @@
+--
+--
+-- This is the Eluna for MaNGOS MasterScript
+--
+--
+print("\n")
+print("_______________$$$$") 
+print("______________$$$$$$$") 
+print("______________$$$$$$$$_____$_$_$") 
+print("_______________$$$$$$$____$$$$$$") 
+print("________________$$$$$$$____$$$") 
+print("________$__$_$____$$$$$$$$$$$") 
+print("_________$$$$$$___$$$$$$$$$$") 
+print("__________$$$_$$$$$$$$$$$$$$$$") 
+print("___________________$$$$$$$$$$$$") 
+print("___________________$$$$$$$$$$$$") 
+print("__Eluna LuaEngine___$$$$$$$$$$$$$$$$") 
+print("____for_MaNGOS___$$$$$$$$$$$$$$___$$$") 
+print("_________________$$$$___$$$$$______$$$$") 
+print("_________________$$$_____$$$$$____$_$_$") 
+print("_______________$$$$_______$$$$") 
+print("________________$_$_$_____$$$$") 
+print("__________________________$$$$") 
+print("_____________$$$$$$_______$$$$") 
+print("___________$$______$$_____$$$$") 
+print("__________$$$______$$_____$$$") 
+print("___________$$_____$______$$$") 
+print("____________$$__________$$$") 
+print("______________$$$___$$$$$") 
+print("________________$$$$$")
+print("\n")

dep/CMakeLists.txt

@@ -27,5 +27,6 @@ if(NOT ACE_USE_EXTERNAL)
   add_subdirectory(ACE_wrappers)
 endif()
 
+add_subdirectory(lualib)
 add_subdirectory(recastnavigation)
 add_subdirectory(src)

dep/lualib/CMakeLists.txt

@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2010 - 2014 Eluna Lua Engine <http://emudevs.com/>
+# This program is free software licensed under GPL version 3
+# Please see the included DOCS/LICENSE.md for more information
+#
+
+file(GLOB sources *.c)
+list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/lua.c)
+list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/luac.c)
+
+set(lua_STAT_SRCS
+  ${sources}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_library(lualib STATIC ${lua_STAT_SRCS})