From 11a553b1c9b864095df6d598d4562c3c506c1652 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Thu, 15 Jun 2017 15:34:54 +0000 Subject: [PATCH] refactor repo folder structure --- winclient/deploy.py => deploy.py | 0 winclient/filever.py => filever.py | 0 .../forwardfilesync.py => forwardfilesync.py | 0 ...IVEN.iss => install ENLIVEN on Windows.iss | 0 .../launcher-src => launcher}/ENLIVEN.ico | Bin .../launcher-src => launcher}/ENLIVEN.pro | 0 .../ENLIVEN.pro.user | 0 {winclient/launcher-src => launcher}/main.cpp | 0 .../launcher-src => launcher}/mainwindow.cpp | 0 .../launcher-src => launcher}/mainwindow.h | 0 .../launcher-src => launcher}/mainwindow.ui | 0 .../launcher-src => launcher}/post-build.bat | 0 .../launcher => launcher}/qtlicenses/LICENSE | 0 .../qtlicenses/LICENSE.FDL | 0 .../qtlicenses/ThirdPartySoftware_Listing.txt | 0 minetest.conf | 77 ------------------ .../minetest.conf => minetest.conf.client | 21 ++++- minetest.conf.lanclient | 5 ++ minetest.conf.server | 11 +++ winclient/launcher/README - see parent folder | 1 - 20 files changed, 33 insertions(+), 82 deletions(-) rename winclient/deploy.py => deploy.py (100%) rename winclient/filever.py => filever.py (100%) rename winclient/forwardfilesync.py => forwardfilesync.py (100%) rename winclient/install ENLIVEN.iss => install ENLIVEN on Windows.iss (100%) rename {winclient/launcher-src => launcher}/ENLIVEN.ico (100%) rename {winclient/launcher-src => launcher}/ENLIVEN.pro (100%) rename {winclient/launcher-src => launcher}/ENLIVEN.pro.user (100%) rename {winclient/launcher-src => launcher}/main.cpp (100%) rename {winclient/launcher-src => launcher}/mainwindow.cpp (100%) rename {winclient/launcher-src => launcher}/mainwindow.h (100%) rename {winclient/launcher-src => launcher}/mainwindow.ui (100%) rename {winclient/launcher-src => launcher}/post-build.bat (100%) rename {winclient/launcher => launcher}/qtlicenses/LICENSE (100%) rename {winclient/launcher => launcher}/qtlicenses/LICENSE.FDL (100%) rename {winclient/launcher => launcher}/qtlicenses/ThirdPartySoftware_Listing.txt (100%) delete mode 100644 minetest.conf rename winclient/launcher/minetest.conf => minetest.conf.client (79%) create mode 100644 minetest.conf.lanclient create mode 100644 minetest.conf.server delete mode 100644 winclient/launcher/README - see parent folder diff --git a/winclient/deploy.py b/deploy.py similarity index 100% rename from winclient/deploy.py rename to deploy.py diff --git a/winclient/filever.py b/filever.py similarity index 100% rename from winclient/filever.py rename to filever.py diff --git a/winclient/forwardfilesync.py b/forwardfilesync.py similarity index 100% rename from winclient/forwardfilesync.py rename to forwardfilesync.py diff --git a/winclient/install ENLIVEN.iss b/install ENLIVEN on Windows.iss similarity index 100% rename from winclient/install ENLIVEN.iss rename to install ENLIVEN on Windows.iss diff --git a/winclient/launcher-src/ENLIVEN.ico b/launcher/ENLIVEN.ico similarity index 100% rename from winclient/launcher-src/ENLIVEN.ico rename to launcher/ENLIVEN.ico diff --git a/winclient/launcher-src/ENLIVEN.pro b/launcher/ENLIVEN.pro similarity index 100% rename from winclient/launcher-src/ENLIVEN.pro rename to launcher/ENLIVEN.pro diff --git a/winclient/launcher-src/ENLIVEN.pro.user b/launcher/ENLIVEN.pro.user similarity index 100% rename from winclient/launcher-src/ENLIVEN.pro.user rename to launcher/ENLIVEN.pro.user diff --git a/winclient/launcher-src/main.cpp b/launcher/main.cpp similarity index 100% rename from winclient/launcher-src/main.cpp rename to launcher/main.cpp diff --git a/winclient/launcher-src/mainwindow.cpp b/launcher/mainwindow.cpp similarity index 100% rename from winclient/launcher-src/mainwindow.cpp rename to launcher/mainwindow.cpp diff --git a/winclient/launcher-src/mainwindow.h b/launcher/mainwindow.h similarity index 100% rename from winclient/launcher-src/mainwindow.h rename to launcher/mainwindow.h diff --git a/winclient/launcher-src/mainwindow.ui b/launcher/mainwindow.ui similarity index 100% rename from winclient/launcher-src/mainwindow.ui rename to launcher/mainwindow.ui diff --git a/winclient/launcher-src/post-build.bat b/launcher/post-build.bat similarity index 100% rename from winclient/launcher-src/post-build.bat rename to launcher/post-build.bat diff --git a/winclient/launcher/qtlicenses/LICENSE b/launcher/qtlicenses/LICENSE similarity index 100% rename from winclient/launcher/qtlicenses/LICENSE rename to launcher/qtlicenses/LICENSE diff --git a/winclient/launcher/qtlicenses/LICENSE.FDL b/launcher/qtlicenses/LICENSE.FDL similarity index 100% rename from winclient/launcher/qtlicenses/LICENSE.FDL rename to launcher/qtlicenses/LICENSE.FDL diff --git a/winclient/launcher/qtlicenses/ThirdPartySoftware_Listing.txt b/launcher/qtlicenses/ThirdPartySoftware_Listing.txt similarity index 100% rename from winclient/launcher/qtlicenses/ThirdPartySoftware_Listing.txt rename to launcher/qtlicenses/ThirdPartySoftware_Listing.txt diff --git a/minetest.conf b/minetest.conf deleted file mode 100644 index 100ed83..0000000 --- a/minetest.conf +++ /dev/null @@ -1,77 +0,0 @@ -# In case user of an Enliven server wants to start their own server via the graphical user interface: -protector_radius = 7 -protector_pvp = true -protector_pvp_spawn = 10 -protector_drop = true -protector_hurt = 1 - -default_privs = interact,shout,home -max_users = 50 -motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki" -disallow_empty_passwords = true - - -# Client configuration for improved graphics: - -# address = fcalocal -# maintab_LAST = singleplayer -# menu_last_game = ENLIVEN -# name = -remote_port = 30000 -server_dedicated = false -mg_name = v7 -creative_mode = false -enable_damage = true -server_announce = false -cinematic = true -cinematic_camera_smoothing = 0.7 -serverlist_file = favoriteservers.txt -font_size = 22 -font_shadow = 1 -mono_font_size = 22 -fallback_font_size = 22 -fallback_font_shadow = 1 -# public_serverlist = false -enable_local_map_saving = true -public_serverlist = true -enable_remote_media_server = true -serverlist_url = servers.minetest.net -font_shadow_alpha = 255 -fallback_font_shadow_alpha = 255 -connected_glass = true -smooth_lighting = true -enable_clouds = true -enable_3d_clouds = true - -anisotropic_filter = true -texture_clean_transparent = true -#texture_min_size = 64 -enable_shaders = true -tone_mapping = true -enable_bumpmapping = true -#generate_normalmaps = true -enable_waving_water = true -water_wave_height = 1.0 -water_wave_length = 20.0 -water_wave_speed = 5.0 -enable_waving_leaves = true -enable_waving_plants = true -pause_fps_max = 20 -vsync = true -video_driver = opengl -cloud_height = 120 -cloud_radius = 12 -enable_minimap = true -minimap_shape_round = true -directional_colored_fog = true -ambient_occlusion_gamma = 2.2 -inventory_items_animations = true -menu_clouds = true -fast_move = true -free_move = true -noclip = true -#fixed_map_seed = Enliven20170203v7 -mainmenu_last_selected_world = 2 -#selected_world_path = C:\games\Minetest\bin\..\worlds\charredplanet -wieldview_node_tiles = false -wieldview_update_time = 2 diff --git a/winclient/launcher/minetest.conf b/minetest.conf.client similarity index 79% rename from winclient/launcher/minetest.conf rename to minetest.conf.client index 6c0c0ec..ec784ac 100644 --- a/winclient/launcher/minetest.conf +++ b/minetest.conf.client @@ -1,3 +1,4 @@ +# address = ambient_occlusion_gamma = 2.2 anisotropic_filter = true cinematic = true @@ -11,36 +12,50 @@ enable_3d_clouds = true enable_bumpmapping = true enable_clouds = true enable_damage = true +#optional: +enable_local_map_saving = true enable_minimap = true +#optional: +enable_remote_media_server = true enable_shaders = true enable_waving_leaves = true enable_waving_plants = true enable_waving_water = true fallback_font_shadow = 1 fallback_font_shadow_alpha = 255 -fallback_font_size = 22 -fast_move = false +fallback_font_size = 16 +fast_move = true +#fixed_map_seed = font_shadow = 1 font_shadow_alpha = 255 font_size = 16 free_move = true +#generate_normalmaps = true +hudbars_bar_type = statbar_modern inventory_items_animations = true mainmenu_last_selected_world = 2 +#optional: maintab_LAST = singleplayer menu_clouds = true +# name = +optional: menu_last_game = ENLIVEN mg_name = v7 minimap_shape_round = true mono_font_size = 22 noclip = true pause_fps_max = 20 +#optional: public_serverlist = true remote_port = 30000 +#selected_world_path = server_announce = false server_dedicated = false +serverlist_file = favoriteservers.txt serverlist_url = servers.minetest.net smooth_lighting = true texture_clean_transparent = true +#texture_min_size = 64 tone_mapping = true video_driver = opengl vsync = true @@ -49,5 +64,3 @@ water_wave_length = 20.0 water_wave_speed = 5.0 wieldview_node_tiles = false wieldview_update_time = 2 -hudbars_bar_type = statbar_modern -name = diff --git a/minetest.conf.lanclient b/minetest.conf.lanclient new file mode 100644 index 0000000..c97fc70 --- /dev/null +++ b/minetest.conf.lanclient @@ -0,0 +1,5 @@ +fallback_font_size = 22 +address = fcalocal +name = fcalocal +font_size = 22 +serverlist_url = diff --git a/minetest.conf.server b/minetest.conf.server new file mode 100644 index 0000000..caf31e4 --- /dev/null +++ b/minetest.conf.server @@ -0,0 +1,11 @@ +# In case user of an Enliven server wants to start their own server via the graphical user interface: +protector_radius = 7 +protector_pvp = true +protector_pvp_spawn = 10 +protector_drop = true +protector_hurt = 1 + +default_privs = interact,shout,home +max_users = 50 +motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki" +disallow_empty_passwords = true diff --git a/winclient/launcher/README - see parent folder b/winclient/launcher/README - see parent folder deleted file mode 100644 index 7f3db14..0000000 --- a/winclient/launcher/README - see parent folder +++ /dev/null @@ -1 +0,0 @@ -https://github.com/expertmm/EnlivenMinetest/blob/master/README.md \ No newline at end of file