Merge branch 'master' into Playerbot

Browse Source

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp

...

This commit is contained in:

郑佩茹

2022-08-25 10:07:17 -06:00

parent 3d8f540110 0450420157

commit 0752208c43

780 changed files with 225203 additions and 168350 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

data/sql/updates/db_auth/2022_04_24_00.sql → data/sql/archive/db_auth/7.x/2022_04_24_00.sql

0

data/sql/updates/db_auth/2022_04_28_00.sql → data/sql/archive/db_auth/7.x/2022_04_28_00.sql

0

data/sql/updates/db_characters/2022_04_24_00.sql → data/sql/archive/db_characters/7.x/2022_04_24_00.sql

0

data/sql/updates/db_characters/2022_04_28_00.sql → data/sql/archive/db_characters/7.x/2022_04_28_00.sql

0

data/sql/updates/db_characters/2022_05_24_00.sql → data/sql/archive/db_characters/7.x/2022_05_24_00.sql

0

data/sql/updates/db_characters/2022_08_02_00.sql → data/sql/archive/db_characters/7.x/2022_08_02_00.sql

0

data/sql/updates/db_characters/2022_08_07_00.sql → data/sql/archive/db_characters/7.x/2022_08_07_00.sql

0

data/sql/updates/db_world/2022_04_24_02.sql → data/sql/archive/db_world/7.x/2022_04_24_02.sql

0

data/sql/updates/db_world/2022_04_24_03.sql → data/sql/archive/db_world/7.x/2022_04_24_03.sql

0

data/sql/updates/db_world/2022_04_25_00.sql → data/sql/archive/db_world/7.x/2022_04_25_00.sql

0

data/sql/updates/db_world/2022_04_25_01.sql → data/sql/archive/db_world/7.x/2022_04_25_01.sql

0

data/sql/updates/db_world/2022_04_25_02.sql → data/sql/archive/db_world/7.x/2022_04_25_02.sql

0

data/sql/updates/db_world/2022_04_25_03.sql → data/sql/archive/db_world/7.x/2022_04_25_03.sql

0

data/sql/updates/db_world/2022_04_28_00.sql → data/sql/archive/db_world/7.x/2022_04_28_00.sql

0

data/sql/updates/db_world/2022_05_01_00.sql → data/sql/archive/db_world/7.x/2022_05_01_00.sql

0

data/sql/updates/db_world/2022_05_01_01.sql → data/sql/archive/db_world/7.x/2022_05_01_01.sql

0

data/sql/updates/db_world/2022_05_03_00.sql → data/sql/archive/db_world/7.x/2022_05_03_00.sql

0

data/sql/updates/db_world/2022_05_03_01.sql → data/sql/archive/db_world/7.x/2022_05_03_01.sql

0

data/sql/updates/db_world/2022_05_03_02.sql → data/sql/archive/db_world/7.x/2022_05_03_02.sql

0

data/sql/updates/db_world/2022_05_04_00.sql → data/sql/archive/db_world/7.x/2022_05_04_00.sql

0

data/sql/updates/db_world/2022_05_04_01.sql → data/sql/archive/db_world/7.x/2022_05_04_01.sql

0

data/sql/updates/db_world/2022_05_05_00.sql → data/sql/archive/db_world/7.x/2022_05_05_00.sql

0

data/sql/updates/db_world/2022_05_05_01.sql → data/sql/archive/db_world/7.x/2022_05_05_01.sql

0

data/sql/updates/db_world/2022_05_06_00.sql → data/sql/archive/db_world/7.x/2022_05_06_00.sql

0

data/sql/updates/db_world/2022_05_06_01.sql → data/sql/archive/db_world/7.x/2022_05_06_01.sql

0

data/sql/updates/db_world/2022_05_06_02.sql → data/sql/archive/db_world/7.x/2022_05_06_02.sql

0

data/sql/updates/db_world/2022_05_06_03.sql → data/sql/archive/db_world/7.x/2022_05_06_03.sql

0

data/sql/updates/db_world/2022_05_07_00.sql → data/sql/archive/db_world/7.x/2022_05_07_00.sql

0

data/sql/updates/db_world/2022_05_07_01.sql → data/sql/archive/db_world/7.x/2022_05_07_01.sql

0

data/sql/updates/db_world/2022_05_08_00.sql → data/sql/archive/db_world/7.x/2022_05_08_00.sql

0

data/sql/updates/db_world/2022_05_08_01.sql → data/sql/archive/db_world/7.x/2022_05_08_01.sql

0

data/sql/updates/db_world/2022_05_08_02.sql → data/sql/archive/db_world/7.x/2022_05_08_02.sql

0

data/sql/updates/db_world/2022_05_08_03.sql → data/sql/archive/db_world/7.x/2022_05_08_03.sql

0

data/sql/updates/db_world/2022_05_08_04.sql → data/sql/archive/db_world/7.x/2022_05_08_04.sql

0

data/sql/updates/db_world/2022_05_08_05.sql → data/sql/archive/db_world/7.x/2022_05_08_05.sql

0

data/sql/updates/db_world/2022_05_08_06.sql → data/sql/archive/db_world/7.x/2022_05_08_06.sql

0

data/sql/updates/db_world/2022_05_08_07.sql → data/sql/archive/db_world/7.x/2022_05_08_07.sql

0

data/sql/updates/db_world/2022_05_08_08.sql → data/sql/archive/db_world/7.x/2022_05_08_08.sql

0

data/sql/updates/db_world/2022_05_08_09.sql → data/sql/archive/db_world/7.x/2022_05_08_09.sql

0

data/sql/updates/db_world/2022_05_09_00.sql → data/sql/archive/db_world/7.x/2022_05_09_00.sql

0

data/sql/updates/db_world/2022_05_11_00.sql → data/sql/archive/db_world/7.x/2022_05_11_00.sql

0

data/sql/updates/db_world/2022_05_11_01.sql → data/sql/archive/db_world/7.x/2022_05_11_01.sql

0

data/sql/updates/db_world/2022_05_11_02.sql → data/sql/archive/db_world/7.x/2022_05_11_02.sql

0

data/sql/updates/db_world/2022_05_12_00.sql → data/sql/archive/db_world/7.x/2022_05_12_00.sql

0

data/sql/updates/db_world/2022_05_16_00.sql → data/sql/archive/db_world/7.x/2022_05_16_00.sql

0

data/sql/updates/db_world/2022_05_16_01.sql → data/sql/archive/db_world/7.x/2022_05_16_01.sql

0

data/sql/updates/db_world/2022_05_17_00.sql → data/sql/archive/db_world/7.x/2022_05_17_00.sql

0

data/sql/updates/db_world/2022_05_17_01.sql → data/sql/archive/db_world/7.x/2022_05_17_01.sql

0

data/sql/updates/db_world/2022_05_17_02.sql → data/sql/archive/db_world/7.x/2022_05_17_02.sql

0

data/sql/updates/db_world/2022_05_17_03.sql → data/sql/archive/db_world/7.x/2022_05_17_03.sql

0

data/sql/updates/db_world/2022_05_17_04.sql → data/sql/archive/db_world/7.x/2022_05_17_04.sql

0

data/sql/updates/db_world/2022_05_17_05.sql → data/sql/archive/db_world/7.x/2022_05_17_05.sql

0

data/sql/updates/db_world/2022_05_18_00.sql → data/sql/archive/db_world/7.x/2022_05_18_00.sql

0

data/sql/updates/db_world/2022_05_18_01.sql → data/sql/archive/db_world/7.x/2022_05_18_01.sql

0

data/sql/updates/db_world/2022_05_21_00.sql → data/sql/archive/db_world/7.x/2022_05_21_00.sql

0

data/sql/updates/db_world/2022_05_21_01.sql → data/sql/archive/db_world/7.x/2022_05_21_01.sql

0

data/sql/updates/db_world/2022_05_21_02.sql → data/sql/archive/db_world/7.x/2022_05_21_02.sql

0

data/sql/updates/db_world/2022_05_21_03.sql → data/sql/archive/db_world/7.x/2022_05_21_03.sql

0

data/sql/updates/db_world/2022_05_21_04.sql → data/sql/archive/db_world/7.x/2022_05_21_04.sql

0

data/sql/updates/db_world/2022_05_23_00.sql → data/sql/archive/db_world/7.x/2022_05_23_00.sql

0

data/sql/updates/db_world/2022_05_23_01.sql → data/sql/archive/db_world/7.x/2022_05_23_01.sql

0

data/sql/updates/db_world/2022_05_23_02.sql → data/sql/archive/db_world/7.x/2022_05_23_02.sql

0

data/sql/updates/db_world/2022_05_23_03.sql → data/sql/archive/db_world/7.x/2022_05_23_03.sql

0

data/sql/updates/db_world/2022_05_23_04.sql → data/sql/archive/db_world/7.x/2022_05_23_04.sql

0

data/sql/updates/db_world/2022_05_23_05.sql → data/sql/archive/db_world/7.x/2022_05_23_05.sql

0

data/sql/updates/db_world/2022_05_24_00.sql → data/sql/archive/db_world/7.x/2022_05_24_00.sql

0

