Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite the core and push Up2Date based on talamortis/OregonCore #1658

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
44 changes: 10 additions & 34 deletions .travis.yml
@@ -1,12 +1,10 @@
dist: precise
dist: xenial
language: cpp
compiler:
- clang
compiler: gcc

# whitelisted packages can be obtained quickly without downloading
# doxygen is out of date, tho so we download its binaries
addons:
mariadb: '10.0'
apt:
packages:
- cmake
Expand All @@ -15,59 +13,37 @@ addons:
- git
- make
- binutils-dev
- libiberty-dev
- openssl
- libssl-dev
- zlib1g-dev
- zip
- unzip
- php5-cli
- php5-mysql

git:
depth: 1

before_install:
- sudo apt-get -qq install mariadb-client libace-dev
- sudo apt-get -qq install mariadb-server libace-6.* libace-dev
- if [[ $TRAVIS_PULL_REQUEST == 'true' ]]; then exit; fi
- curl -o doxygen.tar.gz https://oregon-core.net/travis/doxygen.tar.gz
- tar xzf doxygen.tar.gz
- sudo install -m 755 doxygen /usr/bin
- sudo install -m 755 doxyindexer /usr/bin

install:
- mkdir build
- cd build
- cmake .. -DSERVERS=1 -DTOOLS=1 -DSCRIPTS=1 -DWITH_DOCS=1 -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0
- cmake .. -DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" -DSERVERS=1 -DTOOLS=1 -DSCRIPTS=1 -DWITH_DOCS=1 -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0
# we have 1.5 cpu so 2 jobs at a time are sufficient
- make -j2

# apply all updates to db and catch possible errors
script:
- cd $TRAVIS_BUILD_DIR/sql
- mysql -u root --password='' < create/create_mysql.sql
- sudo mysql -u root --password='' < create/create_mysql.sql
- mysql -u oregon -poregon realmd < base/realmd.sql
- mysql -u oregon -poregon characters < base/characters.sql
- mysql -u oregon -poregon world < base/world.sql
- curl --retry 3 -o OregonDatabase.zip https://oregon-core.net/travis/OregonDatabase.zip
- unzip OregonDatabase.zip
- mysql -u oregon -poregon world < OregonDatabase.sql
# mysql -u oregon -poregon world < base/world.sql
- curl -L --retry 3 -o database_05_07_19.zip https://github.com/talamortis/OregonCore/releases/download/v1.0/database_05_07_19.zip
- unzip database_05_07_19.zip
- mysql -u oregon -poregon world < database_05_07_19.sql
- cat updates/realmd/*.sql | mysql -u oregon -poregon realmd
- cat updates/characters/*.sql | mysql -u oregon -poregon characters
- cat updates/world/*.sql | mysql -u oregon -poregon world
- curl --retry 3 -o documentation.sql https://oregon-core.net/travis/documentation.sql

# generate and deploy doxygen documentation now
after_success:
- if [[ $TRAVIS_PULL_REQUEST == 'true' ]]; then exit; fi
- echo 'create database documentation' | mysql -u root --password=''
- mysql -u root --password='' documentation < documentation.sql
- cd $TRAVIS_BUILD_DIR/build
- make docs 2> /dev/null
- cd ../doc/doxygen/Database
- php generator.php
- cd ../../../build
- make docs 2> /dev/null
- cd doc/html
- zip -q -r -9 html.zip ./*
- export URL="https://oregon-core.net/Deploy?secret=$TRAVIS_SECRET"
- curl -F 'userfile=@html.zip' $URL
1 change: 1 addition & 0 deletions AUTHORS.md
Expand Up @@ -173,6 +173,7 @@ Development of this project dates back to 2010, and was developed under various
* Gennady
* namreeb
* uberhax
* Talamortis

## Copyright Information
= Oregon Core -- General information =
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -10,7 +10,6 @@ Build Status
| Compiler | Platform | Branch | Status |
|:--------------|:------------|:------:|:-----------------------:|
| clang | Linux x64 | master | [![Build Status][1]][7] |
| MSVC++ 2015 | Windows x64 | master | [![build Status][2]][8] |


Docs, Community and Support
Expand All @@ -24,12 +23,13 @@ We have also a [forum][6], this is a place for developers to hang out and discus

If you have found a bug you may report it on our bugtracker, issues must include revision hash and as many details as possible to aide us in resolving it as quickly as possible.

[1]: https://travis-ci.org/OregonCore/OregonCore.svg?branch=master
[1]: https://travis-ci.org/talamortis/OregonCore.svg?branch=master
[2]: https://ci.appveyor.com/api/projects/status/bxn9cq9miqxn33gr/branch/master
[3]: https://wiki.oregon-core.net/
[4]: https://docs.oregon-core.net/
[5]: https://discord.gg/Nyc3fTy
[6]: https://forums.oregon-core.net/
[7]: https://travis-ci.org/OregonCore/OregonCore
[7]: https://travis-ci.org/talamortis/OregonCore
[8]: https://ci.appveyor.com/project/OregonCore/OregonCore/branch/master


1 change: 1 addition & 0 deletions _config.yml
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
1 change: 1 addition & 0 deletions cmake/macros/FindMySQL.cmake
Expand Up @@ -172,6 +172,7 @@ if( WIN32 )
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
Expand Down
2 changes: 1 addition & 1 deletion contrib/linux_restarter/Readme.txt
@@ -1,6 +1,6 @@
= Oregon Core -- Linux Restarter =

Copyright (C) 2010-2019 OregonCore <https://oregon-core.net/>
Copyright (C) 2010-2018 OregonCore <https://oregon-core.net/>

Content :
- File "oregon" is an interface to use easier "screen" command.
Expand Down
2 changes: 1 addition & 1 deletion contrib/registration_form/Expanded/index.php
Expand Up @@ -4,7 +4,7 @@

$page = '<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<style type="text/css">

Expand Down
2 changes: 1 addition & 1 deletion contrib/registration_form/simple/index.php
Expand Up @@ -16,7 +16,7 @@

$page = '<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>' . $title . '</title>
</head>
Expand Down
2 changes: 1 addition & 1 deletion dep/SFMT/SFMT.h
@@ -1,7 +1,7 @@
/*
* Copyright notice
* ================
* GNU General Public License https://www.gnu.org/licenses/gpl.html
* GNU General Public License http://www.gnu.org/licenses/gpl.html
* This C++ implementation of SFMT contains parts of the original C code
* which was published under the following BSD license, which is therefore
* in effect in addition to the GNU General Public License.
Expand Down
2 changes: 1 addition & 1 deletion dep/SFMT/randomc.h
@@ -1,7 +1,7 @@
/*
* Copyright notice
* ================
* GNU General Public License https://www.gnu.org/licenses/gpl.html
* GNU General Public License http://www.gnu.org/licenses/gpl.html
* This C++ implementation of SFMT contains parts of the original C code
* which was published under the following BSD license, which is therefore
* in effect in addition to the GNU General Public License.
Expand Down
2 changes: 1 addition & 1 deletion dep/jemalloc/config.guess
Expand Up @@ -15,7 +15,7 @@ timestamp='2014-03-23'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
Expand Down
2 changes: 1 addition & 1 deletion dep/jemalloc/config.sub
Expand Up @@ -15,7 +15,7 @@ timestamp='2014-05-01'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
Expand Down
4 changes: 2 additions & 2 deletions doc/FileHeaders.txt
Expand Up @@ -21,7 +21,7 @@ Header for Core Files (even possible without MaNGOS or/and Trinity):
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <https://www.gnu.org/licenses/>.
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
--- SNIP ---

Expand All @@ -41,7 +41,7 @@ Header for Script Files:
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <https://www.gnu.org/licenses/>.
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
--- SNIP ---

Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/Database/generator.php
Expand Up @@ -13,7 +13,7 @@
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <https://www.gnu.org/licenses/>.
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/

// This file generates database documentation for doxygen.
Expand Down
4 changes: 2 additions & 2 deletions doc/doxygen/DoxyHeader.html
@@ -1,6 +1,6 @@
<!-- HTML header for doxygen 1.8.9.1-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="https://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
Expand Down
Expand Up @@ -14,4 +14,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
DELETE FROM `gossip_scripts` WHERE `id`=50002;
INSERT INTO `gossip_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES ('50002', '0', '7', '4506', '30', '0', '-10291.2', '-4315.28', '-38.382', '4.07');
INSERT INTO `gossip_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES ('50002', '0', '18', '2000', '0', '0', '-10291.2', '-4315.28', '-38.382', '4.07');
UPDATE `gossip_menu_option` SET `action_script_id` = '50002' WHERE `menu_id` = '55002' AND `id` = '1';
UPDATE `gossip_menu_option` SET `action_script_id` = '50002' WHERE `menu_id` = '55002' AND `id` = '1';
Expand Up @@ -3,7 +3,7 @@ ADD COLUMN `phaseMask` INT(5) UNSIGNED NOT NULL DEFAULT '1' AFTER `spawnMask`;

ALTER TABLE gameobject
ADD COLUMN `phaseMask` INT(5) UNSIGNED NOT NULL DEFAULT '1' AFTER `spawnMask`;

INSERT INTO `command` VALUES
('gobject phase',3,'Syntax: .gobject phase #guid #phasemask\r\n\r\nGameobject with DB guid #guid phasemask changed to #phasemask with related world vision update for players. Gameobject state saved to DB and persistent.'),
('modify phase',3,'Syntax: .modify phase #phasemask\r\n\r\nSelected character phasemask changed to #phasemask with related world vision update. Change active until in game phase changed, or GM-mode enable/disable, or re-login. Character pts pasemask update to same value.'),
Expand Down
6 changes: 6 additions & 0 deletions sql/archive/world/2019_03_03_00_infernal_relay.sql
@@ -0,0 +1,6 @@
DELETE FROM creature WHERE guid = 63370;
DELETE FROM creature_addon WHERE guid = 63370;
DELETE FROM game_event_creature WHERE guid = 63370;
DELETE from game_event_model_equip WHERE guid = 63370;

UPDATE creature SET position_x = '-10917.661133', position_y = '-2080.856934', position_z = '341.372040', orientation = '2.030259' WHERE guid = '63371';
3 changes: 3 additions & 0 deletions sql/archive/world/2019_03_03_01_mechanar_doors.sql
@@ -0,0 +1,3 @@
INSERT INTO `gameobject` VALUES (11006356, 184632, 554, 3849, 3849, 3, 4294967294, 236.46, 52.3636, 1.65354, 6.26827, 0, 0, 0.00745758, -0.999972, 25, 0, 1);
INSERT INTO `gameobject` VALUES (11006358, 184322, 554, 3849, 3849, 3, 4294967294, 242.874, 52.3148, 1.59633, 6.26827, 0, 0, 0.00745758, -0.999972, 25, 0, 1);
INSERT INTO `gameobject` VALUES (11006360, 184449, 554, 3849, 3849, 3, 4294967294, 267.928, 52.3148, 27.0425, 6.26827, 0, 0, 0.00745758, -0.999972, 25, 0, 1);
1 change: 1 addition & 0 deletions sql/archive/world/2019_03_05_00_explosive_sheep.sql
@@ -0,0 +1 @@
UPDATE `creature_template` SET ScriptName = 'npc_explosive_sheep' WHERE `entry` = '2675';
7 changes: 7 additions & 0 deletions sql/archive/world/2019_03_05_01_tortured_skeleton.sql
@@ -0,0 +1,7 @@
SET @ENTRY := 18797;
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tortured Skeleton - On Aggro - Remove Flag Standstate Dead");

UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid` IN (67091,67096,67097,67098,67099,67133);