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.

Sign up for GitHub

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

Jump to bottom

Port DDA title screen update with BN-specific tweaks #2519

Merged
merged 46 commits into from
Apr 7, 2023
Merged

Port DDA title screen update with BN-specific tweaks #2519

merged 46 commits into from
Apr 7, 2023

Commits on Apr 4, 2023

  1. Move get_holiday_from_time to cata_utility 

    (cherry picked from commit 348d239ec08e1301b2f63477ec1351ed49b6e33b)
    @dseguin @olanti-p
    dseguin authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    2949915 View commit details
    Browse the repository at this point in the history

  2. Fix symbol collision

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    3f7b680 View commit details
    Browse the repository at this point in the history

  3. Fix character name covering world name 

    (cherry picked from commit 60b363d30853f94cde54e7f42a64791333b035ff)
    @werty1124 @olanti-p
    werty1124 authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    52dd25c View commit details
    Browse the repository at this point in the history

  4. Only use empty worlds when selecting "Play Now" 

    (cherry picked from commit fdbe06d53a48e7a3191f7ffb23e5b49b6de7f146)
    @dseguin @olanti-p
    dseguin authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0c4c95a View commit details
    Browse the repository at this point in the history

  5. Clarify 'delete world?' message 

    (cherry picked from commit aa08e09b1bd052a450d3f3986beae94f6a6259f1)
    @Qrox @olanti-p
    Qrox authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    cf13fd8 View commit details
    Browse the repository at this point in the history

  6. Reduce merge conflicts

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0f8c454 View commit details
    Browse the repository at this point in the history

  7. Migrate g->add_msg_if_player -> add_msg 

    (cherry picked from commit a2510c6d12be5e4efebec3219239ae36ae797a83)
    @kevingranade @olanti-p
    kevingranade authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    7255afb View commit details
    Browse the repository at this point in the history

  8. Allow traversing main menu horizontally with TAB and SHIFT + TAB 

    (cherry picked from commit 6847331)
    @TheStoneWolf @olanti-p
    TheStoneWolf authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    5004c5d View commit details
    Browse the repository at this point in the history

  9. Rename and make special_game_type a class enum 

    (cherry picked from commit 09ab0494dfed16fa77292b2cf5c60b46737c6b2e)
    @ZhilkinSerg @olanti-p
    ZhilkinSerg authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    e6b022c View commit details
    Browse the repository at this point in the history

  10. (Partial) Global reference migration part 30 

    (cherry picked from commit f95326e8ad4dddc653f3e459d270f0947a61936a)
    @kevingranade @olanti-p
    kevingranade authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    9746ffb View commit details
    Browse the repository at this point in the history

  11. Add g->scen accessors

    @kevingranade @olanti-p
    kevingranade authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    0c7216e View commit details
    Browse the repository at this point in the history

  12. (Partial) Fix spelling issues 

    (cherry picked from commit c380afc798df064ab76645a0a2f66358d425e3bc)
    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    c85261f View commit details
    Browse the repository at this point in the history

  13. Enable clang-tidy check bugprone-unused-return-value 

    * Fix bugprone-unused-return-value

Biggest change here was to mapbuffer, which now stores submaps via
unique_ptr rather than raw pointers, simplifying the destructor.

Unfortunately, we have to retain the strange pointer-based API for
mapbuffer, because the submap ownership logic in map is so convoluted.
That can be fixed another day.

Also, renamed mapbuffer::reset() to clear(), for consistency.

In trait_group, removed a couple of calls to reset() that this warning
was highlighting.  They didn't do anything anyway.

* Enable clang-tidy bugprone-unused-return-value

(cherry picked from commit 1c4f47adc95c9a7e87aec501113a310ffab18cc5)
    @jbytheway @olanti-p
    jbytheway authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    2a93ae0 View commit details
    Browse the repository at this point in the history

  14. (Partial) Fix some cases of readability-isolate-declaration 

    (cherry picked from commit a8f17b497e3fe255daadcd04e331a2d1dbfc21b6)
    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    4216bb5 View commit details
    Browse the repository at this point in the history

  15. (Partial) Fox some cases of modernize-use-emplace 

    (cherry picked from commit 8cc6378fc55bca9f7af06c623c70786de43df1ee)
    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    de1c3a4 View commit details
    Browse the repository at this point in the history

  16. (Partial) Fix some cases of cata-combine-locals-into-point 

    (cherry picked from commit e067da4d920ab00662adc5319b8c2b4e37cb8d4a)
    @jbytheway @olanti-p
    jbytheway authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    909c3ad View commit details
    Browse the repository at this point in the history

  17. (Partial) Fix some cases of bugprone-branch-clone 

    Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
