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

perf(port): Optimization tweaks #4634

Closed
wants to merge 11 commits into from
Closed

Conversation

Kenan2000
Copy link
Collaborator

@Kenan2000 Kenan2000 commented May 11, 2024

Ports this pull request

CleverRaven/Cataclysm-DDA#40961,

This also includes pull requests #4627, #4623 by @chaosvolt for easier mergeability

activity_handlers.cpp file, line 1257 throws an error during compiling which, based on conversation with @Coolthulhu, will be fixed with help of Coolthulhu or other developers or both

Coauthors have been linked properly via GitHub Desktop built-in function to do this work hopefully

Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com>
@Kenan2000 Kenan2000 added port request Request to port functionality or content from DDA src PR changes related to source code. tests PR changes related to tests labels May 11, 2024
Copy link
Contributor

autofix-ci bot commented May 11, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@Kenan2000 Kenan2000 removed the port request Request to port functionality or content from DDA label May 12, 2024
@scarf005 scarf005 changed the title feat(port): Optimization tweaks perf(port): Optimization tweaks May 12, 2024
Kenan2000 and others added 3 commits May 15, 2024 22:51
Co-Authored-By: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Co-Authored-By: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-Authored-By: VissValdyr <167661460+VissValdyr@users.noreply.github.com>
Co-Authored-By: Olanti <olanti-p@yandex.ru>
Co-Authored-By: Coolthulhu <Coolthulhu@gmail.com>
@github-actions github-actions bot added data PRs related to datas. Won't crash game (probably) mods PR changes related to mods. labels May 15, 2024
@github-actions github-actions bot removed the mods PR changes related to mods. label May 15, 2024
@github-actions github-actions bot removed the data PRs related to datas. Won't crash game (probably) label May 15, 2024
@chaosvolt
Copy link
Member

Okay so evidently #4636 contained the file changes for this PR and the other one so these can be closed? According to Kenan at least.
image

I'm going to hope this is the right decision, if anyone spots anything vital in this re-open and fix merge conflicts then, bleh.

@chaosvolt chaosvolt closed this May 30, 2024
@chaosvolt
Copy link
Member

Okay so it turns out merging that other PR was a mistake for reasons entirely unrelated to splitting them weirdly and instead just because the source PRs in #4635 specifically need more time in the oven before we want to port them, so I think this one specifically is 100% good to reopen after the revert, then we need to go on to figure out if anything in #4635 can be separated from the bad keybind code changes and salvaged, then lastly grab anything unique to #4635 as its own PR.

@chaosvolt chaosvolt reopened this May 30, 2024
chaosvolt
chaosvolt previously approved these changes May 30, 2024
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Compiled and load-tested, seems good at first glance. More importantly, no keybind errors so I can confirm that nothing critical from #4635 snuck into this one.

That said I'd like to leave this for Coolthulhu, Scarf, or Kheir to look at and make sure they give it their approval before any merges.

@Kenan2000
Copy link
Collaborator Author

Closing this because pull request of @KheirFerrum includes fixed version of this work

@Kenan2000 Kenan2000 closed this Jun 1, 2024
@Kenan2000 Kenan2000 deleted the optimizations_port_update1 branch June 1, 2024 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src PR changes related to source code. tests PR changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants