aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-06-10 21:42:42 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-06-10 21:42:42 -0500
commit0bdcf03793d6f1304d02e008f4cfdaecd5e9119f (patch)
tree1946c0ef677988bc01b82013804e6a39fa5d72ae
parent4bc23c889f22d8babe073a1e13693623f74261e3 (diff)
Remove extraneous files; update themes submodule
- A preconfigured config.ini is probably not useful these days. There's an options menu now. - Removed gs4 background - already in vanilla pack. - Themes submodule should probably be configured to track master. Meh. Submodules can be so finicky. It probably doesn't belong in this repo anyway - it should be in the vanilla repo (currently invisible).
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--base/background/gs4/defensedesk.pngbin6880 -> 0 bytes
-rw-r--r--base/background/gs4/prosecutiondesk.pngbin6551 -> 0 bytes
-rw-r--r--base/background/gs4/stand.pngbin2657 -> 0 bytes
-rw-r--r--base/config.ini10
m---------base/themes0
6 files changed, 0 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9685de0..4c7f0799 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,7 +123,6 @@ build windows i686:
mkdir base
mkdir base/themes
cp -a ../base/themes/default base/themes/
- cp -a ../base/config.ini base/config.sample.ini
cp -a ../base/serverlist.txt base/serverlist.sample.txt
# Miscellaneous files
diff --git a/base/background/gs4/defensedesk.png b/base/background/gs4/defensedesk.png
deleted file mode 100644
index 00a3ffb6..00000000
--- a/base/background/gs4/defensedesk.png
+++ /dev/null
Binary files differ
diff --git a/base/background/gs4/prosecutiondesk.png b/base/background/gs4/prosecutiondesk.png
deleted file mode 100644
index 9f626733..00000000
--- a/base/background/gs4/prosecutiondesk.png
+++ /dev/null
Binary files differ
diff --git a/base/background/gs4/stand.png b/base/background/gs4/stand.png
deleted file mode 100644
index 3719e36a..00000000
--- a/base/background/gs4/stand.png
+++ /dev/null
Binary files differ
diff --git a/base/config.ini b/base/config.ini
deleted file mode 100644
index 1e8705fa..00000000
--- a/base/config.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-theme = default
-blip_rate = 1
-blank_blip = false
-default_music = 50
-default_sfx = 50
-default_blip = 50
-discord = true
-ic_scroll_down = false
-; master = master.aceattorneyonline.com
-; ooc_name = Phoenix \ No newline at end of file
diff --git a/base/themes b/base/themes
-Subproject 49cc1265f55e2939248bc1eeb6be93a8a03b985
+Subproject 4b8496e7b6b0926fb9f4f6f13d86cd1da31b047