data/sql/updates/db_world/2022_05_25_00.sql → data/sql/archive/db_world/7.x/2022_05_25_00.sql

0

data/sql/updates/db_world/2022_05_25_01.sql → data/sql/archive/db_world/7.x/2022_05_25_01.sql

0

data/sql/updates/db_world/2022_05_25_02.sql → data/sql/archive/db_world/7.x/2022_05_25_02.sql

0

data/sql/updates/db_world/2022_05_25_03.sql → data/sql/archive/db_world/7.x/2022_05_25_03.sql

0

data/sql/updates/db_world/2022_05_25_04.sql → data/sql/archive/db_world/7.x/2022_05_25_04.sql

0

data/sql/updates/db_world/2022_05_26_00.sql → data/sql/archive/db_world/7.x/2022_05_26_00.sql

0

data/sql/updates/db_world/2022_05_26_01.sql → data/sql/archive/db_world/7.x/2022_05_26_01.sql

0

data/sql/updates/db_world/2022_05_29_00.sql → data/sql/archive/db_world/7.x/2022_05_29_00.sql

0

data/sql/updates/db_world/2022_05_29_01.sql → data/sql/archive/db_world/7.x/2022_05_29_01.sql

0

data/sql/updates/db_world/2022_05_30_00.sql → data/sql/archive/db_world/7.x/2022_05_30_00.sql

0

data/sql/updates/db_world/2022_05_30_01.sql → data/sql/archive/db_world/7.x/2022_05_30_01.sql

0

data/sql/updates/db_world/2022_05_30_02.sql → data/sql/archive/db_world/7.x/2022_05_30_02.sql

0

data/sql/updates/db_world/2022_06_02_00.sql → data/sql/archive/db_world/7.x/2022_06_02_00.sql

0

data/sql/updates/db_world/2022_06_02_01.sql → data/sql/archive/db_world/7.x/2022_06_02_01.sql

0

data/sql/updates/db_world/2022_06_03_00.sql → data/sql/archive/db_world/7.x/2022_06_03_00.sql

0

data/sql/updates/db_world/2022_06_03_01.sql → data/sql/archive/db_world/7.x/2022_06_03_01.sql

0

data/sql/updates/db_world/2022_06_04_00.sql → data/sql/archive/db_world/7.x/2022_06_04_00.sql

0

data/sql/updates/db_world/2022_06_06_00.sql → data/sql/archive/db_world/7.x/2022_06_06_00.sql

0

data/sql/updates/db_world/2022_06_06_01.sql → data/sql/archive/db_world/7.x/2022_06_06_01.sql

0

data/sql/updates/db_world/2022_06_06_02.sql → data/sql/archive/db_world/7.x/2022_06_06_02.sql

0

data/sql/updates/db_world/2022_06_06_03.sql → data/sql/archive/db_world/7.x/2022_06_06_03.sql

0

data/sql/updates/db_world/2022_06_06_04.sql → data/sql/archive/db_world/7.x/2022_06_06_04.sql

0

data/sql/updates/db_world/2022_06_06_05.sql → data/sql/archive/db_world/7.x/2022_06_06_05.sql

0

data/sql/updates/db_world/2022_06_08_00.sql → data/sql/archive/db_world/7.x/2022_06_08_00.sql

0

data/sql/updates/db_world/2022_06_08_01.sql → data/sql/archive/db_world/7.x/2022_06_08_01.sql

0

data/sql/updates/db_world/2022_06_08_02.sql → data/sql/archive/db_world/7.x/2022_06_08_02.sql

0

data/sql/updates/db_world/2022_06_09_00.sql → data/sql/archive/db_world/7.x/2022_06_09_00.sql

0

data/sql/updates/db_world/2022_06_09_01.sql → data/sql/archive/db_world/7.x/2022_06_09_01.sql

0

data/sql/updates/db_world/2022_06_11_00.sql → data/sql/archive/db_world/7.x/2022_06_11_00.sql

0

data/sql/updates/db_world/2022_06_13_00.sql → data/sql/archive/db_world/7.x/2022_06_13_00.sql

0

data/sql/updates/db_world/2022_06_13_01.sql → data/sql/archive/db_world/7.x/2022_06_13_01.sql

0

data/sql/updates/db_world/2022_06_13_02.sql → data/sql/archive/db_world/7.x/2022_06_13_02.sql

0

data/sql/updates/db_world/2022_06_13_03.sql → data/sql/archive/db_world/7.x/2022_06_13_03.sql

0

data/sql/updates/db_world/2022_06_13_04.sql → data/sql/archive/db_world/7.x/2022_06_13_04.sql

Some files were not shown because too many files have changed in this diff Show More