[pull] master from gp-alex:master #7
+164,480
−128,525
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Can use --tracing-rng with OpenEnroth play
Don't assert on invalid skills command
Move reagentPower into a separate field
Dropped regularBonusMap
* Started a simplification of Viewport. The uViewportTL/BR and uScreenTL/BR values are always identical, so I removed the screen ones. Also got rid of a constructor that set the viewport to 640x480, which is wrong, and the value was also never used before starting to play. Also got rid of the Reset function, which set the current values to themselves. * Got rid of mm7_data::game_viewport_width, height, x, y, z, and w. They were copies of the values in Viewport, so I just use Viewport's values instead. Also renamed the "screen" values in Viewport to "viewport", as that's what they are. * Got rid of the copies of the viewport values in ViewingParams. This required slightly changing some things in Engine - both MM7Initialization and FinalInitialization set the viewport to the viewingparams values, and depended on those being set in MM6_Initialize. I changed that to just do the same thing as OpenGLRenderer, but tbh both MM7Initialization and FinalInitialization probably shouldn't be doing this at all. Deleting both of the SetViewport calls there doesn't break anything in the game, but it might be required by tests? * Adjusted naming to follow the rules from HACKING. In particular removed the u-prefix from the values in Viewport - I'm pretty sure that's to signify "unsigned" anyway, and those values are very much signed ints! * Deleted unused fields in Viewport; - field_20: Never read from, set to 0xFFFFFF00 in MM7Initialization if not outdoors - field_4C: Never written to. Read a bunch of times, but all of those checked if (!field_4C) - field_3C, 58, 5C, 60, 64, 68 were all never read from or written to. * Style --------- Co-authored-by: captainurist <[email protected]>
Dropped debug items from party creation code
Show cursor when playing back traces
Fix buggy standard enchantments that were sometimes generated in vanilla
Add test for #1959
Resolved a TODO in AccessibleVector
Dump character inventory in traces
add missing else for ccache message
use keycode not scancode for keyboards
Added more -Werror, some fixes in hashCombine
Using KeyToggleType as defined in keyMappingParams
…aste on weak party (#2203) * Fix Haste depleted all spell points when Weak * Fix style guide errors * Call spellFailed when Haste fail * Add test for #2201 * Style --------- Co-authored-by: Kai Bornemann <[email protected]> Co-authored-by: captainurist <[email protected]>
Fix android universal build
Default to boarderless fullscreen
* save resize to config * Update GameWindowHandler.cpp
Update OpenALSoundProvider.cpp
* Update android.yml * Update linux-flatpak.yml * Update linux.yml * Update macos.yml * Update windows.yml * Update style.yml
* Renamings & codestyle in KeyToggleType enum * Renamings & style for enum InputAction * Dropped some input actions that we don't really need * Reworked input action mapping * Clean up includes * Fix build
* properly use RelWithDebInfo * add back release
* Merge workflows * Use magic * Clean up ccache harder * Docs * Zip folder for release even when not releasing * Cmake args unified
* Clean up map clamp function * Add map view min max getter * No OnButtonClick for books * Add test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )