Skip to content

Upstream merge#1

Open
selb wants to merge 96 commits intohetuw:masterfrom
selb:master
Open

Upstream merge#1
selb wants to merge 96 commits intohetuw:masterfrom
selb:master

Conversation

@selb
Copy link

@selb selb commented Jun 10, 2023

This PR brings this repo up to date with Jason's latest changes. Most importantly, this includes RGBAImage updates required for OneLife v374.

jasonrohrer and others added 30 commits June 17, 2021 01:47
…es simultaneously. Sound sprites can now be safely used for bits of music.
…to pass if a substring of the value matches the regex (and leading/trailing characters that don't match the regex were being stripped off). This was allowing @test@test.com to match the test@test.com account, even though the rest of the OHOL game server code was treating @test@test.com as a distinct account.
…ain after we've constructed screen, since sometimes the available resolution is different (and wider) than what we requested. This seems to be the root cause of mouse pointer position scaling issues on ultrawide monitors. Also added a bunch of additional logging around screen resolution and construction, and found one spot where redoDrawMatrix() was not being called after changing a parameter that affects the matrix. Note that drawn/emulated pointer is still enabled by default on ultrawide monitors. But this may not be necessary anymore. Related to jasonrohrer#7.  Related to jasonrohrer/OneLife#782
…r by default, since pointer position issues were fixed in a89e42c.
… might come before SSND chunk. Before, we were incorrectly reading data in these chunks as audio.
…and, as a work-around for a bug in certain versions of convert that flips images upside-down when converting to TGA. Fixes jasonrohrer/OneLife#848
…ent, since that means we're compiling from source. Part of jasonrohrer/OneLife#899
Add isControlKeyDown and isAltKeyDown to allow distinguishing between holding CTRL and ALT
jasonrohrer and others added 30 commits January 12, 2024 17:39
…group. Switched that behavior so we can test builk emailer with smaller groups.
…ent (content) _all.dbz bundles, but still getting the platform-dependent bundles. For clients that need to use the diff bundle server for binary updates only, and have separate content channels.
…a in various sprite/texture filling calls. Expanding edges of sprite, which is done by default, modifies pixel data.
…tly. To be safe, let user manually relaunch on Windows.
…ate thread for maximum throughput while still updating GUI with progress.
… in string_to_hash, allowing us to pass github usernames for hash checks.
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.

3 participants