search

project-imprimis / imprimis

Imprimis, the team based destroyable world shooter game
https://project-imprimis.github.io/www/
15 stars 5 forks source link

configurable master server address #54

Closed Duskhorn closed 2 years ago

Duskhorn commented 2 years ago

This pull request modifies the server::defaultmaster() function to take a string parameter to change the hardcoded value. Moreover it adds a cubescript function setmastername to change the mastername variable

Duskhorn commented 2 years ago

Now it should be ready to be merged. I kept the optional value in the function for now

TheEgghead27 commented 2 years ago

hmm, should this PR be squashed to just the variable changes, so as to not add clutter to an already cluttered codebase?

Duskhorn commented 2 years ago

so you are suggesting to remove the function changes too?

TheEgghead27 commented 2 years ago

i'd go a step further and reset the branch git reset --hard master, then make a new commit with just the necessary changes (attempting to cherry-pick would cause merge conflicts)

after that, git push -f to force the remote to accept the alternate history

Duskhorn commented 2 years ago

Ok fair, do I close the pull request and make a new one?

TheEgghead27 commented 2 years ago

if you force push to the same github branch, you can keep this PR, but if you wanted to, you can start fully anew

Duskhorn commented 2 years ago

this should be cleaner and just easier. But I hate cubescript