Merge#5

Merged

eilaattwood merged 800 commits intoeilaattwood:masterfrom CleverRaven:master

Jun 15, 2019

+312,478-143,249

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

Commits on Jun 8, 2019

Commits on Jun 9, 2019

Tell an NPC to finish your construction tasks (#31239 )

davidpwbrown
authored and
kevingranade
committed
Add a bit of recipes, add item groups
I-am-Erk
committed
random byproducts not supported
I-am-Erk
committed
Astyle
kevingranade
authored
Update recipe_others.json
I-am-Erk
committed
Merge pull request #31259 from curstwist/add-gardening-store-roof
Rivet-the-Zombie
authored
Update recipe_others.json
I-am-Erk
committed
Added martial arts and weapons compatibility messages (#31244 )
kevingranade
authored
Reduce padding in uistatedata

jbytheway
authored and
kevingranade
committed
Update recipe_others.json
I-am-Erk
committed
Merge pull request #31250 from anothersimulacrum/campus-b3
ZhilkinSerg
authored
Fix starting a fire with a firewood source (#31256 )

matthemsteger
authored and
ZhilkinSerg
committed
Fix another camp bug with expansions not showing up (#31255 )

davidpwbrown
authored and
ZhilkinSerg
committed
Add motocross bikes and street-legal dirt bikes (#31169 )

kristleifur
authored and
ZhilkinSerg
committed
Added a note with a reference to the DL
Night-Pryanik
committed
Fix spelling of JSON member name
BevapDin
committed
Lint
Night-Pryanik
committed
Magiclysm: add mana mutation type

KorGgenT
authored and
kevingranade
committed
Added an article in the newspaper about minefields at the bridges

Night-Pryanik
authored and
kevingranade
committed
Merge pull request #31274 from Night-Pryanik/dying-light-reference
kevingranade
authored
change color of invlets for keybindings

KorGgenT
authored and
kevingranade
committed
Merge pull request #31279 from BevapDin/nrr
kevingranade
authored
Show skill exercise
AMurkin
committed
Fixed max_index uninitialized

Michael Hoffman
authored and
kevingranade
committed
remove recipe check
David Brown
committed
added recipe check to iuse and iexamine
David Brown
committed

Commits on Jun 10, 2019

fixed road / city generation, modified mod description

David Brown
authored and
kevingranade
committed
update mana regen less often
KorGgenT
committed
Adds a new pneumatic shotgun
ddsaw
committed
Update shotcanister.json
ddsaw
committed
Update shotcanister.json
ddsaw
committed
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ammo/shotcanister.json

ddsaw
and
Night-Pryanik
authored
Update data/json/items/ranged.json

ddsaw
and
Night-Pryanik
authored
Merge branch 'master' of https://github.com/ddsaw/Cataclysm-DDA
ddsaw
committed
Update recipe_ammo.json
ddsaw
committed
Merge pull request #31293 from KorGgenT/mana-regen-fix
ZhilkinSerg
authored
Update recipe_weapon.json
ddsaw
committed
Merge pull request #31287 from AMurkin/train-show-skill-exercise
ZhilkinSerg
authored
Merge pull request #31257 from OrenAudeles/weather_data
ZhilkinSerg
authored
Merge pull request #31253 from anothersimulacrum/parking-lots
ZhilkinSerg
authored
basecamps: add support for automatic calculation of blueprint ingredients (#31209 )

mlangsdorf
authored and
ZhilkinSerg
committed
Update shotcanister.json
ddsaw
committed
Update recipe_ammo.json
ddsaw
committed
Merge pull request #31219 from I-am-Erk/wood-beams
Rivet-the-Zombie
authored
change include
David Brown
committed
Avoid clairvoyance showing tiles as lit if you have no clair.

KurzedMetal
authored and
kevingranade
committed
Don't make sound of engine humming if engine is of muscle type

Night-Pryanik
authored and
kevingranade
committed
Island prison and prisoners tweaks (#31297 )

Night-Pryanik
authored and
kevingranade
committed
Make clang tidy happy about alias
kevingranade
committed
split player::disp_info() into constituent parts (#31261 )

KorGgenT
authored and
kevingranade
committed
Revert "Avoid clairvoyance showing tiles as lit if you have no clair." (#31316 )

kevingranade
authored and
ZhilkinSerg
committed
Boats' "engines" will start at first attempt (#31305 )

Night-Pryanik
authored and
ZhilkinSerg
committed
Make pottery easier to craft (#31304 )

Rail-Runner
authored and
ZhilkinSerg
committed
Increase performance by removing check for recipe every crafting turn (#31291 )
ZhilkinSerg
authored
add roof to botanical garden (#31313 )

curstwist
authored and
ZhilkinSerg
committed
Add craftshop roofs (#31314 )

curstwist
authored and
ZhilkinSerg
committed

Commits on Jun 11, 2019

Astyle weather.h

ZhilkinSerg
authored and
kevingranade
committed
add magic book colors
KorGgenT
committed
add roof to garage_gas.json
curstwist
committed
Merge branch 'master' into pr/30656
KorGgenT
committed
Updated roots and leaves mechanics to take new turn length into account. (#31269 )

Saint-of-Grey
authored and
kevingranade
committed
Merge pull request #31294 from ddsaw/master
Rivet-the-Zombie
authored
RPG dice (#31031 )

krekeler0
authored and
kevingranade
committed
Initial commit

Mooses2k
authored and
kevingranade
committed
Cold and heat damage don't damage bandages or contaminate wounds
Night-Pryanik
committed
Move get_heat_radiation() to avoid duplicate calls
kevingranade
committed
Avoid retrieving get_vehicles() multiple times per turn
kevingranade
committed
list items scroll fix
OzoneH3
committed
Merge pull request #31330 from kevingranade/get-vehicle-once
ZhilkinSerg
authored
Merge pull request #31329 from kevingranade/avoid-refetching-heat
ZhilkinSerg
authored
Merge pull request #31318 from KorGgenT/magic-stuff
ZhilkinSerg
authored
Merge pull request #31319 from curstwist/add-roof-to-garage-gas-station
ZhilkinSerg
authored
Merge pull request #31328 from Night-Pryanik/cold-and-heat-damage-don't-damage-bandages-and-contaminate-disinfected-wounds
ZhilkinSerg
authored
Merge pull request #31331 from OzoneH3/v_scroll_fix
ZhilkinSerg
authored
Add new Politician profession (#31119 )

Kanexan
authored and
ZhilkinSerg
committed
Made seed descriptions more consistent (#31073 )

RarkGrames
authored and
ZhilkinSerg
committed
Fixed typo
ZhilkinSerg
committed
Item info flag for plantable seeds
ZhilkinSerg
committed
Updated more seeds descriptions
ZhilkinSerg
committed
Pneu-shottie shells/ .410s work with bandoliers, plus a name fix

LaVeyanFiend
authored and
LaVeyanFiend
committed
Fix for reading time with 1s turns (#31336 )

Leosky
authored and
kevingranade
committed
Prevent crashes and bad behavior when vehicle updates invalidate the vehicle list (#31348 )

kevingranade
authored and
ZhilkinSerg
committed
Magiclysm: Mana potions (#31273 )

KorGgenT
authored and
ZhilkinSerg
committed
Updated toggled bionic power use for 1s turns (#31296 )

RDru
authored and
kevingranade
committed

Commits on Jun 12, 2019

Add check for needs_anesthesia

Fris0uman
authored and
kevingranade
committed
Merge pull request #31345 from LaVeyanFiend/ShotBandoFix
Rivet-the-Zombie
authored
Moved map related field code to separate file
ZhilkinSerg
committed
Fix recharger comment

Matthew Taylor
and
anothersimulacrum
authored
Added code to read field type data from json
ZhilkinSerg
committed
Added field_types.json
ZhilkinSerg
committed
Refuel fires while waiting
ifreund
committed
Misc micro optimizations (#31360 )

kevingranade
authored and
ZhilkinSerg
committed
Merge pull request #31364 from ifreund/wait-refuel
ZhilkinSerg
authored
fix crash when drawing skills tab because of an unitialised variable (#31342 )

jagoly
authored and
ZhilkinSerg
committed
Marina (#31349 )

Night-Pryanik
authored and
ZhilkinSerg
committed
Fix map cache invalidation (#31295 )

kevingranade
authored and
ZhilkinSerg
committed
Add drying recipes for frozen ingredients (#31270 )

Zetsukaze
authored and
ZhilkinSerg
committed
Nerf outlandish drug effects (#31309 )

kevingranade
authored and
ZhilkinSerg
committed
basecamps: add modular basecamps (#31115 )

mlangsdorf
authored and
ZhilkinSerg
committed
Improve Spellcasting UI (#31356 )

KorGgenT
authored and
ZhilkinSerg
committed
Enforce -Wold-style-cast (#31361 )

jbytheway
authored and
ZhilkinSerg
committed
Various Corrections of Spelling and Clarification of Quests (#31216 )

DracoGriffin
authored and
kevingranade
committed
Use translation markers for vehicle noise sounds
ZhilkinSerg
committed
Use translation markers for monster footsteps
ZhilkinSerg
committed
Use translation markers for action names
ZhilkinSerg
committed
Put some translation calls inside of if blocks
ZhilkinSerg
committed
Use dedicated function of trap class instead of checking translated name for emptiness
ZhilkinSerg
committed

Commits on Jun 13, 2019

add roof & bar to golfcourse clubhouse
curstwist
committed
Remove tabs from CMake compile commands

jbytheway
authored and
kevingranade
committed
Merge pull request #31310 from ZhilkinSerg/refactor-fields-step-1
kevingranade
authored
Allow items to use multiple ammotypes (#30874 )

Matthew Taylor
authored and
kevingranade
committed
Merge pull request #31374 from ZhilkinSerg/performance-translation-calls-2019-06-13
kevingranade
authored
Merge pull request #31381 from curstwist/add-golf-course-clubhouse-roof
Rivet-the-Zombie
authored
Updates Morale Menu for clarity (#31164 )

Sunshine-dev-forever
authored and
kevingranade
committed
Correct values in item processing for 1 sec turns

ifreund
authored and
kevingranade
committed
Merge pull request #31335 from ZhilkinSerg/item-info-plantable-irradiated
kevingranade
authored
tell the player one's attempting too hard crafting

l29ah
authored and
kevingranade
committed
Fix OSX and MXE Windows builds (#31385 )
ZhilkinSerg
authored
Rural Content: 3 New Rural Houses, more variations (#31367 )

LovamKicsiGazsii
authored and
ZhilkinSerg
committed
Magiclysm: More Mutation Types (#31375 )

KorGgenT
authored and
ZhilkinSerg
committed
Make toggling of music work correctly. (#31332 )

mark7
authored and
ZhilkinSerg
committed
Added another missing cast
ZhilkinSerg
committed
Add and astyle plf_colony.h as colony.h
ifreund
committed
Make colony conform to cdda code style
ifreund
committed
Remove/simplfy pre-processor defines
ifreund
committed
Clean up formatting
ifreund
committed
Further cleanup pre-processor defines
ifreund
committed
Add colony test cases
ifreund
committed
Update colony implementation to v5.10
ifreund
committed
junkfood.json: realistic Necco wafers' stats
l29ah
committed
see gender on npc Look at option
David Brown
committed
Merge pull request #31386 from ZhilkinSerg/fix-build-mxe-mingw-2019-06-13
ZhilkinSerg
authored
Merge pull request #31387 from l29ah/necco
ZhilkinSerg
authored
Merge pull request #31390 from davidpwbrown/see_npc_gender
ZhilkinSerg
authored
Revert "See gender on NPC Look at option"
kevingranade
committed
removed recipes for ir and nv goggs

Mooses2k
authored and
kevingranade
committed
return const ref from item::ammo_types

ymber
authored and
kevingranade
committed
Merge pull request #31338 from ifreund/colony
kevingranade
authored
Normalize function names

ZhilkinSerg
authored and
kevingranade
committed
Edit the elec_jackhammer power drain (#31192 )

RosieMcCattail
authored and
kevingranade
committed

Commits on Jun 14, 2019

Commits on Jun 15, 2019

Make vision unit tests not expect light on player location
KurzedMetal
committed
make 100% fail chance string clearer
KorGgenT
committed
cannot cast spells at a target you cannot see
KorGgenT
committed
show max mana in mana panel
KorGgenT
committed
add spell flags
KorGgenT
committed
add PERMANENT spell flag
KorGgenT
committed
add IGNORE_WALLS spell flag
KorGgenT
committed
update json flags to include new spell tags
KorGgenT
committed
spell makes permanent item only if max level
KorGgenT
committed
Adds Wing Chun martial art (#30668 )

Mooses2k
authored and
kevingranade
committed
Fix few lightning issues related to the new Sunlight map (#31307 )

KurzedMetal
authored and
kevingranade
committed
add fitness gym roofs

curstwist
authored and
kevingranade
committed
Merge pull request #31440 from KorGgenT/minor-magic-tweaks
kevingranade
authored
Merge pull request #31441 from KurzedMetal/fix-zero-clairvoyance-bug
kevingranade
authored
Fix UPS guns for multiple ammotype support
mark7
committed
[CR] Implement blackpowder fouling mechanics (#30985 )

Rail-Runner
authored and
kevingranade
committed
Update
Rail Runner
committed
allow bathtubs to be used as liquid storage (#31438 )

Korbofaux
authored and
kevingranade
committed
Merge pull request #31424 from Rail-Runner/acetic_acid
Rivet-the-Zombie
authored
Added motor boat spawns to the docks
Night-Pryanik
committed
Convert item charges to int
jbytheway
committed
Merge pull request #31449 from Night-Pryanik/motor-boat-spawn-at-the-docks
ZhilkinSerg
authored
Merge pull request #31443 from KorGgenT/spell-flags
ZhilkinSerg
authored
Merge pull request #31442 from mark7/wb-fix-ups-guns-multi-ammotype
ZhilkinSerg
authored
Optimization train (#31445 )

kevingranade
authored and
ZhilkinSerg
committed
fixed scrolling of traits window, fixed bionics window scrolling when it didn't need to (#31454 )

jagoly
authored and
ZhilkinSerg
committed
Merge pull request #31453 from jbytheway/item_charges_as_ints
ZhilkinSerg
authored
Fix astyle regression
ZhilkinSerg
committed
Merge pull request #31455 from ZhilkinSerg/astyle-2019-06-15
ZhilkinSerg
authored
New Tool Qualities/Tools to use them (#31419 )

ddsaw
authored and
ZhilkinSerg
committed
Hub 01 general mapgen additions (#31411 )

John-Candlebury
authored and
ZhilkinSerg
committed
obsolete realguns
ymber
committed
add 357mag to itemgroups
ymber
committed
add 357mag crafting
ymber
committed
clarify 357 types
ymber
committed
update speedloaders for .357
ymber
committed
fix blazemod ammo specifiers
ymber
committed
use time strings for vitamin rates
ymber
committed
lint json
ymber
committed
clean up player::read_speed
ymber
committed
avoid checking current ammo if RELOAD_AND_SHOOT
ymber
committed
add missing word
ymber
committed
Merge pull request #31459 from ymber/blazemod_ammo
ZhilkinSerg
authored
Merge pull request #31465 from ymber/archery_fix
ZhilkinSerg
authored
Merge pull request #31463 from ymber/read_time
ZhilkinSerg
authored
Merge pull request #31460 from ymber/vit_rate
ZhilkinSerg
authored
Merge pull request #31457 from ymber/ammo
ZhilkinSerg
authored
Merge pull request #31456 from ymber/erg
ZhilkinSerg
authored
Rancher gear and proffesion (#31320 )

hyper2snyper
authored and
ZhilkinSerg
committed
Style and fix json (#31469 )

jbytheway
authored and
ZhilkinSerg
committed
Use ints for invlets (#31468 )

jbytheway
authored and
ZhilkinSerg
committed
Avoid clang-tidy null pointer warnings (#31467 )

jbytheway
authored and
ZhilkinSerg
committed