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

Update imgui to 1.72b #288

Merged
merged 2 commits into from
Aug 14, 2020
Merged

Update imgui to 1.72b #288

merged 2 commits into from
Aug 14, 2020

Conversation

sweetkristas
Copy link
Contributor

No description provided.

@galegosimpatico
Copy link
Contributor

Is there a checklist of remaining things for this, or something?

@DDR0
Copy link
Contributor

DDR0 commented Jul 31, 2020

What changes were made to anura.vcxproj? I made some a few days ago to skip a few libraries we weren't using, like Box2D.

@galegosimpatico
Copy link
Contributor

What changes were made to anura.vcxproj? I made some a few days ago to skip a few libraries we weren't using, like Box2D.

There are only 44 changes: 29 additions and 15 deletions.

@DDR0
Copy link
Contributor

DDR0 commented Aug 14, 2020

Diffview wasn't being very helpful, so I just merged the longer one with the if statement in it.

@DDR0 DDR0 merged commit 5ca5be5 into trunk Aug 14, 2020
DDR0 added a commit that referenced this pull request Aug 14, 2020
…update"

This reverts commit 5ca5be5, reversing
changes made to f0a10fc.
@DDR0
Copy link
Contributor

DDR0 commented Aug 14, 2020

Hm, I evidently did that workflow wrong. I've reverted my merge into master, because it threw a lot of errors at me on Linux. I should have checked out the branch and tested it there. Something for next time, I guess.

Here are the errors blocking me on Ubuntu: https://gist.github.com/DDR0/7f347a9c596f6bb6ad6f29390f35fb78

@DDR0 DDR0 added this to the 1.4 milestone Aug 14, 2020
@galegosimpatico
Copy link
Contributor

simplify your life by checking stuff before mergning instead of after. When possible, have others do those checks for you. Consider also using bots too

@DDR0
Copy link
Contributor

DDR0 commented Aug 15, 2020 via email

@DDR0 DDR0 deleted the feature/imgui_172b_update branch April 18, 2022 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants