sync #2
Merged
sync #2
Conversation
This file contains 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
…ting tool for making soap flakes.
following amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com>
applying amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com>
Fix martini recipe category
Dirty transparency cache when a mapregen trap is activated
Previously, migrating a count_by_charges item to another count_by_charges item would result in the new item being given its default amount of charges, no matter the charges of the original. This changes that so that unless a "charges" value is specified in the migration definition, the charges of the original are preserved.
Minor magazine tweaks
The arguments given are "string, int, int", but the format string expects "int, int, string". This adds explicit numbers to the format specifiers to match the actual arguments.
Fix arguments in string_format call:
Fixed a typo
* include plcaeholder text to remove confusion * punctuation consistency
…-fix Avoid undefined behavior when filtering elements from a set
…t-ids Remove unused effect id declarations
Fix migration behavior for charges
Revert buff to electric jackhammers
Style comments (2019-11-28)
Remove unused function
* Gave empty window frame coverage * Give coverage to base window Added coverage to base window because the smashed version suddenly gains coverage.
Refactor iexamine::slot_machine
* Allow browsing vending-machine items without a cash card * Edit vending-machine messages
* rearrange park.json * add palettes * add park palettes * fix error in playground monster spawning * update vehicles and monster groups and remove from the main file * tweak monster spawning
* Added new profession: Kitted Survivor Costs 1 point. Starts with worse clothing than the ordinary Survivor but has a full survival kit which can aid them. Inspired by Cataclysm++'s "Canned Survivor", who starts with a decked out "Survival In A Can" kit.
* replace std::weak_ptr with weak_ptr_fast, std::shared_ptr with shared_ptr_fast std::weak_ptr/std::shared_ptr forces atomic access despite the fact cdda is singlethreaded. * inline rl_dist(), trig_dist(), square_dist() * line.h: add rl_dist_fast, which allows to skip the sqrt so we can do the length checks in monster::rate_target() and compute the sqrt when we know it's necessary. * fix clang-tidy warning: remove redundant smartptr get()
* Remove legacy JSON from vehicleparts * Mod (except Blaze) vehicleparts JSON * Blaze Turrets * Blaze mod vehicleparts JSON * Fix typos * Restore solar panel copy-from * Added missing reqs clear
* Updated lang/extract_json_strings.py for accepting JSON objects without type field * Routine i18n updates on 29 Nov 2019
exactly what it says in the title
Enable autosave by default
bionics .json added, bionics lists moved from item_groups.json
Let autotravel happen on other z-levels
Load migration ID arrays properly
Dont consume charges when not required in plank chopping
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context