merge upstream#15

Merged

I-am-Erk merged 463 commits intoI-am-Erk:masterfrom CleverRaven:master

Jun 27, 2019

+34,861-17,000

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 20, 2019

Commits on Jun 21, 2019

Replace nut shelling with disassembly an obsolete old recipes

ZhilkinSerg
authored and
kevingranade
committed
Merge pull request #31673 from ZhilkinSerg/performance-debug-messages
kevingranade
authored
fix aoe spells

KorGgenT
authored and
kevingranade
committed
Runes & Spells to create

LaVeyanFiend
authored and
LaVeyanFiend
committed
Merge pull request #31676 from CleverRaven/kevingranade-secret-recipes
Rivet-the-Zombie
authored
Alchemist rune spell

LaVeyanFiend
authored and
LaVeyanFiend
committed
Upped alchemist rune spell difficulty

LaVeyanFiend
authored and
LaVeyanFiend
committed
Missing rune descriptions added

LaVeyanFiend
authored and
LaVeyanFiend
committed
Routine i18n updates on 21 Jun 2019
BrettDong
committed
Magiclysm: add finger firelighter, balance spellbooks (#31683 )

KorGgenT
authored and
ZhilkinSerg
committed
Magiclysm: Class runes for magic school-specific recipes (#31687 )
ZhilkinSerg
authored
Updated "Mundane Zombies" mod (#31690 )

Hirmuolio
authored and
ZhilkinSerg
committed
Magiclysm : Lost Faith scenario (#31664 )

Leosky
authored and
ZhilkinSerg
committed
Merge pull request #31689 from BrettDong/i18n
ZhilkinSerg
authored
Fix is_ot_type matching incorrect locations (#31669 )

ralreegorganon
authored and
ZhilkinSerg
committed
Adjust stamina regain to 1s turns
nexusmrsep
committed
Update src/player.cpp

nexusmrsep
and
KorGgenT
authored
allow to open i/r/o in vehicle interaction menu to preview work
barsoosayque
committed
reverted some debug changes
barsoosayque
committed
merge upstream/master
barsoosayque
committed
remove debug include
barsoosayque
committed
* add Foodperson cape and mask tiles to HitButton_iso
kristleifur
committed
Dead People Tileset Update
SomeDeadGuy
committed
Stamina debug tool (#31694 )

nexusmrsep
authored and
kevingranade
committed
Magiclysm: minor spell changes (#31698 )

KorGgenT
authored and
kevingranade
committed
Used to identify TALK_COMMON_MISSION.json

kwl01skz
authored and
kevingranade
committed
Update src/player.cpp

nexusmrsep
and
kevingranade
authored
* add overlay_worn_foodperson_mask_on tile to HitButton_iso
kristleifur
committed
Fixed typo
ZhilkinSerg
committed
Field related rename: density / strength -> intensity
ZhilkinSerg
committed

Commits on Jun 22, 2019

Commits on Jun 23, 2019

Merge pull request #31738 from ymber/shotgun_fixes
Rivet-the-Zombie
authored
Remove Leadworks weapons from professions, military itemgroups (#31736 )

Matthew Taylor
authored and
ZhilkinSerg
committed
Rename raw beans (seed) (#31749 )
ZhilkinSerg
authored
Merge pull request #31748 from curstwist/add-library-roofs
ZhilkinSerg
authored
Fix cash card stacking and display (#31732 )

jbytheway
authored and
ZhilkinSerg
committed
Merge pull request #31743 from jbytheway/item_location_copy_constructor
ZhilkinSerg
authored
Merge pull request #30817 from Rail-Runner/tacticalflintlocks
ZhilkinSerg
authored
Merge pull request #31741 from deadcutlass2/patch-1
ZhilkinSerg
authored
Merge pull request #31733 from Hymore246/duration-intensity-fix
ZhilkinSerg
authored
Field enumeration perf (#31686 )

kevingranade
authored and
ZhilkinSerg
committed
Add a missing symbol
kwl01skz
authored
Update feet.json
DemAvalon
committed
Restore a false deletion, from 4ca7104
kwl01skz
authored
Merge pull request #31767 from kwl01skz/patch-20
ZhilkinSerg
authored
Support returning non-const references in random_entry_opt (#31759 )

jbytheway
authored and
ZhilkinSerg
committed
Multiple item locations in inventory entry (#31761 )

jbytheway
authored and
ZhilkinSerg
committed
Fix the Error message when excessive Eat/Drink (#31764 )

kwl01skz
authored and
ZhilkinSerg
committed
Merge pull request #31765 from DemAvalon/boots-of-the-oooold-west-
ZhilkinSerg
authored
Merge pull request #31762 from kwl01skz/patch-18
ZhilkinSerg
authored
add military surplus roofs (#31769 )

curstwist
authored and
ZhilkinSerg
committed
Renamed the "Light" to prevent translation conflicts "Light"(verb.) (#31770 )

kwl01skz
authored and
ZhilkinSerg
committed
A couple of new band t-shirts. (#31768 )

faefux
authored and
ZhilkinSerg
committed
Owlbears for Magiclysm (#31545 )

RocketPapaya413
authored and
ZhilkinSerg
committed
Magiclysm: Spells make sounds when cast (#31710 )

KorGgenT
authored and
ZhilkinSerg
committed
Fix tools that use UPS conversion mods (#31766 )

Inglonias
authored and
ZhilkinSerg
committed
Separate .270 Winchester from .30-06 Springfield (#31758 )

Matthew Taylor
authored and
ZhilkinSerg
committed
Fix maps revealing overmap terrain subtypes
ralreegorganon
committed

Commits on Jun 24, 2019

Commits on Jun 25, 2019

Clarify the documentation.
mrkybe
committed
Update soundpack options message
mark7
committed
add finger firelighter spell to pyro book
KorGgenT
committed
Correct maximum sound volume in options
mark7
committed
Fixing glaring typo in npc dialogue
Saint-of-Grey
committed
Merge pull request #31819 from Saint-of-Grey/literally-playable
Rivet-the-Zombie
authored
Reduce healing rate to realistic speeds (#31611 )

KorGgenT
authored and
kevingranade
committed
Rebalanced all effects for 1 second turns (#31704 )

Inglonias
authored and
kevingranade
committed
Several temperature related optimizations

ZhilkinSerg
authored and
kevingranade
committed
Merge pull request #31728 from ZhilkinSerg/refactor-fields-rename-2
kevingranade
authored
Refactored trap class (#31734 )

ZhilkinSerg
authored and
kevingranade
committed
Remove potentially expensive copying of crafting inventory

ZhilkinSerg
authored and
kevingranade
committed
More generic message

Fris0uman
authored and
kevingranade
committed
Update med.json

Regularitee
authored and
kevingranade
committed
Wait option: Wait until you regain stamina (#31811 )

nexusmrsep
authored and
kevingranade
committed
Merge pull request #31814 from alanbrady/units-remain
ZhilkinSerg
authored
Merge pull request #31821 from mrkybe/documentation
ZhilkinSerg
authored
Don't spam high-level nether creatures

mark7
authored and
kevingranade
committed
Merge pull request #31826 from mark7/wb-sound-reload-warning
ZhilkinSerg
authored
Merge pull request #31827 from mark7/wb-sound-volume-max
ZhilkinSerg
authored
Merge pull request #31818 from kwl01skz/patch-21
ZhilkinSerg
authored
Merge pull request #31796 from jbytheway/item_location_stale_pointers
kevingranade
authored
Mainline some more of More Survival Tools content (#31563 )

Rail-Runner
authored and
kevingranade
committed
Removed rotate nodes with default values
ZhilkinSerg
committed
Allowed rotation of most overmap terrains and specials
ZhilkinSerg
committed
Updated tests
ZhilkinSerg
committed
Added savegame migration
ZhilkinSerg
committed
Cookie boxes no longer 95% empty space
Regularitee
authored
adds biker NPC variation for regional dump
curstwist
committed
add charges to small mana crystal

curstwist
authored and
kevingranade
committed
Get rid of MAX_FIELD_INTENSITY define
ZhilkinSerg
committed
Generalized function (spew_smoke -> spew_field)
ZhilkinSerg
committed
Renamed function (adjust_field_intensity -> mod_field_intensity)
ZhilkinSerg
committed
Refactored material burn data to support more than 3 intensity levels
ZhilkinSerg
committed
Renamed some things related to fields for consistency
ZhilkinSerg
committed
Added fallback values to field types json load
ZhilkinSerg
committed
Jewelry postapoc price changes (#31850 )

faefux
authored and
kevingranade
committed

Commits on Jun 26, 2019

Commits on Jun 27, 2019

Merge pull request #31841 from Regularitee/patch-6
Rivet-the-Zombie
authored
Player overmap auto-travel (#31786 )

davidpwbrown
authored and
kevingranade
committed
add bathroom scale (#31849 )

KorGgenT
authored and
kevingranade
committed
Rework active_item_cache to use safe references (#31873 )

ifreund
authored and
kevingranade
committed
Separate point, tripoint into new point.h
jbytheway
committed
Allow some constructions to keep items on their tile when completed. (#31885 )

ProfoundDarkness
authored and
kevingranade
committed
NPCs: only train at 100 practice at a time

mlangsdorf
authored and
kevingranade
committed
Merge pull request #31888 from ZhilkinSerg/json-vehicle-field-emit
kevingranade
authored
Allow dispensing gasoline at the lumbermill

ralreegorganon
authored and
kevingranade
committed
Magiclysm: Rebalance spells for stamina rebalance

KorGgenT
authored and
kevingranade
committed
Revert "Cookies in plastic packets instead of 95% empty boxes"
kevingranade
committed
Eliminate last get_vehicle call when vehicles are idle. (#31903 )

kevingranade
authored and
ZhilkinSerg
committed
Merge pull request #31893 from RDru/bow-stamina-fix
ZhilkinSerg
authored
Merge pull request #31884 from Night-Pryanik/7.62x54-disassemble-recipe-fix
ZhilkinSerg
authored
say no way to grey (#31908 )
kevingranade
authored
Merge pull request #31892 from jbytheway/point_header
ZhilkinSerg
authored
Unify overmap terrain matching (#31883 )

ralreegorganon
authored and
ZhilkinSerg
committed
Acetylene torch fix (#31912 )

eilaattwood
authored and
ZhilkinSerg
committed
Magiclysm: Spell encumbrance and minor spellcasting ui tweaks (#31902 )

KorGgenT
authored and
ZhilkinSerg
committed
fixy fix fix

David Brown
authored and
kevingranade
committed
Briefs go under jumpsuit

Fris0uman
authored and
kevingranade
committed