Skip to content

Commit 3eb1c15

Browse files
author
Topaz
committed
Remove DSP branding (copyright notices retained)
1 parent d5d2f21 commit 3eb1c15

File tree

9,263 files changed

+48853
-49949
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,263 files changed

+48853
-49949
lines changed

.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ UpgradeLog*.XML
126126
*.app
127127

128128
# Generated executables
129-
/dsconnect
130-
/dsgame
131-
/dssearch
129+
/tpzconnect
130+
/tpzgame
131+
/tpzsearch
132132

133133
# Generated files, mostly autotools-related
134134
.deps
@@ -154,13 +154,13 @@ src/common/stamp-h1
154154

155155
navmeshes/*.nav
156156
tags
157-
log/DSP.leaks
157+
log/tpz.leaks
158158

159159
#Lua Developement Tools project files
160160
.metadata/**
161161
.project
162162
.vs
163-
/win32/.vs/darkstar/v15
163+
/win32/.vs/topaz/v15
164164

165165
#VS Code
166166
.vscode

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "navmeshes"]
22
path = navmeshes
3-
url = https://github.com/DarkstarProject/xiNavmeshes.git
3+
url = https://github.com/project-topaz/xiNavmeshes.git

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
before_script:
3131
- g++ --version
3232
- python3 ./tools/price_checker.py
33-
- mysql -u root -e 'create database dspdb_test;'
33+
- mysql -u root -e 'create database tpzdb_test;'
3434
- sh travis_sql.sh
3535
- sh travis_lua.sh
3636

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.9)
2-
project(darkstar)
2+
project(topaz)
33

44
set(CMAKE_VERBOSE_MAKEFILE ON)
55

CMakeSettings.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"configurations": [
1010
{
1111
"name": "x86-Debug",
12-
"generator": "Visual Studio 15 2017",
12+
"generator": "Visual Studio 16 2019",
1313
"configurationType": "Debug",
1414
"inheritEnvironments": [ "msvc_x86" ],
1515
"buildRoot": "${env.BuildDir}",
@@ -20,7 +20,7 @@
2020
},
2121
{
2222
"name": "x86-Release",
23-
"generator": "Visual Studio 15 2017",
23+
"generator": "Visual Studio 16 2019",
2424
"configurationType": "Release",
2525
"inheritEnvironments": [ "msvc_x86" ],
2626
"buildRoot": "${env.BuildDir}",
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "x64-Debug",
34-
"generator": "Visual Studio 15 2017 Win64",
34+
"generator": "Visual Studio 16 2019 Win64",
3535
"configurationType": "Debug",
3636
"inheritEnvironments": [ "msvc_x64" ],
3737
"buildRoot": "${env.BuildDir}",
@@ -42,7 +42,7 @@
4242
},
4343
{
4444
"name": "x64-Release",
45-
"generator": "Visual Studio 15 2017 Win64",
45+
"generator": "Visual Studio 16 2019 Win64",
4646
"configurationType": "Release",
4747
"inheritEnvironments": [ "msvc_x64" ],
4848
"buildRoot": "${env.BuildDir}",

CONTRIBUTING.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
# Issue Report Contributions:
22

3-
* Issues will be closed without being looked into if the following information is missing (unless its not applicable).
4-
* Client version (type `/ver` in game)
5-
* Branch name \(such as [stable](https://github.com/DarkstarProject/darkstar/tree/stable) or [master](https://github.com/DarkstarProject/darkstar/tree/master))
6-
3+
* Bug reports will only be accepted if they occur on [master](https://github.com/project-topaz/topaz/tree/master)
4+
* If an issue involves incorrect NPC or text, please include your client version (type `/ver` in game)
75

86
----
97

108
# Pull Request Contributions:
119

12-
All contributions must be done through pull requests to the darkstar repository. We unfortunately don't have time to take fixes from Discord or the forums to apply ourselves. If you need help with making a pull request, there is a GitHub guide on how to do so. If you still need help after consulting the guide, you can ask for help in Discord and we will be happy to help you.
13-
14-
After a pull request is made, if a developer leaves feedback for you to change, you must fix it for your pull request to be merged. We cannot merge incomplete or misformatted code, and (like before) we don't really have time to fix these ourselves.
10+
All contributions must be done through pull requests to the Topaz repository. We don't take fixes from Discord to apply ourselves. If you need help with making a pull request, there is a GitHub guide on how to do so. If you still need help after consulting the guide, you can ask for help in Discord and we will be happy to help you.
1511

16-
Unfortunately, the team is small enough that we can't fix or open pull requests for others, or we would have no time to do anything else.
12+
After a pull request is made, if a staff member leaves feedback for you to change, you must either fix or address it for your pull request to be merged.
1713

1814
# Style Guide
1915

ISSUE_TEMPLATE.md

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
<!-- place 'x' mark between square [] brackets to checkmark box -->
2-
32
**_I have:_**
43

5-
- [] searched existing issues (https://github.com/darkstarproject/darkstar/issues/) to see if the issue I am posting has already been addressed or opened by another contributor
6-
- [] checked the commit log to see if my issue has been resolved since my server was last updated
7-
8-
9-
<!-- Issues will be closed without being looked into if the following information is missing (unless its not applicable). -->
10-
11-
**_Client Version_** (type `/ver` in game) **:**
12-
13-
14-
**_Source Branch_** (master/stable) **:**
4+
- [] searched existing issues (https://github.com/project-topaz/topaz/issues/) to see if the issue has already been opened or fixed
5+
- [] checked the commit log to see if the issue has been resolved since my server was last updated
156

7+
**_Client Version_** (if applicable; type `/ver` in game) **:**
168

17-
<!-- If there is a server you know we can reproduce this on right now, please mention it here. -->
189
**_Additional Information_** (Steps to reproduce/Expected behavior) **:**
1910

Makefile.am

+31-31
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ AUTOMAKE_OPTIONS=foreign
55
include sources.am
66

77
## Set up all of our dependency flags
8-
SRC_ALL = $(SRC_DARKSTAR)
9-
CFLAGS_ALL = $(DARKSTAR_CFLAGS) -fsigned-char
10-
CPPFLAGS_ALL = $(DARKSTAR_CPPFLAGS) -fsigned-char -DFMT_HEADER_ONLY
11-
CXXFLAGS_ALL = $(DARKSTAR_CXXFLAGS) -fsigned-char
12-
LIBS_ALL = $(DARKSTAR_LIBS)
13-
LDFLAGS_ALL = $(DARKSTAR_LDFLAGS)
8+
SRC_ALL = $(SRC_TOPAZ)
9+
CFLAGS_ALL = $(TOPAZ_CFLAGS) -fsigned-char
10+
CPPFLAGS_ALL = $(TOPAZ_CPPFLAGS) -fsigned-char -DFMT_HEADER_ONLY
11+
CXXFLAGS_ALL = $(TOPAZ_CXXFLAGS) -fsigned-char
12+
LIBS_ALL = $(TOPAZ_LIBS)
13+
LDFLAGS_ALL = $(TOPAZ_LDFLAGS)
1414
CXX = g++ -std=c++17
1515

1616
CFLAGS_ALL += $(LUA_CFLAGS)
@@ -21,50 +21,50 @@ LIBS_ALL += $(MYSQL_LDFLAGS)
2121
LIBS_ALL += -lzmq
2222

2323
## Add Architecture-specific stuff
24-
if DARKSTAR_ARCH_LINUX
24+
if TOPAZ_ARCH_LINUX
2525
LIBS_ALL += -ldl
2626
endif
2727

28-
if DARKSTAR_ARCH_SOLARIS
28+
if TOPAZ_ARCH_SOLARIS
2929
LIBS_ALL += -lsocket -lnsl -ldl
3030
endif
3131

32-
if DARKSTAR_ARCH_FREEBSD
32+
if TOPAZ_ARCH_FREEBSD
3333
CPPFLAGS_ALL += -D__FREEBSD__
3434
endif
3535

36-
if DARKSTAR_ARCH_NETBSD
36+
if TOPAZ_ARCH_NETBSD
3737
CPPFLAGS_ALL += -D__NETBSD__
3838
endif
3939

40-
if DARKSTAR_ARCH_WIN32
40+
if TOPAZ_ARCH_WIN32
4141
CPPFLAGS_ALL += -DFD_SETSIZE=4096 -DCYGWIN
4242
endif
4343

44-
if DARKSTAR_ARCH_OSX
44+
if TOPAZ_ARCH_OSX
4545
LDFLAGS_ALL += -pagezero_size 10000 -image_base 100000000
4646
endif
4747

4848
## Targets
49-
bin_PROGRAMS = dsgame dsconnect dssearch
49+
bin_PROGRAMS = tpzgame tpzconnect tpzsearch
5050

51-
dsgame_SOURCES = $(SRC_ALL) $(SRC_MAP)
52-
dsgame_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
53-
dsgame_CPPFLAGS = $(CPPFLAGS_ALL)
54-
dsgame_CFLAGS = $(CFLAGS_ALL)
55-
dsgame_LDFLAGS = $(LDFLAGS_ALL)
56-
dsgame_LDADD = $(LIBS_ALL)
51+
tpzgame_SOURCES = $(SRC_ALL) $(SRC_MAP)
52+
tpzgame_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
53+
tpzgame_CPPFLAGS = $(CPPFLAGS_ALL)
54+
tpzgame_CFLAGS = $(CFLAGS_ALL)
55+
tpzgame_LDFLAGS = $(LDFLAGS_ALL)
56+
tpzgame_LDADD = $(LIBS_ALL)
5757

58-
dsconnect_SOURCES = $(SRC_ALL) $(SRC_LOGIN)
59-
dsconnect_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
60-
dsconnect_CPPFLAGS = $(CPPFLAGS_ALL)
61-
dsconnect_CFLAGS = $(CFLAGS_ALL)
62-
dsconnect_LDFLAGS = $(LDFLAGS_ALL)
63-
dsconnect_LDADD = $(LIBS_ALL)
58+
tpzconnect_SOURCES = $(SRC_ALL) $(SRC_LOGIN)
59+
tpzconnect_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
60+
tpzconnect_CPPFLAGS = $(CPPFLAGS_ALL)
61+
tpzconnect_CFLAGS = $(CFLAGS_ALL)
62+
tpzconnect_LDFLAGS = $(LDFLAGS_ALL)
63+
tpzconnect_LDADD = $(LIBS_ALL)
6464

65-
dssearch_SOURCES = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
66-
dssearch_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
67-
dssearch_CPPFLAGS = $(CPPFLAGS_ALL)
68-
dssearch_CFLAGS = $(CFLAGS_ALL)
69-
dssearch_LDFLAGS = $(LDFLAGS_ALL)
70-
dssearch_LDADD = $(LIBS_ALL)
65+
tpzsearch_SOURCES = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
66+
tpzsearch_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
67+
tpzsearch_CPPFLAGS = $(CPPFLAGS_ALL)
68+
tpzsearch_CFLAGS = $(CFLAGS_ALL)
69+
tpzsearch_LDFLAGS = $(LDFLAGS_ALL)
70+
tpzsearch_LDADD = $(LIBS_ALL)

README.md

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
[![Build Status](https://travis-ci.org/DarkstarProject/darkstar.svg?branch=master)](https://travis-ci.org/DarkstarProject/darkstar)
22
[![Build status](https://ci.appveyor.com/api/projects/status/69bemc5htluv9ss3/branch/master?svg=true)](https://ci.appveyor.com/project/teschnei/darkstar/branch/master)
3-
Darkstar Project
3+
Project Topaz
44
========
55

6-
Welcome to the DarkStar project, an emulation server for FFXI.
7-
Visit our forums and Discord or IRC to keep in touch with the latest developments.
8-
9-
**Forums:** https://forums.dspt.info/index.php
6+
Welcome to Project Topaz, an emulation server for FFXI.
7+
Visit our Discord to keep in touch with the latest developments.
108

119
**Discord:**
12-
https://discord.gg/4dgAzfC
10+
https://discord.gg/bG6GHNH
1311

1412
Bug Reports
1513
========
16-
You can find the tracker here: https://github.com/DarkstarProject/darkstar/issues
14+
You can find the tracker here: https://github.com/project-topaz/topaz/issues
1715

1816
Make sure both FFXI and the server are fully updated (and servers have been rebuilt with the latest code prior to the bug) or check the commit log since your last known update to see if the bug has already been fixed before submitting a new bug report (oh and remember to search to see if your issue has already been reported).
1917

20-
For any server crashing bugs, try to include a crashdump if possible, with the ```exe```, ```pdb```, and ```dmp``` file (see https://wiki.dspt.info/index.php/How_to_Dump) - including the ```log``` is optional, but it does help us debug crashes.
21-
2218
Bug reports should include steps to reproduce the bug.
2319

2420
Pull Requests
2521
========
2622
Commits should contain a descriptive name for what you are modifying
2723

28-
Remember to check back for any feedback, and drop a comment once requested changes have been made (if there are any).
24+
Check the contributing guide for the project style guide: https://github.com/project-topaz/topaz/blob/master/CONTRIBUTING.md
2925

30-
Use 4 spaces per tab - this will be enforced in pull requests.
26+
You must *test your code* before committing changes/submitting a pull request. You break it you fix it!
3127

32-
Please *test your code* before committing changes/submitting a pull request. You break it you fix it!
28+
Remember to check back for any feedback, and drop a comment once requested changes have been made (if there are any).
3329

3430
Wiki
3531
========
36-
Our project wiki with various information and guides can be found here:
37-
https://wiki.dspt.info/
32+
Our project wiki with various information and guides can be found on GitHub.
33+

appveyor.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 0.9.{build}
22
pull_requests:
33
do_not_increment_build_number: true
4-
image: Visual Studio 2017
4+
image: Visual Studio 16 2019
55
configuration:
66
- Debug
77
- Release
@@ -12,12 +12,12 @@ matrix:
1212
fast_finish: true
1313
shallow_clone: true
1414
init:
15-
- set generator="Visual Studio 15 2017"
16-
- if "%PLATFORM%" == "x64" (set generator="Visual Studio 15 2017 Win64")
15+
- set generator="Visual Studio 16 2019"
16+
- if "%PLATFORM%" == "x64" (set generator="Visual Studio 16 2019 Win64")
1717
before_build:
1818
- cmake . -G %generator%
1919
build:
20-
project: darkstar.sln
20+
project: topaz.sln
2121
verbosity: normal
2222
parallel: true
2323
test: off

conf/lan_config.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//darkstar lan config
1+
//topaz lan config
22
map_lan_ip: 127.0.0.1
33
map_lan_port: 53999
44

0 commit comments

Comments
 (0)