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

Merge upstream #1113

Merged
merged 34 commits into from
Nov 23, 2023
Merged

Merge upstream #1113

merged 34 commits into from
Nov 23, 2023

Conversation

mikeday0
Copy link
Collaborator

No description provided.

mikeday0 and others added 30 commits October 25, 2023 22:28
* win midi: Fall back to default midi device

* Simplify, avoid const string

* Use strncasecmp

* Formatting
When *not* using analog controls, let a move, turn or look sensitivity
value of 0 disable that input. Restore Strife look sensitivity in setup.
* Add a build for macOS.

* Integrate MSYS2 build.

* Upload artifacts.
Co-authored-by: Michael Francis <4574480+mfrancis95@users.noreply.github.com>
Fixes chocolate-doom#1634

The additional check in `M_CheckParmWithArgs()` is necessary,
since `myargv[i] = NULL` may have already happened when `I_Error()`
is called which in turn calls `M_ParmExists(-nogui)`.
EMIDI events were skipped due to a copying mistake introduced by: chocolate-doom@833d0c2
This overhauls the states and uses critical sections to protect shared data between threads. This is intended to prevent race conditions, memory use after free, and so on. To implement this properly, some additional changes were required:
- Refactored states
- Instant pause/resume (no longer delayed until next callback)
- Midi thread is created once and destroyed on shut down (no longer created/destroyed between songs)
…obals

Remove unused global char arrays `wadfile` and `mapdir`
These are only ever set, but never read, so they can just be removed.
…veljuststarted_global

Remove unused `leveljuststarted` globals
This variable is only ever set, but never read, so it can just be removed.
This variable is only ever set, but never read, so it can just be removed.
…t` type

These are only ever set, but never read, so they can just be removed.
The type `st_stateenum_t` is then also unused and can be removed as well.
…um_t` type

These are only ever set, but never read, so they can just be removed.
The type `st_chatstateenum_t` is then also unused and can be removed as well.
Copy link
Owner

@fabiangreffrath fabiangreffrath left a comment

Choose a reason for hiding this comment

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

Thank you! 😽

@fabiangreffrath fabiangreffrath merged commit bd6043d into master Nov 23, 2023
6 checks passed
@fabiangreffrath fabiangreffrath deleted the mergestaging branch November 23, 2023 15:58
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.

6 participants