From 5e2ea2b24c2c0151ff8b0354632aa00148e0e6d6 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 26 Jan 2017 16:03:48 +0100 Subject: finished charselect and cleaned up some files --- base/background/gs4/bancoacusacion.gif | Bin 2288 -> 0 bytes base/background/gs4/bancoacusacion.png | Bin 1838 -> 0 bytes base/background/gs4/bancodefensa.gif | Bin 1446 -> 0 bytes base/background/gs4/bancodefensa.png | Bin 1918 -> 0 bytes base/background/gs4/defenseempty.png | Bin 20664 -> 0 bytes base/background/gs4/estrado.gif | Bin 3536 -> 0 bytes base/background/gs4/estrado.png | Bin 3762 -> 0 bytes base/background/gs4/gallery.gif | Bin 29619 -> 0 bytes base/background/gs4/helperstand.png | Bin 23540 -> 0 bytes base/background/gs4/judgestand.png | Bin 28073 -> 0 bytes base/background/gs4/prohelperstand.png | Bin 29440 -> 0 bytes base/background/gs4/prosecutorempty.png | Bin 20487 -> 0 bytes base/background/gs4/speedlineupclose.png | Bin 3516 -> 0 bytes base/background/gs4/super anim.png | Bin 17676 -> 0 bytes base/background/gs4/tribunal.gif | Bin 29619 -> 0 bytes base/background/gs4/witnessempty.png | Bin 25245 -> 0 bytes base/config.ini~ | 1 - base/serverlist.txt | 4 ++++ base/themes/default/courtroom_design.ini | 7 ++++--- base/themes/default/design.ini | 28 ---------------------------- base/themes/default/loadingbackground.png | Bin 0 -> 2194 bytes base/themes/default/lobby_design.ini | 16 ++++++++++++++++ base/themes/default/muted.png | Bin 5703 -> 1013 bytes base/themes/default/muted_old.png | Bin 0 -> 5703 bytes 24 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 base/background/gs4/bancoacusacion.gif delete mode 100644 base/background/gs4/bancoacusacion.png delete mode 100644 base/background/gs4/bancodefensa.gif delete mode 100644 base/background/gs4/bancodefensa.png delete mode 100644 base/background/gs4/defenseempty.png delete mode 100644 base/background/gs4/estrado.gif delete mode 100644 base/background/gs4/estrado.png delete mode 100644 base/background/gs4/gallery.gif delete mode 100644 base/background/gs4/helperstand.png delete mode 100644 base/background/gs4/judgestand.png delete mode 100644 base/background/gs4/prohelperstand.png delete mode 100644 base/background/gs4/prosecutorempty.png delete mode 100644 base/background/gs4/speedlineupclose.png delete mode 100644 base/background/gs4/super anim.png delete mode 100644 base/background/gs4/tribunal.gif delete mode 100644 base/background/gs4/witnessempty.png delete mode 100644 base/config.ini~ create mode 100644 base/serverlist.txt delete mode 100644 base/themes/default/design.ini create mode 100644 base/themes/default/loadingbackground.png create mode 100644 base/themes/default/lobby_design.ini create mode 100644 base/themes/default/muted_old.png (limited to 'base') diff --git a/base/background/gs4/bancoacusacion.gif b/base/background/gs4/bancoacusacion.gif deleted file mode 100644 index 7b330a3c..00000000 Binary files a/base/background/gs4/bancoacusacion.gif and /dev/null differ diff --git a/base/background/gs4/bancoacusacion.png b/base/background/gs4/bancoacusacion.png deleted file mode 100644 index cce6bfe1..00000000 Binary files a/base/background/gs4/bancoacusacion.png and /dev/null differ diff --git a/base/background/gs4/bancodefensa.gif b/base/background/gs4/bancodefensa.gif deleted file mode 100644 index bb30ac14..00000000 Binary files a/base/background/gs4/bancodefensa.gif and /dev/null differ diff --git a/base/background/gs4/bancodefensa.png b/base/background/gs4/bancodefensa.png deleted file mode 100644 index c7121cc3..00000000 Binary files a/base/background/gs4/bancodefensa.png and /dev/null differ diff --git a/base/background/gs4/defenseempty.png b/base/background/gs4/defenseempty.png deleted file mode 100644 index fc9069e5..00000000 Binary files a/base/background/gs4/defenseempty.png and /dev/null differ diff --git a/base/background/gs4/estrado.gif b/base/background/gs4/estrado.gif deleted file mode 100644 index cd5075f7..00000000 Binary files a/base/background/gs4/estrado.gif and /dev/null differ diff --git a/base/background/gs4/estrado.png b/base/background/gs4/estrado.png deleted file mode 100644 index 9341a810..00000000 Binary files a/base/background/gs4/estrado.png and /dev/null differ diff --git a/base/background/gs4/gallery.gif b/base/background/gs4/gallery.gif deleted file mode 100644 index 4469bceb..00000000 Binary files a/base/background/gs4/gallery.gif and /dev/null differ diff --git a/base/background/gs4/helperstand.png b/base/background/gs4/helperstand.png deleted file mode 100644 index 882c30ce..00000000 Binary files a/base/background/gs4/helperstand.png and /dev/null differ diff --git a/base/background/gs4/judgestand.png b/base/background/gs4/judgestand.png deleted file mode 100644 index 6a17e7c9..00000000 Binary files a/base/background/gs4/judgestand.png and /dev/null differ diff --git a/base/background/gs4/prohelperstand.png b/base/background/gs4/prohelperstand.png deleted file mode 100644 index 6554d32d..00000000 Binary files a/base/background/gs4/prohelperstand.png and /dev/null differ diff --git a/base/background/gs4/prosecutorempty.png b/base/background/gs4/prosecutorempty.png deleted file mode 100644 index eecf8522..00000000 Binary files a/base/background/gs4/prosecutorempty.png and /dev/null differ diff --git a/base/background/gs4/speedlineupclose.png b/base/background/gs4/speedlineupclose.png deleted file mode 100644 index 06dc9b3a..00000000 Binary files a/base/background/gs4/speedlineupclose.png and /dev/null differ diff --git a/base/background/gs4/super anim.png b/base/background/gs4/super anim.png deleted file mode 100644 index fd3ec29a..00000000 Binary files a/base/background/gs4/super anim.png and /dev/null differ diff --git a/base/background/gs4/tribunal.gif b/base/background/gs4/tribunal.gif deleted file mode 100644 index 4469bceb..00000000 Binary files a/base/background/gs4/tribunal.gif and /dev/null differ diff --git a/base/background/gs4/witnessempty.png b/base/background/gs4/witnessempty.png deleted file mode 100644 index 11e22f74..00000000 Binary files a/base/background/gs4/witnessempty.png and /dev/null differ diff --git a/base/config.ini~ b/base/config.ini~ deleted file mode 100644 index 61e18830..00000000 --- a/base/config.ini~ +++ /dev/null @@ -1 +0,0 @@ -theme = default diff --git a/base/serverlist.txt b/base/serverlist.txt new file mode 100644 index 00000000..fef701da --- /dev/null +++ b/base/serverlist.txt @@ -0,0 +1,4 @@ +10.0.0.1:27071:the shit server +88.203.168.170:27777:Demon Server For Demons! Vanilla! 1.8+ +24.193.75.13:27053:The Flaming Phoenix +51.255.160.217:50000:Attorney Online Vidya(Dedicated) diff --git a/base/themes/default/courtroom_design.ini b/base/themes/default/courtroom_design.ini index c96d2620..e7a3de4b 100644 --- a/base/themes/default/courtroom_design.ini +++ b/base/themes/default/courtroom_design.ini @@ -8,7 +8,7 @@ area_list = 266, 494, 224, 174 music_list = 490, 342, 224, 326 ic_chat_message = 0, 192, 255, 23 ooc_chat_message = 492, 281, 222, 19 -ooc_chat_name = 492, 300, 32, 19 +ooc_chat_name = 492, 300, 85, 19 area_password = 266, 471, 224, 23 music_search = 490, 319, 226, 23 emote_left = 0, 253, 20, 20 @@ -20,6 +20,7 @@ sfx_label = 260, 410, 21, 16 blip_label = 260, 430, 31, 16 hold_it = 10, 312, 76, 28 objection = 90, 312, 76, 28 +take_that = 170, 312, 76, 28 ooc_toggle = 580, 300, 133, 19 witness_testimony = 5, 345, 85, 42 cross_examination = 95, 345, 85, 42 @@ -30,8 +31,8 @@ pre = 187, 345, 51, 21 flip = 187, 362, 51, 21 guard = 187, 379, 61, 21 custom_objection = 250, 325, 40, 40 -realization = 295, 323, 40, 40 -mute = 340, 325, 40, 40 +realization = 295, 325, 40, 40 +mute_button = 340, 325, 40, 40 defense_plus = 477, 325, 9, 9 defense_minus = 385, 325, 9, 9 prosecution_plus = 477, 342, 9, 9 diff --git a/base/themes/default/design.ini b/base/themes/default/design.ini deleted file mode 100644 index 5488ac4b..00000000 --- a/base/themes/default/design.ini +++ /dev/null @@ -1,28 +0,0 @@ -hold_it = 10, 312 -objection = 90, 312 -take_that = 170, 312 -objection_custom = 250, 325 -realization = 295, 325 -mute = 340, 325 -text_color = 390, 360 -defense_bar = 393, 323 -prosecution_bar = 393, 340 -def_plus = 477, 325 -def_minus = 385, 325 -pro_plus = 477, 342 -pro_minus = 385, 342 -witness_testimony = 5, 345 -cross_examination = 95, 345 -pre = 187, 345 -flip = 187, 362 -guard = 187, 379 -change_character = 5, 390 -reload_theme = 5, 415 -call_mod = 5, 440 -music_label = 260, 390 -music_slider = 310, 392 -sfx_label = 260, 410 -sfx_slider = 310, 412 -blips_label = 260, 430 -blips_slider = 310, 432 - diff --git a/base/themes/default/loadingbackground.png b/base/themes/default/loadingbackground.png new file mode 100644 index 00000000..202a8813 Binary files /dev/null and b/base/themes/default/loadingbackground.png differ diff --git a/base/themes/default/lobby_design.ini b/base/themes/default/lobby_design.ini new file mode 100644 index 00000000..efce59a7 --- /dev/null +++ b/base/themes/default/lobby_design.ini @@ -0,0 +1,16 @@ +lobby = 0, 0, 517, 666 +public_servers = 46, 88, 114, 30 +favorites = 164, 88, 114, 30 +refresh = 56, 381, 132, 28 +add_to_fav = 194, 381, 132, 28 +connect = 332, 381, 132, 28 +about = 428, 1, 88, 21 +server_list = 20, 125, 286, 240 +player_count = 336, 91, 173, 16 +description = 337, 109, 173, 245 +chatbox = 2, 445, 515, 198 +chatname = 3, 646, 85, 19 +chatmessage = 93, 646, 424, 19 +loading_label = 135, 92, 254, 95 +progress_bar = 135, 188, 254, 21 +cancel = 220, 220, 80, 20 diff --git a/base/themes/default/muted.png b/base/themes/default/muted.png index f9878f1a..969da04e 100644 Binary files a/base/themes/default/muted.png and b/base/themes/default/muted.png differ diff --git a/base/themes/default/muted_old.png b/base/themes/default/muted_old.png new file mode 100644 index 00000000..f9878f1a Binary files /dev/null and b/base/themes/default/muted_old.png differ -- cgit