Nav Buoy Replacement in Core
Moderators: winston, another_commander
- Cmd. Cheyd
- ---- E L I T E ----
- Posts: 934
- Joined: Tue Dec 16, 2008 2:52 pm
- Location: Deep Horizon Industries Manufacturing & Research Site somewhere in G8...
Nav Buoy Replacement in Core
Okay, so what do I need to do to allow this to happen? Change the license universally? Provide a specific license to Oolite core dev?
Let's make this a thing.
Let's make this a thing.
Find my OXP's at:
Deep Horizon Industries - Your Planet Our Design
Deep Horizon Industries - Your Planet Our Design
- Cody
- Sharp Shooter Spam Assassin
- Posts: 16081
- Joined: Sat Jul 04, 2009 9:31 pm
- Location: The Lizard's Claw
- Contact:
Re: Nav Buoy Replacement in Core
<grins mischievously> Halve its tumble rate?
I would advise stilts for the quagmires, and camels for the snowy hills
And any survivors, their debts I will certainly pay. There's always a way!
And any survivors, their debts I will certainly pay. There's always a way!
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
I definitely want to see this happen! Let's do it!
From my reply in another thread:
From my reply in another thread:
But as I mentioned in that thread, I no expert on licencing, so if someone else wants to chime in and correct my understanding, please do it.I think the only thing, licence-wise, is for the buoy to be released under a standard Commons Creative Attribution-Non Commercial-Share Alike License version 3.0, which is what the rest of the models and textures are released under. At the moment (at least from the version I have), the licence in use is Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 United States license (Modified).
- Cmd. Cheyd
- ---- E L I T E ----
- Posts: 934
- Joined: Tue Dec 16, 2008 2:52 pm
- Location: Deep Horizon Industries Manufacturing & Research Site somewhere in G8...
Re: Nav Buoy Replacement in Core
How do I do that? Is just changing the license statement/declaration in the script good enough?
Find my OXP's at:
Deep Horizon Industries - Your Planet Our Design
Deep Horizon Industries - Your Planet Our Design
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
This is the part where I make a suggestion, while looking at the back-stage area for someone more knowledgeable to come forward and offer a more definitive reply.
It would certainly be good enough from my perspective.Cmd. Cheyd wrote: ↑Thu Dec 05, 2019 12:54 amIs just changing the license statement/declaration in the script good enough?
-
- Quite Grand Sub-Admiral
- Posts: 6681
- Joined: Wed Feb 28, 2007 7:54 am
Re: Nav Buoy Replacement in Core
I am by no means knowledgeable enough on the subject of licensing, but if the OXP scripts are to be uploaded with changes in the copyright string to make them CC BY-NC-SA 3.0, maybe it would be best if Cmd. Cheyd uploaded the entire OXP with the license change also in its readme file. That would leave no margin for doubts, I believe.
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
With thanks to Cmd. Cheyd for releasing his buoy model under the same licence as the rest of the Oolite textures, I have just created a PR in the main code branch which adds this into core.
Notes on differences between implementation and original:
1. I resized all textures to 1024x1024 to match other ship textures.
2. I did not include the normal map, because none of the other ships have normal maps.
3. I did not include the ship script or AI from the DH Nav Buoy pack. This was to maintain OXP compatibility.
With item 2, I originally included the normal map, and then changed my mind. I think this is the best solution because (a) it reduces the size of the update, and (b) it gives the DH Nav Buoy OXP a reason to exist. The core game has a standard, lower-res, less-bumpy model, but if you install the expansion you get a higher-res, bumpy model.
Once again, thanks to Cmd Cheyd for his fantastic model and his willingness to contribute it to the core game.
Notes on differences between implementation and original:
1. I resized all textures to 1024x1024 to match other ship textures.
2. I did not include the normal map, because none of the other ships have normal maps.
3. I did not include the ship script or AI from the DH Nav Buoy pack. This was to maintain OXP compatibility.
With item 2, I originally included the normal map, and then changed my mind. I think this is the best solution because (a) it reduces the size of the update, and (b) it gives the DH Nav Buoy OXP a reason to exist. The core game has a standard, lower-res, less-bumpy model, but if you install the expansion you get a higher-res, bumpy model.
Once again, thanks to Cmd Cheyd for his fantastic model and his willingness to contribute it to the core game.
- Cody
- Sharp Shooter Spam Assassin
- Posts: 16081
- Joined: Sat Jul 04, 2009 9:31 pm
- Location: The Lizard's Claw
- Contact:
Re: Nav Buoy Replacement in Core
Sweet! Now throw Svengali's hyperspace and docking-tunnel effects into Core, and call it Oolite 2.0?
I would advise stilts for the quagmires, and camels for the snowy hills
And any survivors, their debts I will certainly pay. There's always a way!
And any survivors, their debts I will certainly pay. There's always a way!
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
Before I attempt to merge this PR, it would be great to hear from a couple of users who might be in a position to test it out, you know, kick the tires, that sort of thing. Theoretically there should be no gameplay or visual issues, as I've made the addition a simple drop-in replacement of the original buoy, but this is the first time I've had to mess with submodules, so there's still a chance I've messed something somewhere.
Re: Nav Buoy Replacement in Core
Isn't the Trunk version to test these kind of 'improvements' ?
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
Trunk has the final check ins. A Pull Request happens before the final check in, allowing changes to be checked and validated first. This PR is probably ok to check in, given no logic or code is changing, but still.
Alternatively, I could check it in, allow the nightly to create a new distribution, and then back it out if problems are found.
Alternatively, I could check it in, allow the nightly to create a new distribution, and then back it out if problems are found.
-
- Quite Grand Sub-Admiral
- Posts: 6681
- Joined: Wed Feb 28, 2007 7:54 am
Re: Nav Buoy Replacement in Core
Just got word that Terrastorage is going down - most likely permanently - in the next few days. If you want a nightly build containing the new nav buoy, best get that PR in now.
- phkb
- Impressively Grand Sub-Admiral
- Posts: 4830
- Joined: Tue Jan 21, 2014 10:37 pm
- Location: Writing more OXPs, because the world needs more OXPs.
Re: Nav Buoy Replacement in Core
OK, PR merged. New nightly will be out shortly.
Ah, that's going to be a problem. Is there an easy "just-repoint-the-script-to-new-site" solution?another_commander wrote: ↑Sat Dec 28, 2019 10:56 pmJust got word that Terrastorage is going down - most likely permanently - in the next few days
- Cody
- Sharp Shooter Spam Assassin
- Posts: 16081
- Joined: Sat Jul 04, 2009 9:31 pm
- Location: The Lizard's Claw
- Contact:
Re: Nav Buoy Replacement in Core
The final nightly? Hey ho!
I would advise stilts for the quagmires, and camels for the snowy hills
And any survivors, their debts I will certainly pay. There's always a way!
And any survivors, their debts I will certainly pay. There's always a way!