tinny Posted June 10, 2013 Share Posted June 10, 2013 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? Link to comment
Xycaleth Posted June 10, 2013 Share Posted June 10, 2013 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? * Link to comment
tinny Posted June 10, 2013 Author Share Posted June 10, 2013 That makes perfect sense, thanks Xycaleth! Link to comment
Raz0r Posted September 11, 2013 Share Posted September 11, 2013 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. Link to comment
CaptainChar Posted September 11, 2013 Share Posted September 11, 2013 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 Link to comment
eezstreet Posted September 11, 2013 Share Posted September 11, 2013 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? Link to comment
ensiform Posted September 12, 2013 Share Posted September 12, 2013 Because it'll be painful merge. Link to comment
eezstreet Posted September 14, 2013 Share Posted September 14, 2013 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. Link to comment
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now