(cherry picked from commit 159413daa279694aeaf7885edde67f496d61d473)
    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    7ecf978 View commit details
    Browse the repository at this point in the history

  18. Refactor: isolate points_left 

    (cherry picked from commit e0ad76e03960df71797752d1120e23f476fef727)
    @hexagonrecursion @olanti-p
    hexagonrecursion authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    4eaef90 View commit details
    Browse the repository at this point in the history

  19. Decouple save file name from Character::name 

    (cherry picked from commit f0c2c3b123ae44f3b2a6d5d29fc18350be0c4dfd)
    @eltank @olanti-p
    eltank authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    285852e View commit details
    Browse the repository at this point in the history

  20. (Reduce conflicts) (Partial) Remove ime.h/cpp 

    (cherry picked from commit 722b94b7207c114cc6a34cd140e0619d01f180fd)
    @Qrox @olanti-p
    Qrox authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    7da8713 View commit details
    Browse the repository at this point in the history

  21. Fix compilation

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    ccdf92c View commit details
    Browse the repository at this point in the history

  22. Main menu overhaul (Part 1): Mouse controls + Vertical submenus 

    (cherry picked from commit 369fc6fcf207ba30609eadd02ca4830950596c14)
    @kevingranade @olanti-p
    kevingranade authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    bfbd8fa View commit details
    Browse the repository at this point in the history

  23. Fix MOTD/Credits scrolling bug 

    Co-authored-by: David Seguin <davidseguin@live.ca>
(cherry picked from commit 293c808cb2c8d0891ca26e9580e17eabcab62e51)
    @Ezrashaw @olanti-p
    Ezrashaw authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    496ee4d View commit details
    Browse the repository at this point in the history

  24. Fix crash when pressing load button in main menu if there is no world 

    (cherry picked from commit 5ac426dfe46f768910bf5354566393147e0a719a)
    @BrettDong @olanti-p
    BrettDong authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    1f7497c View commit details
    Browse the repository at this point in the history

  25. Add hotkeys for world interaction 

    (cherry picked from commit b7142b23189354fa81a94e83920a0398f83af76b)
    @anothersimulacrum @olanti-p
    anothersimulacrum authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    14b50e5 View commit details
    Browse the repository at this point in the history

  26. monologue messages return after the start of the new game 

    Co-authored-by: EI IKao <you@example.com>
(cherry picked from commit d291072370c32ea9027f4c40eaefce49dceec138)
    @EIIKaO @olanti-p
    EIIKaO authored and olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    b7253f3 View commit details
    Browse the repository at this point in the history

  27. Fix compilation

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    b63dd6e View commit details
    Browse the repository at this point in the history

  28. Fix JSON

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    d527670 View commit details
    Browse the repository at this point in the history

  29. Fix JSON style

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    e1389d9 View commit details
    Browse the repository at this point in the history

  30. Remove bits of mouse code

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    c6b5e64 View commit details
    Browse the repository at this point in the history

  31. Fix functionality lost during merge

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    317adcf View commit details
    Browse the repository at this point in the history

  32. Redraw screen when confirming quitting

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    88296a1 View commit details
    Browse the repository at this point in the history

  33. Merge 'Special' category into 'New Game'

    @olanti-p
    olanti-p committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    646e2bd View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Fix hotkeys mismatch in world menu

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    2b0f6aa View commit details
    Browse the repository at this point in the history

  2. Mute colors a bit, use yellow hotkeys in lists

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    e3238de View commit details
    Browse the repository at this point in the history

  3. Fix lack of sound when moving in lists

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    efef45c View commit details
    Browse the repository at this point in the history

  4. Reorder entries in world menu

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    7f82282 View commit details
    Browse the repository at this point in the history

  5. Revert color mute

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    136c485 View commit details
    Browse the repository at this point in the history

  6. Add quick return from lists

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ccb93eb View commit details
    Browse the repository at this point in the history

  7. Make more space for hints at the bottom

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ec8e4b6 View commit details
    Browse the repository at this point in the history

  8. Get rid of errflag, fix error when trying to load with no world

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    e296f5c View commit details
    Browse the repository at this point in the history

  9. Fix uninitialized variable

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    4ee3f08 View commit details
    Browse the repository at this point in the history

  10. Reduce code duplication

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    1e74877 View commit details
    Browse the repository at this point in the history

  11. Auto-create world on "Play Now"

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    d1af0e9 View commit details
    Browse the repository at this point in the history

  12. Fix tutorial and defence

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    dfc31ec View commit details
    Browse the repository at this point in the history

  13. Fix starting vehicle in character template

    @olanti-p
    olanti-p committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    fb308ed View commit details
    Browse the repository at this point in the history