Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configurations for experimental branches #181

Merged
merged 3 commits into from
Aug 28, 2020
Merged

Configurations for experimental branches #181

merged 3 commits into from
Aug 28, 2020

Conversation

zorgesho
Copy link
Member

Changes made in this pull request

  • four folders with dependencies for each branch now (no common dependencies).
  • solution/projects configurations are updated to SN.STABLE, SN.EXP, BZ.STABLE, BZ.EXP.
  • new conditional symbols are added - SUBNAUTICA_STABLE, SUBNAUTICA_EXP, BELOWZERO_STABLE, BELOWZERO_EXP.
    SUBNAUTICA and BELOWZERO are remained and mean both branches for corresponding game.

@MrPurple6411
Copy link
Member

  1. why have periods in the folder name? please no??
  2. harmony is the same for all branches because it comes from qmm not the game meaning it has no reason to be duplicated.

Alexejhero
Alexejhero reviewed Aug 25, 2020
View reviewed changes
Copy link
Contributor

@Alexejhero Alexejhero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree to MrPurple about the folder and configuration names. They should contain _ instead of ..

@zorgesho
Copy link
Member Author

zorgesho commented Aug 25, 2020 •
edited
Loading

why have periods in the folder name?

what's wrong with periods?

harmony is the same for all branches, it has no reason to be duplicated.

yeah, that just for consistency. And with addition of new DLLs there will be no need to think, is it gonna change on some branch or not (e.g. like it was with Json).

@zorgesho zorgesho merged commit 2d0ed70 into Dev Aug 28, 2020
@zorgesho zorgesho deleted the exp-branches-support branch August 28, 2020 16:08
@Alexejhero Alexejhero mentioned this pull request Aug 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Alexejhero Alexejhero Alexejhero left review comments

@PrimeSonic PrimeSonic PrimeSonic approved these changes

@MrPurple6411 MrPurple6411 Awaiting requested review from MrPurple6411

@toebeann toebeann Awaiting requested review from toebeann

Assignees

@zorgesho zorgesho

Labels
Type: Maintenance
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zorgesho @MrPurple6411 @Alexejhero @PrimeSonic