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.

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

Add Addition and Subtraction Operators #1099

Merged
merged 5 commits into from
May 22, 2024

Conversation

redwizard42
Copy link
Contributor

Adds addition and subtraction as operators for conditions that can modify as support for accumulator features, but available to Add Source, Sub Source, and Add Address.

Copy link
Member

@Jamiras Jamiras left a comment

Choose a reason for hiding this comment

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

Please update the submodule to point at develop now that the dependent code has been merged.

@redwizard42
Copy link
Contributor Author

Please update the submodule to point at develop now that the dependent code has been merged.
@Jamiras I believe this is done now. The hash when I did the init from remote matches the last commit on develop.

@Jamiras
Copy link
Member

Jamiras commented May 22, 2024

There's a conflict on the rcheevos hash that should be resolved by merging master and keeping the newer develop tag.

@Jamiras Jamiras merged commit 9b1d508 into RetroAchievements:master May 22, 2024
6 checks passed
@redwizard42 redwizard42 deleted the plusminus branch June 6, 2024 15:24
@Jamiras Jamiras added this to the 1.3.1 milestone Jun 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants