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 pull request CleverRaven#40358 from jbytheway/generalize_reduce… #167

Merged
merged 35 commits into from
May 9, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Kilvoctu and others added 30 commits May 5, 2020 21:48
Compact aim window pt2 for numbers display, adapt existing code from old branch
remove leftover comment and center colors legend for english
This should expand coverage and make sure that all shallow and deep
water types are appropriately used.
Remove AFS pointless plut_cell & battery overrides
Replace hardcoded water terrain checks with flags
Previously it worked only with one test executable, but when building
with CMake you might have a different one.  Use whichever is the most
recently modified.
This test is rather slow, and doesn't test anything that isn't fairly
well-tested by other tests.  Delete it to save time.
Add estoc to fencing weapons
Fix overmap UI blinking on curses build
* Don't store the result of `options_manager::get_lang_options`

Instead of storing it in a public variable, just make the code that uses it (**two** places only) call the function directly.

This also gets rid of the initialization order bug (where the language path was set after the options had been loaded).

* Remove unnecessary class reference in type names.
Routine i18n updates on 9 May 2020
Give Foodperson approriate snacks™ to carry
* Add desc_lines_setup for repeatable setup of uilist

* Remove unused MENU_WIDTH_ENTRIES

* Add setup callbacks of uilist dimensional parameters for repeatable setup

* Use setup callbacks in color.cpp

* Use setup callbacks in editmap.cpp

* Use setup callbacks in game.cpp

* Use setup callbacks in magic.cpp

* Use setup callbacks in string_input_popup.cpp

* Use setup callbacks in wish.cpp

* Fix skill editor menu closing when selecting skill to modify
ZhilkinSerg and others added 5 commits May 9, 2020 12:37
Reset loaded monster adjustments.
* Add missing category to target UI keybindings

* Move them to single spot

* Change 'F' from FIRE to SWITCH_MODE
To be consistent with how it works outside target selection UI
@fengjixuchui fengjixuchui merged commit f3f3b68 into fengjixuchui:master May 9, 2020
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.