search

warxander / los-santos-v

FiveM PvPvE Freeroam game mode
https://forum.cfx.re/t/free-standalone-los-santos-v-pvpve-freeroam/58237
55 stars 20 forks source link

Added localsettings #14

Closed FlyveHest closed 4 years ago

FlyveHest commented 4 years ago

Added a localsettings.lua file to make it easier to keep local settings changes when updating from GIT repo, and also did the same for server.cfg

Updated warmoji submodule, as I got errors when checking out the project.

warxander commented 4 years ago

Hi,

Thank you very much for PR!

However, I have some questions, and the most important one is why we need localsettings when we have git rebase, which is in my opinion more convenient in terms of keeping sources up-to-date?

FlyveHest commented 4 years ago

The localsettings is actually more so you, as a server admin, have an easier overlook of what settings you have changed, and if the devs (you :) decide to add settings, you don't risk getting a merge conflict in the base settings.

Same idea with server.cfg, even though that will probably not be updated.

git rebase is not really meant to be used for you to keep a local copy of a file from a repo out of sync.

warxander commented 4 years ago

You need to keep your local settings in actual state, so if something will be removed or renamed - you will know it through merge conflicts. How are you supposed to do this with localsettings file?

FlyveHest commented 4 years ago

If its removed, it doesn't really matter, all that would happen is that you have a settings variable that is never used.

The same goes for renaming, worst case is that your changes are not reflected on your server, but any change to the settings should be mentioned in a changelog regardless, at least, thats what I would expect, and then you would rename them in your local settings also.

Merge conflicts are never nice to resolve, and even more so for people that aren't developers, but are just using the repository as an easy means to get the latest version.

Also, if you download the repo as a ZIP file, you can just extract without thinking about overwriting your settings changes, if all changes are done in settings.lua, and you unpack a never version, the risk of overwriting your changes are high. (I have done that more than once ;)

warxander commented 4 years ago

Please make warmoji submodule update as a separate commit (+ use 1.1 tag).

FlyveHest commented 4 years ago

I'll remove the warmoji change from my PR, maybe you could update it in master? I got a strange tree reference error when trying to check out with submodules.

warxander commented 4 years ago

Ok

FlyveHest commented 4 years ago

Submodule update is reverted

warxander commented 4 years ago

Improved and became a part of new update.