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

Catchup #11

Merged
merged 51 commits into from
Jan 9, 2020
Merged

Catchup #11

merged 51 commits into from
Jan 9, 2020

Commits on Jan 6, 2020

  1. Configuration menu
    Copy the full SHA
    6b0b64f View commit details
    Browse the repository at this point in the history
  2. Merge pull request #36736 from kevingranade/fix-ant-tunnels

    Fixes to ant lair generation
    Rivet-the-Zombie committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    b0160b4 View commit details
    Browse the repository at this point in the history
  3. Fix typo

    Qrox committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    4493717 View commit details
    Browse the repository at this point in the history
  4. update next 5 houses (#36741)

    curstwist authored and I-am-Erk committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    57b6f2f View commit details
    Browse the repository at this point in the history
  5. Magiclysm: Holographic transposition spell (#36714)

    * Holographic transposition spell
    
    * Add spawn for the holographic transposition scroll
    
    * Remove outdated flag
    
    * Remove unused function parameter
    
    * Changes suggested by code review.
    
    * Update data/mods/Magiclysm/items/spell_scrolls.json
    
    Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
    
    * Fix misplaced coma in spell_scrolls.json
    
    * Apply suggestions from code review
    
    Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
    
    Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>
    Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
    3 people authored and KorGgenT committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    8ad1db2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2d14566 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1 from Ker-Nes/Ker-Nes-grapes

    Adding Grape Seeds to the cooking oil recipe
    Ker-Nes committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    e4492a8 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    17ceebe View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ff81bf2 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #36750 from Qrox/fix-typo

    Fix a typo in avatar.cpp
    ZhilkinSerg committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    72a0325 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #36753 from Inglonias/war-on-christmas

    Take down the Christmas decorations
    ZhilkinSerg committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    24d0daf View commit details
    Browse the repository at this point in the history
  12. Merge pull request #36755 from anothersimulacrum/docs

    Add documentation for repairs_like
    ZhilkinSerg committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    238ab4b View commit details
    Browse the repository at this point in the history
  13. Use libbacktrace to generate readable backtrace on Windows (#36615)

    * Use libbacktrace to generate backtrace
    
    * Move dbghelp symbol initialization to debug_write_backtrace
    
    * Use libbacktrace on cross-compilation to Windows
    
    * Download prebuilt libbacktrace before building
    
    * Use square brackets instead of angle brackets
    
    * Add license text of libbacktrace
    Qrox authored and ZhilkinSerg committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    764aa9f View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Handle basecamp component selection cancellation

    Various basecamp actions require components and tools to be consumed.
    
    When there are choices to be made amongst these, the player is presented
    with the choice between the various options in the usual way.
    
    However, if the player cancels, the action proceeded regardless.  This
    allowed the player to circumvent the consumption of the requirements.
    
    Fix this by separating the selection of the components from the
    consumption.  Now the order of events is:
    
    - Select components and tools.
    - Select NPC.
    - Send NPC on mission.
    - Consume components and tools.
    
    We needed to perform the split because we need to select both the
    requirements and the NPC before performing alterations to either.
    
    Implemented by introducing a new class basecamp_action_components to
    store this selection state.
    jbytheway committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    d6dbad0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64dedd5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b225c73 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #36740 from jbytheway/basecamp_consumption

    Handle basecamp component selection cancellation
    ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    95bbdfe View commit details
    Browse the repository at this point in the history
  5. Merge pull request #36762 from jbytheway/resume_craft_crash

    Fix inventory caching bug causing crash when resuming craft
    ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    168f48f View commit details
    Browse the repository at this point in the history
  6. Merge pull request #36752 from Ker-Nes/grapeseedoil

    Adding Grape Seeds to the cooking oil recipe
    Rivet-the-Zombie committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    4d722cb View commit details
    Browse the repository at this point in the history
  7. Moved corpses.json from items dir to items/corpses

    Also fixed weight and volume of children corpses
    Night-Pryanik committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    9493b39 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #36771 from Night-Pryanik/corpses

    Fixed weight and volume of children corpses
    ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    9c6802b View commit details
    Browse the repository at this point in the history
  9. Abandon camp NPC talk and bulletin board mission (#36697)

    davidpwbrown authored and ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    88009f4 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0ee7ca4 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #36773 from kevingranade/fix-sandbag

    Correct sandbag recipe for charges
    ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    28f902a View commit details
    Browse the repository at this point in the history
  12. Merge pull request #36767 from kevingranade/fix-anthils-again

    Overhaul anthill generation to avoid conflicting with other map features
    ZhilkinSerg committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    a68dc58 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bd22b04 View commit details
    Browse the repository at this point in the history
  14. AFS prefix removed (#36763)

    Maleclypse authored and I-am-Erk committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    91c47b0 View commit details
    Browse the repository at this point in the history
  15. Corporate Infiltrator

    Caster tweaks
    
    Tweak
    John-Candlebury committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    b63b941 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9ea9f81 View commit details
    Browse the repository at this point in the history
  17. Martial Arts missing Learn Diffculty and Incorrect Bonuses (#36772)

    * Martial Arts missing Learn Diffculty and Incorrect Bonuses
    
    Medieval Swordsmanship and Leopard Stance were missing the learn difficulty, making them potentially easier to learn than intended.
    
    Leopard stance's on move buff gave a flat bonus to damage instead of the intended multiplier.
    
    Eskrima stance was giving a 200% bonus to accuracy instead of the intended +2 accuracy.
    
    * Added missing primary_skills
    
    Fior Di Battaglia uses bashing skill, Medieval Swordsmanship uses cutting skill
    Xanmyral authored and I-am-Erk committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    3734302 View commit details
    Browse the repository at this point in the history
  18. Set debug mutation as such in Magiclysm (#36774)

    * Set debug mutation as such in Magiclysm
    
    * Apply suggestions from code review
    
    Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
    
    Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
    2 people authored and KorGgenT committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    c4c7b91 View commit details
    Browse the repository at this point in the history
  19. Electrochemical reactions (#36785)

    * Update recipe_medsandchemicals.json
    
    abstracting using chloralkali process (hot solution, unpartitioned cell) to produce sodium chlorate, then perchlorate by anodic oxidation on platinum, then ammonia perchlorate by double decomposition from sodium perchlorate and ammonium chloride; while we can't directly use bleach here but we do end up recovering some brine
    
    * Update recipe_medsandchemicals.json
    
    * Update recipe_medsandchemicals.json
    
    * Update recipe_medsandchemicals.json
    
    * Update recipe_medsandchemicals.json
    
    * Update recipe_medsandchemicals.json
    
    Reevaluating skill requirements
    1n17 authored and I-am-Erk committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    bcff7ae View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    0de82ed View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Boxpack (#36746)

    * add box backpack and recipe
    
    * add NO_REPAIR flag
    
    * edit description and recipe
    
    * Update data/json/recipes/armor/storage.json
    
    Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
    
    * Update data/json/recipes/armor/storage.json
    
    Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
    
    * Update data/json/recipes/armor/storage.json
    
    Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
    
    * remove stray bracket
    
    Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
    k4gi and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    29351f0 View commit details
    Browse the repository at this point in the history
  2. Fix butchery results

    John-Candlebury committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    1f9a072 View commit details
    Browse the repository at this point in the history
  3. Adds military helipad location (#36732)

    * Adds military helipad location
    
    * JSON fixes.
    
    * Moster placing fix.
    
    * Terrain id fix.
    
    * Replace mech lifter with a forklift.
    
    * Review changes
    
    * Set of small fixes - spawns etc.
    
    * Reduce number of perimeter turrets to 4.
    CountAlex authored and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    89ef868 View commit details
    Browse the repository at this point in the history
  4. Use -Wno-unknown-warning to simplify warnings

    A gcc-specific warning option had been added (-Wsuggest-override).  In
    theory this was guarded against being used with clang, but that didn't
    work if a compilation database was built with gcc and then used with
    e.g. clang-tidy.  In that situation clang would complain about the
    unrecognized warning.
    
    The suggested workaround in the DEVELOPER_TOOLING docs was to add
    -Wno-unknown-warning-option, a clang option to suppress such warnings.
    
    However, we might as well just add that option always, then we don't
    need to make the -Wsuggest-override conditional and the build logic is
    simplified.
    
    Technically, gcc has no such option, but gcc doesn't complain about
    unrecognized disabled warning options (unless there's another error) so
    we get lucky there.  Hopefully that remains true back to our earliest
    supported gcc.
    
    This might cause problems for compiling with another compiler e.g. icc,
    but the way the Makefile was written, it would have had that problem
    anyway, since it was added for any non-clang compiler.
    jbytheway committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    2a8c48d View commit details
    Browse the repository at this point in the history
  5. various little changes in retrodays+ (#36780)

    captnblood authored and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    8c94bf5 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #36799 from arijust/ballistic_vest

    Lower material thickness for ballistic vest.
    Rivet-the-Zombie committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    d8a93e0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    09cf3e4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8355299 View commit details
    Browse the repository at this point in the history
  9. Increase assisted effect from nurse bot (#36798)

    * Increase max_intensity of assisted effect
    
    * Increase intensity of assisted effect from nurse bot
    Fris0uman authored and kevingranade committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    a74605a View commit details
    Browse the repository at this point in the history
  10. Merge pull request #36803 from jbytheway/no_unknown_warning

    Use -Wno-unknown-warning to simplify warnings selection
    ZhilkinSerg committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    82fafc5 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #36801 from John-Candlebury/afs-butcher-fix

    [Aftershock] Fix butchery results
    ZhilkinSerg committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    77f4898 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b6c48d8 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #36768 from John-Candlebury/holo-fighter

    Aftershock Corporate Infiltrator
    ZhilkinSerg committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    a9432ab View commit details
    Browse the repository at this point in the history
  14. Update game.cpp (#36787)

    remove superfluous refresh calls from list item/monster views
    set item list width to match default/minimal monster list width
    1n17 authored and kevingranade committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    44b584e View commit details
    Browse the repository at this point in the history
  15. Construction recipe for barred window with curtains (#36797)

    * Construction recipe for barred window with curtains
    
    * lint
    
    * add conditional for tear down
    
    Add conditional handler for tearing down curtains from a barred window
    
    * fix missing declaration
    
    No shortcuts... download a compiler, learn c++, and finish what I started.
    Game compiles, load save, no error, tear down curtain and they stayed down
    
    * astyle
    
    learn what astyle is and attempt application. minor fix, remove unneeded "."'s
    Kilvoctu authored and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    0e87154 View commit details
    Browse the repository at this point in the history
  16. Allow armor inserts in ballistic vests (#36778)

    * Allow armor inserts in ballistic vests
    
    * Reduce assembly time
    
    * Update ballistic plate descriptions
    ymber authored and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    e7fabca View commit details
    Browse the repository at this point in the history
  17. Update s_clothes chances (#36823)

    ymber authored and I-am-Erk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    bb7e3c4 View commit details
    Browse the repository at this point in the history
  18. Update JSON_INFO.md (#36827)

    Jerimee authored and kevingranade committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    4322f15 View commit details
    Browse the repository at this point in the history