hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into impl-v2

Browse source
This commit is contained in:
Lucien Greathouse 2018-04-07 20:33:32 -07:00
commit b0fd900ae8
8 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -1,7 +1,11 @@
# Rojo Change Log # Rojo Change Log
## Current Master ## 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`.
* 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) ## 0.4.1 (April 1, 2018)
* Merged plugin repository into main Rojo repository for easier tracking. * Merged plugin repository into main Rojo repository for easier tracking.

2
README.md
View file

@ -8,7 +8,7 @@
<a href="https://travis-ci.org/LPGhatguy/rojo"> <a href="https://travis-ci.org/LPGhatguy/rojo">
<img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" /> <img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" />
</a> </a>
<img src="https://img.shields.io/badge/latest_version-0.4.1-brightgreen.svg" alt="Current server version" /> <img src="https://img.shields.io/badge/latest_version-0.4.2-brightgreen.svg" alt="Current server version" />
</div> </div>
<hr /> <hr />

2
plugin/src/Config.lua
View file

@ -1,6 +1,6 @@
return { return {
pollingRate = 0.2, pollingRate = 0.2,
version = {0, 4, 1}, version = {0, 4, 2},
expectedServerVersionString = "0.4.x", expectedServerVersionString = "0.4.x",
protocolVersion = 1, protocolVersion = 1,
dev = false, dev = false,

3
plugin/src/HttpError.lua
View file

@ -52,6 +52,9 @@ end
function HttpError:report() function HttpError:report()
warn(self.message) warn(self.message)
if self.type == HttpError.Error.HttpNotEnabled then
game:GetService("Selection"):Set{game:GetService("HttpService")}
end
end end
return HttpError return HttpError

2
plugin/src/Main.server.lua
View file

@ -67,13 +67,11 @@ local function main()
.Click:Connect(function() .Click:Connect(function()
checkUpgrade() checkUpgrade()
spawn(function()
pluginInstance:togglePolling() pluginInstance:togglePolling()
:catch(function(err) :catch(function(err)
warn(err) warn(err)
end) end)
end) end)
end)
end end
main() main()

4
plugin/src/Reconciler.lua
View file

@ -161,6 +161,10 @@ function Reconciler:reconcile(rbx, item)
-- Use a dumb algorithm for reconciling children -- Use a dumb algorithm for reconciling children
self:_reconcileChildren(rbx, item) self:_reconcileChildren(rbx, item)
if item.Route then
self._routeMap:insert(item.Route, rbx)
end
return rbx return rbx
end end

2
server/Cargo.lock generated
View file

@ -597,7 +597,7 @@ dependencies = [
[[package]] [[package]]
name = "rojo" name = "rojo"
version = "0.4.1" version = "0.4.2"
dependencies = [ dependencies = [
"clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
server/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "rojo" name = "rojo"
version = "0.4.1" version = "0.4.2"
authors = ["Lucien Greathouse <me@lpghatguy.com>"] authors = ["Lucien Greathouse <me@lpghatguy.com>"]
description = "A tool to create robust Roblox projects" description = "A tool to create robust Roblox projects"
license = "MIT" license = "MIT"