JO/JA coop

[tinny]

Hey guys, so Raz0r mentioned that a new coop branch of OpenJK is here:

https://github.com/Razish/OpenJK/tree/coop

 

Does this branch get updated by the main OpenJK branch?  Also i think i remember Eezstreet saying that fixes to get sp working in mp as GT_SINGLE_PLAYER were considered legit fixes, why have a separate branch when it can be committed in the main OpenJK branch?

[Xycaleth]

The coop branch doesn't get updated by the master branch. Whoever decides to work on it needs to merge the changes from master into coop every so often. It's considered good practice to add new features or even just bug fixes into separate branches, and then merge these changes into master when it's done. There's two reasons for this: 1) it prevents half finished work being in the master branch - it ideally should always be a complete working copy of the code, though this isn't always the case. 2) It makes removing these changes very easy and you can simply diff with the branch, and then undo the changes made by that branch.

 

EDIT: We have a new shiny OpenJK subforum, so any OpenJK talk can go there *hint hint, staff please move this? *

[tinny]

That makes perfect sense, thanks Xycaleth!

[Raz0r]

As the coop branch is several months (and several hundred commits) behind master without much work done to it, we should probably scrap it and make a new branch for coop.

[CaptainChar]

Ironicly I had looked into Co-op in the "Vampire Blood Chonicles" mod, we didn't get very far, but it would be nice to have a co-op mode that works, our idea worked more or less server side, the server determined if player 1 reaches goal, basicly load next map, it would force all players to next map, instead of multi mapping, it was a crude setup only suitable for linier style games

[eezstreet]

As the coop branch is several months (and several hundred commits) behind master without much work done to it, we should probably scrap it and make a new branch for coop.

Why scrap it? Why not just pull from master and merge?

[ensiform]

Because it'll be painful merge.

[eezstreet]

Because it'll be painful merge.

No, it really won't. As I recap only very few updates got pushed to coop. It should be just a simple pull from master.