We are back to developing on just a single branch again. I merged large rivers with release candidate 2.8. Due to being careful, assuming something could go wrong, I made a new branch called river_merge as this would allow me to discard the merge and start over if something went wrong without messing up the git history. That's still an option, but it looks like it went fine.
The plan from now on
- Make sure river_merge is working as expected
- Apply the fixes, which were not done earlier due to fear of merge conflicts
- Fix whatever issue we encounter. This can be skipped if it's time consuming and not critical
- Release river_merge as the next release
- Delete branches we no longer need and update others to allow us to return to branch naming convention
New feature development
Work on new features will resume once this is done. However stricktly speaking it's not impossible to make new features in a new branch, which we then merge after releasing. We will consider that on a case by case basis.
Text updates
Text updates (text xml) is an ongoing process and can continue. That doesn't count as "new features".
Savegames
Savegames from last release should work fine and so should savegames from the Release Candidate 2.8 branch. Savegames from Large Rivers won't work. Obviously savegames from before large rivers was added won't have large rivers in them.
Features unlikely to be included in the next release
- Large rivers in random maps
- Fix for the ongoing OOS issue
There is work going on for those and including them will be nice. However without knowing if they will be ready in a week or 3 months, releasing now and then releasing again once they are done seems to be the proper plan.
New long term plans
What to do now that large rivers are done? That's always up for debate, but a candidate is
technological progress. This concept has a technical plan (programming and xml), but lacks a gameplay plan. It would be nice if we could debate this and figure out how we want to progress through techs from a gameplay perspective before we reach the point where programmers will need a new task.
I'm not sure if that will be the next big thing, but I know it won't if we still can't figure out or agree on how it should unlock from a gameplay perspective.