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

convert common events to CBA playerEvents #3972

Merged
merged 7 commits into from
Jun 25, 2016
Merged

convert common events to CBA playerEvents #3972

merged 7 commits into from
Jun 25, 2016

Conversation

commy2
Copy link
Contributor

@commy2 commy2 commented Jun 21, 2016 •
edited
Loading

TODO:

  • remove PFH in common
  • call ACE events as wrapper, deprecate?

@nicolasbadano
Copy link
Contributor

nicolasbadano commented Jun 21, 2016 •
edited
Loading

call ACE events as wrapper, deprecate?

Yes, exactly.

Nice @commy2!

@PabstMirror PabstMirror mentioned this pull request Jun 22, 2016
Merged
@commy2 commy2 mentioned this pull request Jun 22, 2016
Merged
@commy2 commy2 added kind/enhancement Release Notes: **IMPROVED:** and removed status/needs-testing status/WIP labels Jun 22, 2016
@commy2 commy2 added this to the 3.6.0 milestone Jun 22, 2016
@commy2 commy2 self-assigned this Jun 22, 2016
@commy2
Copy link
Contributor Author

commy2 commented Jun 24, 2016

merging this, because the release one is already merged too.

@commy2
Copy link
Contributor Author

commy2 commented Jun 24, 2016

That's true. The release branch one doesn't have them either.

We have other branches for 3.6.0 targeting master (e.g. !3980), so I guess we merge

@commy2 commy2 closed this Jun 24, 2016
@commy2 commy2 reopened this Jun 24, 2016
@commy2
Copy link
Contributor Author

commy2 commented Jun 24, 2016

oops
... merge them together before making the next RC.

@commy2
Copy link
Contributor Author

commy2 commented Jun 24, 2016

How would I do that best?

@thojkooi
Copy link
Contributor

I will sort it out @commy2

@thojkooi thojkooi merged commit 4368c6a into master Jun 25, 2016
@nicolasbadano nicolasbadano deleted the cba-add-player-eh branch June 25, 2016 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@commy2 commy2

Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.6.0
Development

Successfully merging this pull request may close these issues.
4 participants
@commy2 @nicolasbadano @thojkooi @PabstMirror