Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cataclysmbnteam/Cataclysm-BN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4079c6d
Choose a base ref
...
head repository: cataclysmbnteam/Cataclysm-BN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65894d4
Choose a head ref
  • 20 commits
  • 80 files changed
  • 8 contributors

Commits on Sep 24, 2023

  1. Configuration menu
    Copy the full SHA
    d3c9a33 View commit details
    Browse the repository at this point in the history
  2. build(cmake): deduplicate library setup (#3248)

    * refactor: DRY library setup
    
    * fix: DOWNLOAD_EXTRACT_TIMESTAMP warning
    scarf005 authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    a526591 View commit details
    Browse the repository at this point in the history
  3. ci: use merge queue (#3252)

    scarf005 authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    879c619 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. docs: lang/notes (#3207)

    * docs: move `lang/notes` into `doc/`
    
    * docs(i18n): rename to more fitting name
    
    * docs(i18n): localize language-specific translation notes
    
    * docs: rewrite edge_cases.md
    
    added proper links to relevent pages
    
    * feat: lab JSON guide to docs
    scarf005 authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    ba96477 View commit details
    Browse the repository at this point in the history
  2. Fix compile error on MacOS curses (#3260)

    * Fix compile error on macos
    
    Cherry-picked from 3ad05f9312d60f2cc6a3a5070dd8d4fd9d2cbd0a
    
    Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
    
    * style(autofix.ci): automated formatting
    
    ---------
    
    Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
    Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
    3 people authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    b8a55df View commit details
    Browse the repository at this point in the history
  3. Refresh test user dir on each test run (#3259)

    * Refresh user dir on each run
    
    * style(autofix.ci): automated formatting
    
    ---------
    
    Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
    olanti-p and autofix-ci[bot] authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    1d7d3d4 View commit details
    Browse the repository at this point in the history
  4. feat: show monster immunity in description (#3254)

    * feat: show monster immunity in description
    
    * fix: describe bioproof only once
    
    Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
    
    * fix: use describe_flags
    
    * perf: use string_view
    
    * style: cmake format
    
    ---------
    
    Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
    scarf005 and chaosvolt authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    fbcaae3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    87a04bc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Streamline has_trait_flag behavior (#2911)

    * Streamline has_trait_flag behavior
    
    * Start work on it
    
    * Update type_id.h
    
    * Update the thing
    
    * Commit latest fixes
    
    * Update flag_trait.h
    
    * Commit what I have for now
    
    * style(autofix.ci): automated formatting
    
    * Update condition.cpp
    
    * And that should be the basics of the code
    
    * style(autofix.ci): automated formatting
    
    * Start up the JSON work next
    
    * Update flags_mutation.json
    
    * Update JSON_FLAGS.md
    
    * style(autofix.ci): automated formatting
    
    * Update flags_mutation.json
    
    * Update string_id_null_ids.cpp
    
    * Apply suggestions from code review
    
    Co-authored-by: Olanti <olanti-p@yandex.ru>
    
    * Do some of the suggested things
    
    * Work on part of the requests
    
    * Add the validation thingy
    
    * refactor: extract `trait_flag_str_id` for `PRED`
    
    * refactor: remove `conflicts` usage
    
    Co-authored-by: olanti-p <olanti-p@yandex.ru>
    
    * refactor: extract other trait flag ids
    
    Co-authored-by: olanti-p <olanti-p@yandex.ru>
    
    * style(autofix.ci): automated formatting
    
    ---------
    
    Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
    Co-authored-by: Olanti <olanti-p@yandex.ru>
    Co-authored-by: scarf <greenscarf005@gmail.com>
    4 people authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    dc43e23 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    897c78f View commit details
    Browse the repository at this point in the history
  3. Add street lights to more places, allow deconstructing (#3265)

    * Add street lights to more places, allow deconstructing
    
    * Update furniture-terrains.json
    
    * Update megastore.json
    
    * Update homeimprovement_superstore_new.json
    chaosvolt authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    1efef0f View commit details
    Browse the repository at this point in the history
  4. feat: animal ears are cute (#3230)

    * feat: made animal tails not ugly
    
    ...except weaponized ones
    
    * feat: made animal ears pretty
    scarf005 authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    639a0e9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    378f57f View commit details
    Browse the repository at this point in the history
  6. Missing tile in horse ranches (#3274)

    * Update farm_horse.json
    
    * Update farm_horse_isherwood.json
    0Monet authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    7f7adba View commit details
    Browse the repository at this point in the history
  7. Update iexamine_elevator.cpp (#3276)

    gets rid of `-Werror=pedantic` compile error by removing unnecessary `;`
    OrenAudeles authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    ab83cb9 View commit details
    Browse the repository at this point in the history
  8. perf: speed up item::has_flag calls (#3277)

    * perf: speed up item::has_flag calls
    
    * astyle
    OrenAudeles authored Sep 26, 2023
    Configuration menu
    Copy the full SHA
    bf8de42 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. perf(map): inline sm_to_ms_copy (#3278)

    * refactor: trailing auto returns
    
    * refactor: add line breaks
    
    my eyes hurt distinguishing them!
    
    * refactor: use anonymous namespace
    
    looks better imo
    
    * perf: inline `sm_to_ms_copy`
    
    see: CleverRaven/Cataclysm-DDA#66889
    
    Co-authored-by: Andrew Krieger <akrieger@users.noreply.github.com>
    
    ---------
    
    Co-authored-by: Andrew Krieger <akrieger@users.noreply.github.com>
    scarf005 and akrieger authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    09f3686 View commit details
    Browse the repository at this point in the history
  2. Properly remove stale test user dir (#3270)

    * BNify
    
    * Add warning
    
    * Add remove_tree and use it for test user dir
    olanti-p authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    79039da View commit details
    Browse the repository at this point in the history
  3. build: tracy integration

    scarf005 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    f7ecf91 View commit details
    Browse the repository at this point in the history
  4. docs: tracy guide

    scarf005 committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    65894d4 View commit details
    Browse the repository at this point in the history
Loading