diff --git a/.editorconfig b/.editorconfig index 7f5ae2b9..42ec20f4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,7 +14,7 @@ indent_size = 2 indent_style = space indent_size = 4 -[*.rs] +[*.{rs,toml}] indent_style = space indent_size = 4 insert_final_newline = true diff --git a/.gitmodules b/.gitmodules index c399195f..1e86ae9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "plugin/modules/testez"] path = plugin/modules/testez url = https://github.com/Roblox/testez.git -[submodule "plugin/modules/lemur"] - path = plugin/modules/lemur - url = https://github.com/LPGhatguy/lemur.git [submodule "plugin/modules/promise"] path = plugin/modules/promise url = https://github.com/LPGhatguy/roblox-lua-promise.git diff --git a/Cargo.toml b/Cargo.toml index a5b14890..66ba1d29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,11 @@ license = "MIT" repository = "https://github.com/rojo-rbx/rojo" edition = "2018" +exclude = [ + "/plugin/**", + "/test-projects/**", +] + [workspace] members = [ "rojo-test", @@ -50,4 +55,4 @@ lazy_static = "1.2" paste = "0.1" pretty_assertions = "0.6.1" tempfile = "3.0" -walkdir = "2.1" \ No newline at end of file +walkdir = "2.1" diff --git a/assets/kenney-ui-gray-sheet.png b/assets/kenney-ui-gray-sheet.png deleted file mode 100644 index 1ebbd975..00000000 Binary files a/assets/kenney-ui-gray-sheet.png and /dev/null differ diff --git a/assets/kenney-ui-gray-sheet.xml b/assets/kenney-ui-gray-sheet.xml deleted file mode 100644 index d7f87ddf..00000000 --- a/assets/kenney-ui-gray-sheet.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bin/run-plugin-tests.sh b/bin/run-plugin-tests.sh new file mode 100644 index 00000000..28d630a9 --- /dev/null +++ b/bin/run-plugin-tests.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -ev + +rojo build plugin/place.project.json -o PluginPlace.rbxlx +run-in-roblox -s plugin/testBootstrap.server.lua PluginPlace.rbxlx \ No newline at end of file diff --git a/plugin/modules/lemur b/plugin/modules/lemur deleted file mode 160000 index 96d4166a..00000000 --- a/plugin/modules/lemur +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 96d4166a2d9e146e6955eeacccc0c79a86a177f5 diff --git a/plugin/place.project.json b/plugin/place.project.json index 50bbeb18..2010494e 100644 --- a/plugin/place.project.json +++ b/plugin/place.project.json @@ -20,6 +20,9 @@ }, "t": { "$path": "modules/t/lib" + }, + "RbxDom": { + "$path": "modules/rbx-dom/rbx_dom_lua/src" } }, "TestEZ": { diff --git a/plugin/src/Assets.lua b/plugin/src/Assets.lua index cdeefe59..5c04bd8c 100644 --- a/plugin/src/Assets.lua +++ b/plugin/src/Assets.lua @@ -1,11 +1,5 @@ local Assets = { - Sprites = { - WhiteCross = { - asset = "rbxassetid://2738712459", - offset = Vector2.new(190, 318), - size = Vector2.new(18, 18), - }, - }, + Sprites = {}, Slices = { RoundBox = { asset = "rbxassetid://2773204550",