Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.

Commit ff9357a

Browse files
committed
Merge branch 'release' into feature/thick-thieves
# Conflicts: # scripts/zones/Windurst_Woods/npcs/Bopa_Greso.lua # scripts/zones/Windurst_Woods/npcs/Cha_Lebagta.lua # scripts/zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua
2 parents fbfeb60 + 8e2031d commit ff9357a

File tree

9,778 files changed

+91114
-82512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,778 files changed

+91114
-82512
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ UpgradeLog*.XML
142142
/depcomp
143143
/missing
144144
/install-sh
145+
/tools/config.yaml
145146

146147
src/common/config.h
147148
src/common/config.h.in

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include sources.am
77
## Set up all of our dependency flags
88
SRC_ALL = $(SRC_TOPAZ)
99
CFLAGS_ALL = $(TOPAZ_CFLAGS) -fsigned-char
10-
CPPFLAGS_ALL = $(TOPAZ_CPPFLAGS) -fsigned-char -DFMT_HEADER_ONLY -Wall -Werror -Wno-class-memaccess -Wno-restrict -Wno-format-overflow -Wno-sizeof-pointer-memaccess -Wno-maybe-uninitialized -Wno-stringop-truncation
10+
CPPFLAGS_ALL = $(TOPAZ_CPPFLAGS) -fsigned-char -DFMT_HEADER_ONLY -Wall -Werror -Wno-class-memaccess -Wno-restrict -Wno-format-overflow -Wno-sizeof-pointer-memaccess -Wno-maybe-uninitialized -Wno-stringop-truncation -Wno-sign-compare
1111
CXXFLAGS_ALL = $(TOPAZ_CXXFLAGS) -fsigned-char
1212
LIBS_ALL = $(TOPAZ_LIBS)
1313
LDFLAGS_ALL = $(TOPAZ_LDFLAGS)

cmake/compiler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
add_definitions(-DFMT_HEADER_ONLY)
88

99
if(UNIX)
10-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Werror -Wno-class-memaccess -Wno-restrict -Wno-format-overflow -Wno-sizeof-pointer-memaccess -Wno-maybe-uninitialized -fsigned-char")
10+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Werror -Wno-class-memaccess -Wno-restrict -Wno-format-overflow -Wno-sizeof-pointer-memaccess -Wno-maybe-uninitialized -Wno-stringop-truncation -Wno-sign-compare -fsigned-char")
1111
else()
1212
# fix /std:latest once VS2017 CMAKE supports CXX_STANDARD
1313
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W3 /WX")

conf/default/map.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ ah_list_limit: 7
7474
exp_rate: 1.0
7575
exp_loss_rate: 1.0
7676
exp_party_gap_penalties: 1
77-
fov_allow_alliance: 1
7877

7978
#Determines Vana'diel time epoch (886/1/1 Firesday)
8079
# current timestamp - vanadiel_time_epoch = vana'diel time

conf/default/version.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Topaz Version Info
22

33
#Expected Client version (wrong version cannot log in)
4-
CLIENT_VER: 30200702_1
4+
CLIENT_VER: 30200731_2
55

66
#WE STRONGLY ADVISE AGAINST LOCKING THE SERVER TO OLDER VERSIONS. IT IS A UNIVERSALLY BAD IDEA.
77

@@ -11,4 +11,4 @@ CLIENT_VER: 30200702_1
1111
VER_LOCK: 2
1212

1313
#Current Server Version.
14-
#TOPAZ_VER: R202007-01
14+
#TOPAZ_VER: R202008-01

documentation/Regime_IDs.csv

Lines changed: 848 additions & 0 deletions
Large diffs are not rendered by default.

documentation/Regime_IDs.txt

Lines changed: 0 additions & 388 deletions
This file was deleted.

migrations/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

migrations/migrate.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

migrations/mission_blob_extra.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)