From bad0e672669fcca226bd8e0ba9f511c14e3270ce Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 4 Apr 2018 23:02:46 -0700 Subject: [PATCH 1/6] Remove extra spawn in server code --- plugin/src/Main.server.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugin/src/Main.server.lua b/plugin/src/Main.server.lua index 062dc414..ca771f5b 100644 --- a/plugin/src/Main.server.lua +++ b/plugin/src/Main.server.lua @@ -67,12 +67,10 @@ local function main() .Click:Connect(function() checkUpgrade() - spawn(function() - pluginInstance:togglePolling() - :catch(function(err) - warn(err) - end) - end) + pluginInstance:togglePolling() + :catch(function(err) + warn(err) + end) end) end From b448e8007eedba785379729547bce858cb6c9c28 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 4 Apr 2018 23:05:01 -0700 Subject: [PATCH 2/6] Fix duplication 0.4.x duplication bug for good --- CHANGES.md | 3 ++- plugin/src/Reconciler.lua | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 71b6728f..ab681518 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,8 @@ # Rojo Change Log ## Current Master -*No changes* +* Fixed instances that were reconciled not being inserted into the RouteMap. + * The reconciler is still not a perfect solution, especially if script instances get moved around without being destroyed. I don't think this can be fixed before a big refactor. ## 0.4.1 (April 1, 2018) * Merged plugin repository into main Rojo repository for easier tracking. diff --git a/plugin/src/Reconciler.lua b/plugin/src/Reconciler.lua index 22d7968d..33f1119f 100644 --- a/plugin/src/Reconciler.lua +++ b/plugin/src/Reconciler.lua @@ -161,6 +161,10 @@ function Reconciler:reconcile(rbx, item) -- Use a dumb algorithm for reconciling children self:_reconcileChildren(rbx, item) + if item.Route then + self._routeMap:insert(item.Route, rbx) + end + return rbx end From 4d0fdf0dfd58e5b06d234bbd7741788f85d94d16 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 4 Apr 2018 23:06:57 -0700 Subject: [PATCH 3/6] 0.4.2 --- CHANGES.md | 5 ++++- README.md | 2 +- plugin/src/Config.lua | 2 +- server/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ab681518..1557d9a7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,10 @@ # Rojo Change Log ## Current Master -* Fixed instances that were reconciled not being inserted into the RouteMap. +*No changes* + +## 0.4.2 (April 4, 2018) +* Fixed final case of duplicated instance insertion, caused by reconciled instances not being inserted into `RouteMap`. * The reconciler is still not a perfect solution, especially if script instances get moved around without being destroyed. I don't think this can be fixed before a big refactor. ## 0.4.1 (April 1, 2018) diff --git a/README.md b/README.md index db3bc360..e22e1cbc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Travis-CI Build Status - Current server version + Current server version
diff --git a/plugin/src/Config.lua b/plugin/src/Config.lua index b4bfa3be..d7c9466d 100644 --- a/plugin/src/Config.lua +++ b/plugin/src/Config.lua @@ -1,6 +1,6 @@ return { pollingRate = 0.2, - version = {0, 4, 1}, + version = {0, 4, 2}, expectedServerVersionString = "0.4.x", protocolVersion = 1, dev = false, diff --git a/server/Cargo.toml b/server/Cargo.toml index d6000225..4fa2ba90 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rojo" -version = "0.4.1" +version = "0.4.2" authors = ["Lucien Greathouse "] description = "A tool to create robust Roblox projects" license = "MIT" From 7a7ac9550d211495885fbb132e2459d0dbd25ed8 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 4 Apr 2018 23:09:02 -0700 Subject: [PATCH 4/6] Update server dependencies --- server/Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 686447ec..f84aa23f 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -597,7 +597,7 @@ dependencies = [ [[package]] name = "rojo" -version = "0.4.1" +version = "0.4.2" dependencies = [ "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", From 31e5c558ab02d62b51b791e2679cb4f0dbabbd00 Mon Sep 17 00:00:00 2001 From: Validark Date: Sat, 7 Apr 2018 21:10:55 -0600 Subject: [PATCH 5/6] Open Http Properties upon HttpEnabled prompt (#58) --- plugin/src/HttpError.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/src/HttpError.lua b/plugin/src/HttpError.lua index 9da4b946..674721cf 100644 --- a/plugin/src/HttpError.lua +++ b/plugin/src/HttpError.lua @@ -52,6 +52,9 @@ end function HttpError:report() warn(self.message) + if self.type == HttpError.Error.HttpNotEnabled then + game:GetService("Selection"):Set{game:GetService("HttpService")} + end end return HttpError From c2f7e268ff7330a940d0c1283def5da6a784d2e3 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Sat, 7 Apr 2018 20:13:07 -0700 Subject: [PATCH 6/6] Update changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1557d9a7..a4b8ed62 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ # Rojo Change Log ## Current Master -*No changes* +* Plugin now automatically selects `HttpService` if it determines that HTTP isn't enabled ([#58](https://github.com/LPGhatguy/rojo/pull/58)) ## 0.4.2 (April 4, 2018) * Fixed final case of duplicated instance insertion, caused by reconciled instances not being inserted into `RouteMap`.