From ad744df72f5cec666d6abe0e173d8336bb8d1a55 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Sat, 28 Mar 2020 14:26:32 -0400 Subject: [PATCH 1/5] Added mesh repo as a submodule --- .gitmodules | 3 +++ mesh | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 mesh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..b4e179855 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mesh"] + path = mesh + url = https://github.com/SWG-Source/mesh.git diff --git a/mesh b/mesh new file mode 160000 index 000000000..ed79fa43e --- /dev/null +++ b/mesh @@ -0,0 +1 @@ +Subproject commit ed79fa43e092e2d121548f232fde5eff1d0c56b6 From aacdf71e263b3dfb2dfaf8175ac8abdd18baed92 Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Sat, 28 Mar 2020 18:05:01 -0400 Subject: [PATCH 2/5] Moved mesh repository --- .gitmodules | 4 ++-- appearance/mesh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 appearance/mesh diff --git a/.gitmodules b/.gitmodules index b4e179855..b7215b49f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "mesh"] - path = mesh +[submodule "appearance/mesh"] + path = appearance/mesh url = https://github.com/SWG-Source/mesh.git diff --git a/appearance/mesh b/appearance/mesh new file mode 160000 index 000000000..ed79fa43e --- /dev/null +++ b/appearance/mesh @@ -0,0 +1 @@ +Subproject commit ed79fa43e092e2d121548f232fde5eff1d0c56b6 From 4256688cd4c3a9e66246db3a18e44662fcea7abe Mon Sep 17 00:00:00 2001 From: CekisSWG Date: Sat, 28 Mar 2020 18:07:18 -0400 Subject: [PATCH 3/5] Removed old repo location --- mesh | 1 - 1 file changed, 1 deletion(-) delete mode 160000 mesh diff --git a/mesh b/mesh deleted file mode 160000 index ed79fa43e..000000000 --- a/mesh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ed79fa43e092e2d121548f232fde5eff1d0c56b6 From 58c98bd8ed2cc09a95e17ca80e90a2f414e6e135 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 28 Mar 2020 15:37:16 -0700 Subject: [PATCH 4/5] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0c41f0bd5..82ef09f99 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,14 @@ -# Clientdata Repository +# Server Data Repository This is the server side client data repo ONLY. DO NOT include files in this repo that would normally be used ONLY on the client side. Store only files necessary for the SERVER operation here. This would exclude files like sound files and MOST appearance files that do not have collision. -OPTIONAL: Compile into SOT files (see tre-sot-builders repo or ask Erusman - thanks dude!). Alternatively, use as-is. - # Usage -You should +The contents of this repo belong in the following SWG path: cd /path/to/swg/data/sku.0/sys.client/compiled -Then clone this repo. You should also remove any other sku.[1-3] or sku.ja folders you may have inside data, as those are also client only. You'll then need to edit your exe/shared/servercommon.cfg to remove those old, dead paths. +The repo is cloned via the ANT build process currently and the location is handled properly, however, you can still perform manual tasks as needed with this repo. It's our assumption cloning manually is not needed. # Useful Changes Appreciated From c827a43c0d1d4fdb2f2b2e0827ea30e164b4aee8 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 28 Mar 2020 15:37:30 -0700 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82ef09f99..1d2153eab 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is the server side client data repo ONLY. DO NOT include files in this repo The contents of this repo belong in the following SWG path: - cd /path/to/swg/data/sku.0/sys.client/compiled + /path/to/swg/data/sku.0/sys.client/compiled The repo is cloned via the ANT build process currently and the location is handled properly, however, you can still perform manual tasks as needed with this repo. It's our assumption cloning manually is not needed.