merge #9
Merged
merge #9
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
Fix item disappearing when wielding item that can merge with the wielded item
Allow sausage casings recipe to also use clean water
Adjust sourdough wait times and descriptions, require clean water for starter.
* debug menu vehicle-related improvements: * prompt the damage type when spawning vehicles * ability to charge and discharge vehicle batteries
npctalk: add set var variants for storing and comparing time
* Changed EMP Grenade to electric damage This change causes the EMP grenade to release an electric cloud rather than shrapnel.
* remove static/random NPC options, adjust random NPC rates * unify scan/spawn range, change value to 90 OMTs * change NPC density config to NPC spawn time in days. update description
Add FEMA savegame migration
* implement smart engine controller add hybrid electric vehicle * smart controller prints messages only when player is controlling vehicle * collapse vehicle parts for hybrid car reuse calculated k_traction in smart controller minor improvements * smart controller (SC) perf optimization: don't consider speed factors for stationary vehicles get rid of SC engine state cache (invalidate SC cache in vehicle::refresh() instead) * vehicle performance optimizations: * cache ids of vehicle fuel containers to speed up vehicle::fuel_left * speed up vehicle::player_in_control * smart controller: make "Smart controller optimizes engine state." message debug-mode only * smart controller: add some spaces to json description to make tests happy * smart controller: fix a bug when empty tanks are not cached
…band Balance flashlight and headband
We rolled back to work around a bug with the printf formatting. Now the "Previous" version is showing the bug too, so no point using it; might as well switch back to latest. That way we'll get the bugfix sooner when it arrives. This reverts 60e7c28
Previously point serialization used free functions and tripoint serialization used member functions. For coord_point serialization to work the way we probably want, points and tripoints need to be serialized the same way. So, switch points to member functions. Because point and label are implicitly convertible to one another, they also need to use the same serialization technique to avoid ambiguity. So, also transition label to use member functions for serialization.
…dges Add bridge savegame migration
Fix clang complaint about weather
…appveyor_again Use latest Visual Studio in Appveyor again
- fixed volume_carried_with_tweaks - added volume_capacity_with_tweaks
main is an overlarge function. This is an easy chunk to pull out.
Define these functions before use so that we don't need to have separate declarations. Also, make exit_handler static.
* Factor out repeated loop. * Modernize. * Make argv be const char**.
Allow arg_handler to declare how many arguments it expects, so that the check that there are sufficiently many can be placed in one place, rather than repeated in every arg_handler lambda.
…bodypart_id basis (#41522)
Add explanation and examples for defining recipe requirements, and using them in recipe components. Also embellish the recipe components section with more inline comments, and some notes on different ways of listing ingredients. Give examples of all different syntaxes, including single and alternative items, unrecoverable components, and items from a requirement list.
Add longest side data to spearguns and fishing spears
Migrate ACT_UNLOAD_MAG and fix crash when detaching gunmods with full magazines
update getting inventory list remove redundant code
Shake the tree of moving crafting functions to Character, and pick up whatever falls out.
Refactor main.cpp
…arge Give cotton balls more charges
Add looks_like to containers.json
Reset vehicle cache when (un-)mounting vehicles
Fix another item deletion bug
update volume, weight, and longest_side values where appropriate
dialogue: create an talker API for speakers in a dialogue
Global reference migration part 25
Global reference migration part 26
Global reference migration part 27
Update cooking.json
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