diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..f3908ff --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,22 @@ +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.158.0/containers/cpp/.devcontainer/base.Dockerfile + +# [Choice] Debian / Ubuntu version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04 +ARG VARIANT="buster" +FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT} + + RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get -y install --no-install-recommends build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev \ + libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm mingw-w64 + +ARG GODOT_VERSION="3.2.3" + +RUN wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}/Godot_v${GODOT_VERSION}-stable_linux_headless.64.zip \ + && wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}/Godot_v${GODOT_VERSION}-stable_export_templates.tpz \ + && mkdir ~/.cache \ + && mkdir -p ~/.config/godot \ + && mkdir -p ~/.local/share/godot/templates/${GODOT_VERSION}.stable \ + && unzip Godot_v${GODOT_VERSION}-stable_linux_headless.64.zip \ + && mv Godot_v${GODOT_VERSION}-stable_linux_headless.64 /usr/local/bin/godot \ + && unzip Godot_v${GODOT_VERSION}-stable_export_templates.tpz \ + && mv templates/* ~/.local/share/godot/templates/${GODOT_VERSION}.stable \ + && rm -f Godot_v${GODOT_VERSION}-stable_export_templates.tpz Godot_v${GODOT_VERSION}-stable_linux_headless.64.zip \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..24f7685 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,30 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.158.0/containers/cpp +{ + "name": "C++", + "build": { + "dockerfile": "Dockerfile", + // Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04 + "args": { "VARIANT": "ubuntu-20.04", "GODOT_VERSION" : "3.2.3" } + }, + "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"], + + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "ms-vscode.cpptools" + ], + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "gcc -v", + + // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc4a0a3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,50 @@ +# Godot +client/.import/ +client/export.cfg +client/export_presets.cfg +api.json +logs/ +*.translation + +# Godot Mono +client/.mono/ +client/data_*/ + +# Scons +.sconsign.dblite + +# Object script +*.os + +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app diff --git a/.gitmodules b/.gitmodules index 4399361..6c7b47a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,7 @@ url = git@github.com:CptPotato/GodotThings.git [submodule "client/Assets/Proprietary"] path = client/Assets/Proprietary - url = git@github.com:josephbmanley/the-connection-proprietary.git \ No newline at end of file + url = git@github.com:josephbmanley/the-connection-proprietary.git +[submodule "godot-cpp"] + path = godot-cpp + url = git@github.com:godotengine/godot-cpp.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5c7421c --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +PROJECTNAME="The Connection" + +platform=linux +threads=4 + +build-godot-bindings: + @echo " > Generating `api.json`..." + @godot --gdnative-generate-json-api api.json + @echo " > Building bindings..." + @cd godot-cpp && scons platform=$(platform) bits=64 generate_bindings=yes -j$(threads) use_custom_api_file=yes custom_api_file=../api.json + +## compile: Compiles GDNative code +compile: + @mkdir -p ./godot/bin + @echo " > Compiling GDNative..." + @scons platform=$(platform) + +## build: Cleans project, create bindings, and compiles GDNative +build: clean build-godot-bindings compile + +## clean: Removes all build related files +clean: + @echo " > Cleaning project..." + @rm -f ./api.json + @rm -f ./.sconsign.dblite + @rm -rf ./godot-cpp/bin + @find ./client/bin -name \*.dll -type f -delete + @find ./client/bin -name \*.so -type f -delete + @find ./client/bin -name \*.dylib -type f -delete + + +## help: Displays help text for make commands +.DEFAULT_GOAL := help +all: help +help: Makefile + @echo " Choose a command run in "$(PROJECTNAME)":" + @sed -n 's/^##//p' $< | column -t -s ':' | sed -e 's/^/ /' \ No newline at end of file diff --git a/SConstruct b/SConstruct new file mode 100644 index 0000000..56732a1 --- /dev/null +++ b/SConstruct @@ -0,0 +1,156 @@ +#!python +import os, sys + +opts = Variables([], ARGUMENTS) + +# Gets the standard flags CC, CCX, etc. +env = DefaultEnvironment() + +# Define our options +opts.Add(EnumVariable('target', "Compilation target", 'debug', ['d', 'debug', 'r', 'release'])) +opts.Add(EnumVariable('platform', "Compilation platform", '', ['', 'windows', 'x11', 'linux', 'osx'])) +opts.Add(EnumVariable('p', "Compilation target, alias for 'platform'", '', ['', 'windows', 'x11', 'linux', 'osx'])) +opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no')) +opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'client/bin/')) +opts.Add(PathVariable('target_name', 'The library name.', 'connection', PathVariable.PathAccept)) + +# Local dependency paths, adapt them to your setup +godot_headers_path = "godot-cpp/godot-headers/" +cpp_bindings_path = "godot-cpp/" +cpp_library = "libgodot-cpp" + +# only support 64 at this time.. +bits = 64 + +# Updates the environment with the option variables. +opts.Update(env) + +# Process some arguments +if env['use_llvm']: + env['CC'] = 'clang' + env['CXX'] = 'clang++' + +if env['p'] != '': + env['platform'] = env['p'] + +if env['platform'] == '': + print("No valid target platform selected.") + quit(); + +# Try to detect the host platform automatically. +# This is used if no `platform` argument is passed +if sys.platform.startswith('linux'): + host_platform = 'linux' +elif sys.platform == 'darwin': + host_platform = 'osx' +elif sys.platform == 'win32' or sys.platform == 'msys': + host_platform = 'windows' +else: + raise ValueError( + 'Could not detect platform automatically, please specify with ' + 'platform=' + ) + +############# +## Mac OSX ## +############# +# Check our platform specifics +if env['platform'] == "osx": + + # Throw error if not running on Mac + if host_platform != "osx": + raise "Cross compile not supported for OSX!" + + env['target_path'] += 'osx/' + cpp_library += '.osx' + env['target_suffix'] = "dylib" + env.Append(CCFLAGS=['-arch', 'x86_64']) + env.Append(CXXFLAGS=['-std=c++17']) + env.Append(LINKFLAGS=['-arch', 'x86_64']) + if env['target'] in ('debug', 'd'): + env.Append(CCFLAGS=['-g', '-O2']) + else: + env.Append(CCFLAGS=['-g', '-O3']) + +########### +## Linux ## +########### +elif env['platform'] in ('x11', 'linux'): + env['target_path'] += 'x11/' + env['target_suffix'] = "so" + cpp_library += '.linux' + env.Append(CCFLAGS=['-fPIC']) + env.Append(CXXFLAGS=['-std=c++17']) + if env['target'] in ('debug', 'd'): + env.Append(CCFLAGS=['-g3', '-Og']) + else: + env.Append(CCFLAGS=['-g', '-O3']) + +############# +## Windows ## +############# +elif env['platform'] == "windows": + env['target_path'] += 'win64/' + cpp_library += '.windows' + env['target_suffix'] = "dll" + + # Configure compiler for visual studio if bulding windows on windows + if host_platform == 'windows' and not env['use_mingw']: + # This makes sure to keep the session environment variables on windows, + # that way you can run scons in a vs 2017 prompt and it will find all the required tools + env.Append(ENV=os.environ) + + env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS']) + env.Append(CCFLAGS=['-W3', '-GR']) + if env['target'] in ('debug', 'd'): + env.Append(CPPDEFINES=['_DEBUG']) + env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI']) + env.Append(LINKFLAGS=['-DEBUG']) + else: + env.Append(CPPDEFINES=['NDEBUG']) + env.Append(CCFLAGS=['-O2', '-EHsc', '-MD']) + + # Configure compiler for mingw if building for windows on another OS + elif host_platform == 'linux' or host_platform == 'osx': + # MinGW + if bits == 64: + env['CXX'] = 'x86_64-w64-mingw32-g++' + env['AR'] = "x86_64-w64-mingw32-ar" + env['RANLIB'] = "x86_64-w64-mingw32-ranlib" + env['LINK'] = "x86_64-w64-mingw32-g++" + elif bits == 32: + env['CXX'] = 'i686-w64-mingw32-g++' + env['AR'] = "i686-w64-mingw32-ar" + env['RANLIB'] = "i686-w64-mingw32-ranlib" + env['LINK'] = "i686-w64-mingw32-g++" + + env.Append(CCFLAGS=['-O3', '-std=c++14', '-Wwrite-strings']) + env.Append(LINKFLAGS=[ + '--static', + '-Wl,--no-undefined', + '-static-libgcc', + '-static-libstdc++', + ]) + +if env['target'] in ('debug', 'd'): + cpp_library += '.debug' +else: + cpp_library += '.release' + +cpp_library += '.' + str(bits) + +# Add paths to libraries and dependencies +env.Append(CPPPATH=['.', godot_headers_path, cpp_bindings_path + 'include/', cpp_bindings_path + 'include/core/', cpp_bindings_path + 'include/gen/']) +env.Append(LIBPATH=[cpp_bindings_path + 'bin/']) +env.Append(LIBS=[cpp_library]) + +# Add project files +env.Append(CPPPATH=['src/']) +sources = Glob('src/*.cpp') + +library = env.SharedLibrary(target=env['target_path'] + env['target_name'] + "." + env['target_suffix'], source=sources) + +Default(library) + +# Generates help for the -h scons option. +Help(opts.GenerateHelpText(env)) diff --git a/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.md5 b/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.md5 deleted file mode 100644 index a3c3259..0000000 --- a/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9f3599f4ed5f050bd5c7966b39434aeb" -dest_md5="d8b8d051422c7cd9a641096cbf8c2f89" - diff --git a/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.stex b/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.stex deleted file mode 100644 index dff60d4..0000000 Binary files a/client/.import/32x32mask.png-77a8c1cd0524f72482b68407b44d83f2.stex and /dev/null differ diff --git a/client/.import/animation_reference.png-0380e195c2981cbf6a12a964c592fbc3.md5 b/client/.import/animation_reference.png-0380e195c2981cbf6a12a964c592fbc3.md5 deleted file mode 100644 index 724141b..0000000 --- a/client/.import/animation_reference.png-0380e195c2981cbf6a12a964c592fbc3.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="e8dabe73b13a84d293485b937c80f448" -dest_md5="4d425793877e102c4abd32ff8888a949" - diff --git a/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.md5 b/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.md5 deleted file mode 100644 index 3f794e0..0000000 --- a/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="3bfdad86a3348e10ad92dce7a0c7edfb" -dest_md5="b2215c68eec5e82ae3b199c3ebef6ca3" - diff --git a/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.stex b/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.stex deleted file mode 100644 index 86fe42d..0000000 Binary files a/client/.import/aura.png-5db336dcba6e9c097fe7f8c968786f4d.stex and /dev/null differ diff --git a/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.md5 b/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.md5 deleted file mode 100644 index c0b2ee3..0000000 --- a/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="0f187f924d66394184e7b3e6c957fb8c" -dest_md5="c9bfe92d419f5078052bb89139a81b80" - diff --git a/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.stex b/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.stex deleted file mode 100644 index e395389..0000000 Binary files a/client/.import/basic_light.png-be43bc97e09ada1ee3bdc5318387e516.stex and /dev/null differ diff --git a/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.md5 b/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.md5 deleted file mode 100644 index 041d15a..0000000 --- a/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="424bc2e8a11a2373217678abda0df97e" -dest_md5="917df80dfa039af088b63b9a234e0ced" - diff --git a/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.stex b/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.stex deleted file mode 100644 index 68e145a..0000000 Binary files a/client/.import/bkg.png-6d612998c42eb98ba210a445bebb5ef5.stex and /dev/null differ diff --git a/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.md5 b/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.md5 deleted file mode 100644 index c3bfe9a..0000000 --- a/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="8aef6de8412026e94480cc71d8d055b6" -dest_md5="f536ce724bbfd6d3eec9c9b681d8bd87" - diff --git a/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.stex b/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.stex deleted file mode 100644 index 8ba56fc..0000000 Binary files a/client/.import/business.png-1d2889e02b43c09b4d73f5f70c072b3d.stex and /dev/null differ diff --git a/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.md5 b/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.md5 deleted file mode 100644 index 77c4038..0000000 --- a/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9d92358506b2f630f49d7186a984dda0" -dest_md5="4d5bf56017f00adbc80e9bf5a14a9f50" - diff --git a/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.stex b/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.stex deleted file mode 100644 index 8a77409..0000000 Binary files a/client/.import/button1.png-b667d722966f2d8ba6c61e30c12f8b40.stex and /dev/null differ diff --git a/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.md5 b/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.md5 deleted file mode 100644 index f2c88da..0000000 --- a/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="08fdfe746696263d9157f46fbf6bcae3" -dest_md5="663720fe7a6ed76fff5d90489304ad6b" - diff --git a/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.stex b/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.stex deleted file mode 100644 index eee0c05..0000000 Binary files a/client/.import/button2.png-ff69e30c2639fb35de95ea60547f62d7.stex and /dev/null differ diff --git a/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.md5 b/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.md5 deleted file mode 100644 index 8b66dce..0000000 --- a/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="e857b8bb76d4617adc95c76a5fb540c2" -dest_md5="27ac0f89acdd7606843ba589e23aa7f4" - diff --git a/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.stex b/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.stex deleted file mode 100644 index 85780e1..0000000 Binary files a/client/.import/datapad.png-6a26dffec2475e7873a3a29fae2f3763.stex and /dev/null differ diff --git a/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.md5 b/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.md5 deleted file mode 100644 index c8afd4e..0000000 --- a/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="385e8652393bf9a3fa82a062489c5435" -dest_md5="2ca28503838f7dd03b796000ec31111f" - diff --git a/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.stex b/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.stex deleted file mode 100644 index 5d3bf13..0000000 Binary files a/client/.import/dirt.png-cb7ce13bd54b38543256446eda597d73.stex and /dev/null differ diff --git a/client/.import/doop.wav-c367f72b66b202e52047bea064819597.md5 b/client/.import/doop.wav-c367f72b66b202e52047bea064819597.md5 deleted file mode 100644 index d897ab0..0000000 --- a/client/.import/doop.wav-c367f72b66b202e52047bea064819597.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="34e50c915b51252660db4c26d6f61d92" -dest_md5="284c8f30177baaab7a71e88c2fa18e87" - diff --git a/client/.import/doop.wav-c367f72b66b202e52047bea064819597.sample b/client/.import/doop.wav-c367f72b66b202e52047bea064819597.sample deleted file mode 100644 index aeb997f..0000000 Binary files a/client/.import/doop.wav-c367f72b66b202e52047bea064819597.sample and /dev/null differ diff --git a/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.md5 b/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.md5 deleted file mode 100644 index ec2dfa7..0000000 --- a/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9f8274a56b9edd5fe16c5dcae157c341" -dest_md5="723b7c3af22143822b4ea69f4a5e464d" - diff --git a/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.stex b/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.stex deleted file mode 100644 index 1a09aa2..0000000 Binary files a/client/.import/door.png-cf55f3b6a107a1c024667a2368a8b453.stex and /dev/null differ diff --git a/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.md5 b/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.md5 deleted file mode 100644 index c8ba1ab..0000000 --- a/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="a2e5738b2c3c72b7747d4619c999f663" -dest_md5="52ebec391e52938a37545ccc6f79cf74" - diff --git a/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.stex b/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.stex deleted file mode 100644 index 9937c81..0000000 Binary files a/client/.import/flashlight.png-81e1109aa70a78c4d536d80989b33490.stex and /dev/null differ diff --git a/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.md5 b/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.md5 deleted file mode 100644 index f268f66..0000000 --- a/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="66ca8a87ea50ca711ae82b664f60a2a4" -dest_md5="369b1a9c914d86a94dc9b0795e76649f" - diff --git a/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.stex b/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.stex deleted file mode 100644 index 0c0d5a8..0000000 Binary files a/client/.import/flashlight_map.png-e74e9dbf8383fd46eb62995089871c75.stex and /dev/null differ diff --git a/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.md5 b/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.md5 deleted file mode 100644 index 61f64f5..0000000 --- a/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="130412d800df4b7c2fc9747a6a5805ef" -dest_md5="94ec308054667a107722b55e2203ebfc" - diff --git a/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.stex b/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.stex deleted file mode 100644 index af40223..0000000 Binary files a/client/.import/glass.png-c925ddf2663ae6921355b7554750d020.stex and /dev/null differ diff --git a/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.md5 b/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.md5 deleted file mode 100644 index 61f64f5..0000000 --- a/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="130412d800df4b7c2fc9747a6a5805ef" -dest_md5="94ec308054667a107722b55e2203ebfc" - diff --git a/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.stex b/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.stex deleted file mode 100644 index af40223..0000000 Binary files a/client/.import/glass_tile.png-0229d06e3b0a2fff76307b7cf9e98218.stex and /dev/null differ diff --git a/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.md5 b/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.md5 deleted file mode 100644 index 4536724..0000000 --- a/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="b5b713d18d62a88eb579db8fdc12c626" -dest_md5="3fa5aa738a28dc6cdeb9786d5398a721" - diff --git a/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.stex b/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.stex deleted file mode 100644 index 792bd0a..0000000 Binary files a/client/.import/godot.png-b843fe18fc9415e456367a78b405ed14.stex and /dev/null differ diff --git a/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.md5 b/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.md5 deleted file mode 100644 index 3aaeadf..0000000 --- a/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="7dca0d73f2612d088326ffc420d70d33" -dest_md5="4441e90ddb4675a44bc124eeb8d327f5" - diff --git a/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.stex b/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.stex deleted file mode 100644 index 5391ff5..0000000 Binary files a/client/.import/head_bg_less.png-df5865e6f9d0c71527b4a8af3b037d2a.stex and /dev/null differ diff --git a/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.md5 b/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.md5 deleted file mode 100644 index 11eb03b..0000000 --- a/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="1c8d163e355ca2143cf1ee7539743095" -dest_md5="f4d70988d33daba683613005dd05abe5" - diff --git a/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.stex b/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.stex deleted file mode 100644 index 74ee610..0000000 Binary files a/client/.import/keycard.png-b8ba97c5a9c751b1fe21a3a26a4deeae.stex and /dev/null differ diff --git a/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.etc2.stex b/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.etc2.stex index e13c777..0e8c51a 100644 Binary files a/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.etc2.stex and b/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.etc2.stex differ diff --git a/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.md5 b/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.md5 index 411dec4..7d5d723 100644 --- a/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.md5 +++ b/client/.import/life-tank.png-143866384dac6f26e708efc881d1aeed.md5 @@ -1,3 +1,3 @@ source_md5="597fbe9ccf6ea4d6483499e0cf0b03d0" -dest_md5="44096b06df43545f31758f2c690ba4dd" +dest_md5="4855047dc51267405dc34ccef9c9fb32" diff --git a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.etc2.stex b/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.etc2.stex deleted file mode 100644 index e13c777..0000000 Binary files a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.etc2.stex and /dev/null differ diff --git a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.md5 b/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.md5 deleted file mode 100644 index 411dec4..0000000 --- a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="597fbe9ccf6ea4d6483499e0cf0b03d0" -dest_md5="44096b06df43545f31758f2c690ba4dd" - diff --git a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.s3tc.stex b/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.s3tc.stex deleted file mode 100644 index 4757349..0000000 Binary files a/client/.import/life-tank.png-b506d493a9f159a34cef7ee36ec33acb.s3tc.stex and /dev/null differ diff --git a/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.md5 b/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.md5 deleted file mode 100644 index 118ed23..0000000 --- a/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="3be96f8f0b1f368b29579f8fe6c79e53" -dest_md5="fb332b986c94f47353bb21064d61380b" - diff --git a/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.stex b/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.stex deleted file mode 100644 index 7af87cb..0000000 Binary files a/client/.import/logo.png-81d61a5549637b75a255cb10d5315a1e.stex and /dev/null differ diff --git a/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.md5 b/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.md5 deleted file mode 100644 index 0e47707..0000000 --- a/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="3cf9c5ebe05a91b72f0aebb0ee407a93" -dest_md5="8bd975df2444464ff6174d81fef37888" - diff --git a/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.stex b/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.stex deleted file mode 100644 index bff086d..0000000 Binary files a/client/.import/metal_tile.png-1612a0b30c59509bffab1e452a38f145.stex and /dev/null differ diff --git a/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.md5 b/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.md5 deleted file mode 100644 index 687121d..0000000 --- a/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="46a58c40f5b6b62c3a59601b0fb55288" -dest_md5="6c83115f14a9c0acf967eb87bf07fe4b" - diff --git a/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.stex b/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.stex deleted file mode 100644 index a82c72e..0000000 Binary files a/client/.import/metal_wall.png-e58fadbcb11bafb9d9c6795afcfcdc93.stex and /dev/null differ diff --git a/client/.import/pixel.png-0849b68eac611d31014eca1c4d3ddfa1.md5 b/client/.import/pixel.png-0849b68eac611d31014eca1c4d3ddfa1.md5 deleted file mode 100644 index eb66b4f..0000000 --- a/client/.import/pixel.png-0849b68eac611d31014eca1c4d3ddfa1.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="adff44dac2834f17108b17f4084591a1" -dest_md5="e2e7037a5692f3fe173da14e5c60805a" - diff --git a/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.md5 b/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.md5 deleted file mode 100644 index 7bce99e..0000000 --- a/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9161b62a08022547a51cb144c79b83c2" -dest_md5="f5e5412b84c441a6c7bf7f80491ac049" - diff --git a/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.stex b/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.stex deleted file mode 100644 index e3e6384..0000000 Binary files a/client/.import/platform.png-1cf46998d237e6b2bc62ff0b4405a848.stex and /dev/null differ diff --git a/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.md5 b/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.md5 deleted file mode 100644 index 1e4bfb0..0000000 --- a/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="53be14e4ad2f67df62927ebe16450b07" -dest_md5="6d3a87776838f14ee876321be0a815b3" - diff --git a/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.stex b/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.stex deleted file mode 100644 index 013123b..0000000 Binary files a/client/.import/player.png-93dd582c64da0b3a2a0c572bf5865ee7.stex and /dev/null differ diff --git a/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.md5 b/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.md5 deleted file mode 100644 index 954b06b..0000000 --- a/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="d11fe17c538278732c370ff9a9299c13" -dest_md5="518d32294d74c6b89d656e11ba60fff3" - diff --git a/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.stex b/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.stex deleted file mode 100644 index 94eedef..0000000 Binary files a/client/.import/player.png-e0d0f0b6e99c07fcdf9744a06f3d5a4c.stex and /dev/null differ diff --git a/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.md5 b/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.md5 deleted file mode 100644 index bad3a22..0000000 --- a/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="4a4e86688ea9e233c2a97d2091f91210" -dest_md5="0b5f4549065c5a8e08ef3984540c93ea" - diff --git a/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.stex b/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.stex deleted file mode 100644 index f2acb06..0000000 Binary files a/client/.import/player_parts.png-3389155b7b6cb8f6aeab8343caf169df.stex and /dev/null differ diff --git a/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.md5 b/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.md5 deleted file mode 100644 index f48418c..0000000 --- a/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="41d8c79b5c539a2acf771607432eee6f" -dest_md5="317679fa87bca09ebef857482e26c6fb" - diff --git a/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.stex b/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.stex deleted file mode 100644 index b70b8a7..0000000 Binary files a/client/.import/scientist.png-8683d0a7be8b59d07aa7554d6c13eb5b.stex and /dev/null differ diff --git a/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.md5 b/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.md5 deleted file mode 100644 index 43e51b4..0000000 --- a/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="303f11d3124d1c4e7f84eab94f2eec4e" -dest_md5="c435ad0f5644e639bccd3d8ca358885b" - diff --git a/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.stex b/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.stex deleted file mode 100644 index cb39766..0000000 Binary files a/client/.import/screenshot.png-7e6fd068016c281094b4ad8b2b340dc2.stex and /dev/null differ diff --git a/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.md5 b/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.md5 deleted file mode 100644 index 32f968b..0000000 --- a/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="46923f78324d6e9a8e0e4a863d2d42b1" -dest_md5="c9e1f79e69e3f2f812c0be531478bb8e" - diff --git a/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.stex b/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.stex deleted file mode 100644 index 9dd2534..0000000 Binary files a/client/.import/screenshot_2d.png-87d91dabaa368245cb9657c3ea8c1190.stex and /dev/null differ diff --git a/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.md5 b/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.md5 deleted file mode 100644 index 376d15d..0000000 --- a/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="62170d933feb1791d33e1fc234209ff0" -dest_md5="841cfe9c8cca9b353975fdeca4a6818d" - diff --git a/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.stex b/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.stex deleted file mode 100644 index e73c050..0000000 Binary files a/client/.import/screenshot_2d_2x.png-bafe835a0eb947c980af261c0e66bf14.stex and /dev/null differ diff --git a/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.md5 b/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.md5 deleted file mode 100644 index 65fd607..0000000 --- a/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="ae3bdb1e531d0d500f6d21de544b2067" -dest_md5="8182b7555a30f5839165eafcca9acd9e" - diff --git a/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.stex b/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.stex deleted file mode 100644 index 473b3a4..0000000 Binary files a/client/.import/screenshot_3d.png-aa88ee3aedd8e6d3c81005b8be71a791.stex and /dev/null differ diff --git a/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.md5 b/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.md5 deleted file mode 100644 index 491c9a0..0000000 --- a/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="dd34a61f0c64a8b28fbc90958cefa569" -dest_md5="5d38a4263fce6ada9174911d6983e089" - diff --git a/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.stex b/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.stex deleted file mode 100644 index 7c59703..0000000 Binary files a/client/.import/soldier.png-13e55e8279a526ab81b4568f027f2af0.stex and /dev/null differ diff --git a/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.md5 b/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.md5 deleted file mode 100644 index 042120d..0000000 --- a/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="1fc89dcdb28dde7f2c550bc7fb764a9a" -dest_md5="43cd0d2da5e6d2246e38223d967eaef9" - diff --git a/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.stex b/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.stex deleted file mode 100644 index 2c69d96..0000000 Binary files a/client/.import/table.png-de30183f83c3d3e8d25ef3f8f1bf54ce.stex and /dev/null differ diff --git a/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.md5 b/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.md5 deleted file mode 100644 index 937d848..0000000 --- a/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="c1837fe565271833906e8389e7ce7c1c" -dest_md5="3d42ff45cbeda89803fb79710d4f5f99" - diff --git a/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.stex b/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.stex deleted file mode 100644 index e1e5979..0000000 Binary files a/client/.import/techno_wall_tile.png-54e58566dc904a4ca1988bcd0580e7ad.stex and /dev/null differ diff --git a/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.md5 b/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.md5 deleted file mode 100644 index c8afd4e..0000000 --- a/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="385e8652393bf9a3fa82a062489c5435" -dest_md5="2ca28503838f7dd03b796000ec31111f" - diff --git a/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.stex b/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.stex deleted file mode 100644 index 5d3bf13..0000000 Binary files a/client/.import/tileset_dirt.png-c8c84915fdae8d2bb0b555c9eb04c9d6.stex and /dev/null differ diff --git a/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.md5 b/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.md5 deleted file mode 100644 index c8afd4e..0000000 --- a/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="385e8652393bf9a3fa82a062489c5435" -dest_md5="2ca28503838f7dd03b796000ec31111f" - diff --git a/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.stex b/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.stex deleted file mode 100644 index 5d3bf13..0000000 Binary files a/client/.import/tileset_dirt_tiles.png-a27b6b47234abbacf3418c74a77e9a86.stex and /dev/null differ diff --git a/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.md5 b/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.md5 deleted file mode 100644 index 7694bd9..0000000 --- a/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="b85c7252c4e8b281547c84fdfeaec78d" -dest_md5="ec0b5aba05be1d14ab11983117a481f1" - diff --git a/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.stex b/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.stex deleted file mode 100644 index 2c1b7f9..0000000 Binary files a/client/.import/tileset_whole_tiles.png-2f5c213227a261019465c9a0f347d7d7.stex and /dev/null differ diff --git a/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.md5 b/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.md5 deleted file mode 100644 index 66b37a1..0000000 --- a/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="6c5effbee182861293c67eb96f5fb23e" -dest_md5="9a076a710fba7054180bf80ce4546229" - diff --git a/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.stex b/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.stex deleted file mode 100644 index ee11da8..0000000 Binary files a/client/.import/transport_ship.png-d6a312752f7523f9887d9115c6933904.stex and /dev/null differ diff --git a/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.md5 b/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.md5 deleted file mode 100644 index 8efc7c9..0000000 --- a/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="e2da7fb14b8d464f2eaa56db492be5df" -dest_md5="9b1d426abdf28a2ad8eba161f0c4bb57" - diff --git a/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.stex b/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.stex deleted file mode 100644 index 1e9f254..0000000 Binary files a/client/.import/wall_light.png-4724f0182a5fe122adeadb0206308c64.stex and /dev/null differ diff --git a/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.md5 b/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.md5 deleted file mode 100644 index 164b681..0000000 --- a/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="c4e868a40fcea38649d43a73971cf969" -dest_md5="d21853d8744e43202ee3050f2c706feb" - diff --git a/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.stex b/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.stex deleted file mode 100644 index 84eacb1..0000000 Binary files a/client/.import/window.png-7b24405c1e2b84d74e3a6d26fd596188.stex and /dev/null differ diff --git a/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.md5 b/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.md5 deleted file mode 100644 index 5be1c02..0000000 --- a/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="a44cdfde3fe6df51cb14453b6f8b1544" -dest_md5="a9ee1a40eb796495a96862aa22a8c4c9" - diff --git a/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.stex b/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.stex deleted file mode 100644 index 0708d7b..0000000 Binary files a/client/.import/worker.png-f5a62ab5102b13286f5a02f89249ffb2.stex and /dev/null differ diff --git a/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.md5 b/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.md5 index ce929e9..ba1a621 100644 --- a/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.md5 +++ b/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.md5 @@ -1,3 +1,3 @@ source_md5="88515d8ae34cca55294e20310b7476c4" -dest_md5="0f70ef32cfa3623874dce680b21fdd79" +dest_md5="a03cb2a5b382f6cb692178ac73231566" diff --git a/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.stex b/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.stex index f8a74f8..9cb53b6 100644 Binary files a/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.stex and b/client/.import/x07DLrX.jpg-800f7c21b25c7cf1a88b1ba7bf53d2e0.stex differ diff --git a/client/Nodes/Player.tscn b/client/Nodes/Player.tscn index 0061bb2..ebe69ad 100644 --- a/client/Nodes/Player.tscn +++ b/client/Nodes/Player.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://Assets/Materials/SmoothScaling.tres" type="Material" id=1] [ext_resource path="res://Assets/Art/Characters/player_parts.png" type="Texture" id=2] [ext_resource path="res://Assets/Art/basic_light.png" type="Texture" id=3] -[ext_resource path="res://Scripts/Entities/Player.gd" type="Script" id=4] +[ext_resource path="res://bin/Player.gdns" type="Script" id=4] [ext_resource path="res://Assets/Art/flashlight_map.png" type="Texture" id=5] [ext_resource path="res://Assets/Art/Objects/flashlight.png" type="Texture" id=6] [ext_resource path="res://Scripts/Entities/Flashlight.gd" type="Script" id=7] diff --git a/client/Scenes/Intro.scn b/client/Scenes/Intro.scn index dca9eb7..9f7beed 100644 Binary files a/client/Scenes/Intro.scn and b/client/Scenes/Intro.scn differ diff --git a/client/Scenes/Title.scn b/client/Scenes/Title.scn index c94224a..881f7da 100644 Binary files a/client/Scenes/Title.scn and b/client/Scenes/Title.scn differ diff --git a/client/Scenes/World.scn b/client/Scenes/World.scn index 9e6fc69..eb6650d 100644 Binary files a/client/Scenes/World.scn and b/client/Scenes/World.scn differ diff --git a/client/bin/Player.gdns b/client/bin/Player.gdns new file mode 100644 index 0000000..4aa1d22 --- /dev/null +++ b/client/bin/Player.gdns @@ -0,0 +1,8 @@ +[gd_resource type="NativeScript" load_steps=2 format=2] + +[ext_resource path="res://bin/connection.gdnlib" type="GDNativeLibrary" id=1] + +[resource] +resource_name = "player" +class_name = "Player" +library = ExtResource( 1 ) diff --git a/client/bin/connection.gdnlib b/client/bin/connection.gdnlib new file mode 100644 index 0000000..4876106 --- /dev/null +++ b/client/bin/connection.gdnlib @@ -0,0 +1,18 @@ +[general] + +singleton=false +load_once=true +symbol_prefix="godot_" +reloadable=false + +[entry] + +X11.64="res://bin/x11/libconnection.so" +Windows.64="res://bin/win64/libconnection.dll" +OSX.64="res://bin/osx/libconnection.dylib" + +[dependencies] + +X11.64=[ ] +Windows.64=[ ] +OSX.64=[ ] diff --git a/client/builds/The Connection.pck b/client/builds/The Connection.pck new file mode 100644 index 0000000..0a6c9c1 Binary files /dev/null and b/client/builds/The Connection.pck differ diff --git a/client/builds/The Connection.x86_64 b/client/builds/The Connection.x86_64 new file mode 100755 index 0000000..ab1f517 Binary files /dev/null and b/client/builds/The Connection.x86_64 differ diff --git a/client/export_presets.cfg b/client/export_presets.cfg index 18cf5c7..b30412f 100644 --- a/client/export_presets.cfg +++ b/client/export_presets.cfg @@ -8,21 +8,20 @@ export_filter="all_resources" include_filter="*" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.0.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -50,21 +49,20 @@ export_filter="all_resources" include_filter="*" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.1.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=false +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=false -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" codesign/enable=false codesign/identity="" codesign/password="" @@ -91,22 +89,21 @@ custom_features="" export_filter="all_resources" include_filter="*" exclude_filter="" -export_path="../../../Downloads/build/The Connection.x86_64" -patch_list=PoolStringArray( ) +export_path="builds/The Connection.x86_64" script_export_mode=1 script_encryption_key="" [preset.2.options] +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -binary_format/embed_pck=false -custom_template/release="" -custom_template/debug="" [preset.3] @@ -118,18 +115,19 @@ export_filter="all_resources" include_filter="*" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" [preset.3.options] +custom_template/debug="" +custom_template/release="" +variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false html/custom_html_shell="" html/head_include="" -custom_template/release="" -custom_template/debug="" +html/full_window_size=true [preset.4] @@ -141,7 +139,6 @@ export_filter="all_resources" include_filter="*" exclude_filter="" export_path="" -patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" diff --git a/client/project.godot b/client/project.godot index 4bbd728..4e5cf62 100644 --- a/client/project.godot +++ b/client/project.godot @@ -8,11 +8,6 @@ config_version=4 -_global_script_classes=[ ] -_global_script_class_icons={ - -} - [application] config/name="The Connection" @@ -38,32 +33,41 @@ enabled=PoolStringArray( "EXP-System-Dialog" ) [input] +ui_accept={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) + ] +} ui_left={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } ui_right={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } ui_up={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } ui_down={ "deadzone": 0.5, "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } toggle_flashlight={ @@ -76,6 +80,22 @@ interact={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":88,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) + ] +} +move_left={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) + ] +} +move_right={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) + ] +} +jump={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) ] } diff --git a/godot-cpp b/godot-cpp new file mode 160000 index 0000000..77d41fa --- /dev/null +++ b/godot-cpp @@ -0,0 +1 @@ +Subproject commit 77d41fa179e40560f1e264ed483638bf51713779 diff --git a/src/enums.h b/src/enums.h new file mode 100644 index 0000000..956d258 --- /dev/null +++ b/src/enums.h @@ -0,0 +1,5 @@ + +enum Clearance_Level +{ + NO_ACCESS = 0 +}; diff --git a/src/gdlibrary.cpp b/src/gdlibrary.cpp new file mode 100644 index 0000000..b1e77e0 --- /dev/null +++ b/src/gdlibrary.cpp @@ -0,0 +1,16 @@ +#include +#include "player.h" + +extern "C" void GDN_EXPORT godot_gdnative_init(godot_gdnative_init_options *o) { + godot::Godot::gdnative_init(o); +} + +extern "C" void GDN_EXPORT godot_gdnative_terminate(godot_gdnative_terminate_options *o) { + godot::Godot::gdnative_terminate(o); +} + +extern "C" void GDN_EXPORT godot_nativescript_init(void *handle) { + godot::Godot::nativescript_init(handle); + + godot::register_class(); +} \ No newline at end of file diff --git a/src/player.cpp b/src/player.cpp new file mode 100644 index 0000000..9ee28e3 --- /dev/null +++ b/src/player.cpp @@ -0,0 +1,92 @@ +#include "player.h" + +using namespace godot; + +void Player::_register_methods() { + register_method("_process", &Player::_process); +} + +Player::Player() { + + //========== + // MOVEMENT + //========== + maxMoveVelocity = 100.0; + moveAcceleration = 50.0; + jumpAccelration = -80.0; + + baseGravity = 150.0; + moveFriction = 40.0; + + velocity = Vector2(0,0); +} +Player::~Player() {} + +void Player::_init() { + //input = Input::get_singleton(); + Godot::print("Loaded player object!"); +} + +void Player::_process(float delta) { + + // Process movement + if(!is_movement_locked()) { + apply_gravity(velocity, delta); + apply_friction(velocity); + apply_movement_input(velocity, get_movement_input(), delta); + move_and_slide(velocity, Vector2(0,-1)); + } +} + +bool Player::is_movement_locked() { + return false; +} + +Vector2 Player::get_movement_input() { + Vector2 inputVector = Vector2(0,0); + + + // Update X input for left and right + if(Input::get_singleton()->is_action_pressed("move_left")) { + inputVector.x = -1; + } + if(Input::get_singleton()->is_action_pressed("move_right")) { + inputVector.x = 1; + } + + // Update Y input for jumping + if(Input::get_singleton()->is_action_pressed("jump")) { + inputVector.y = 1; + } + + return inputVector; +} + +void Player::apply_movement_input(Vector2 &velocity, Vector2 inputVector, float delta) { + velocity.x += inputVector.x * moveAcceleration; // Mutiply speed by input value + + if(inputVector.y > 0 && is_on_floor() and velocity.y >= 0) { + // Massively increase `y` velocity to send player up into the air + velocity.y = inputVector.y * jumpAccelration; + } +} + +void Player::apply_friction(Vector2 &velocity) { + // Move x velocity towards zero by `moveFriction` value + if(velocity.x > 0) { + velocity.x = Math::clamp(velocity.x - moveFriction, 0, maxMoveVelocity); + } else if (velocity.x < 0) { + velocity.x = Math::clamp(velocity.x + moveFriction, -maxMoveVelocity, 0); + } +} + +void Player::apply_gravity(Vector2 &velocity, float delta) { + + if(is_on_floor()) { + // Keep Y velocity static while on the ground + velocity.y = 0; + } else { + // Apply gravity while in the air + velocity.y += baseGravity * delta; + } +} \ No newline at end of file diff --git a/src/player.h b/src/player.h new file mode 100644 index 0000000..f72aa40 --- /dev/null +++ b/src/player.h @@ -0,0 +1,82 @@ +#ifndef PLAYER_H +#define PLAYER_H + +#include +#include +#include +#include "enums.h" + +namespace godot { + +class Player : public KinematicBody2D { + GODOT_CLASS(Player, KinematicBody2D); + +//private: +// float example_var; + +public: + // Method to register functions with Godot + static void _register_methods(); + + // Public variables + //Clearance_Level clearance_level; + + // Contructor & Deconstructor + Player(); + ~Player(); + + void _init(); // Initializer called by Godot + void _process(float delta); // Godot Process function + //void _physics_process(float delta); + +private: + // Referenced Singletons + //static Input* input; + + float baseGravity; + + // Player movment variables + float maxMoveVelocity; + float moveAcceleration; + float jumpAccelration; + float moveFriction; + //float jumped; + + Vector2 velocity; + //Vector2 motion; + //Vector2 floor_speed; + + //Node gui; // Node representing GUI object + + //Array interactables; // Objects in range to interact with + //Array items; // Items in player inventory + //Node equiped; // Currently equiped item + + + bool is_movement_locked(); + //void check_for_nodes(); + + // Death management + //void handle_death(); + //void death_fade_complete(); + + // Inventory + //void add_item(Node item); + //void equip_item(Node item); + + // Interaction System + //void add_interactable(Node interactable); + //void remove_interactable(Node interactable); + //void interact(); + + //void animation_manager(float motion); + Vector2 get_movement_input(); + void apply_movement_input(Vector2 &velocity, Vector2 inputVector, float delta); + //void user_input(); + void apply_gravity(Vector2 &velocity, float delta); + void apply_friction(Vector2 &velocity); +}; + +} + +#endif \ No newline at end of file