Code

merge upstream#7

Code

Closed

I-am-Erk wants to merge 186 commits intoI-am-Erk:masterI-am-Erk/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboard

+24,694-7,892

Commits

Commits on Jan 22, 2019

• add cop to bg groups

  I-am-Erk

  authored
  858234e

• add cop_3 bgss trait

  I-am-Erk

  authored
  2b9c3c6

• Create cop_3.json

  Show description for 5ecf3f2
  I-am-Erk

  authored
  5ecf3f2

• add cop_3 to background TOC

  I-am-Erk

  authored
  16cc622

• finish cop3

  I-am-Erk

  authored
  49c3181

• Update cop_3.json

  Show description for d4ce053
  I-am-Erk

  authored
  d4ce053

• Update cop_3.json

  Show description for 2d44a3d
  I-am-Erk

  authored
  2d44a3d

• Update cop_3.json

  Show description for 96c2044
  I-am-Erk

  authored
  96c2044

• Update evacuee_1.json

  Show description for e8ff5a1
  I-am-Erk

  authored
  e8ff5a1

• Update evacuee_3.json

  Show description for 9720ee5
  I-am-Erk

  authored
  9720ee5

• Update evacuee_3.json

  Show description for 97bf6d3
  I-am-Erk

  authored
  97bf6d3

Commits on Jan 23, 2019

• Address a use-after-erase in zone deserialization error handling

  Show description for 1c7e2cb
  kevingranade

  authored
  1c7e2cb

• Only find zones on same z-level.

  ifreund

  committed
  56bbae8

• Fix type

  kevingranade

  authored
  b80432b

• More SDL mappings

  Show description for 43f1f2b
  jbytheway

  committed
  43f1f2b

• Update dev tooling docs

  Show description for a5bf38f
  jbytheway

  committed
  a5bf38f

• Fix missing include in posix_time.cpp

  Show description for 50bd125
  jbytheway

  committed
  50bd125

• Update nuts.json

  hyper2snyper

  authored
  defba3c

• Merge pull request #27811 from jbytheway/missing_cerrno_include

  Show description for 8740acf
  ZhilkinSerg

  authored
  8740acf

• Merge pull request #27810 from jbytheway/iwyu_sdl_fixes

  Show description for 5a71779
  ZhilkinSerg

  authored
  5a71779

• Merge pull request #27806 from ifreund/zone-z-levels

  Show description for 8e71a4e
  ZhilkinSerg

  authored
  8e71a4e

• Merge pull request #27812 from hyper2snyper/NutFix

  Show description for eec7977
  ZhilkinSerg

  authored
  eec7977

• Fix player lighting walls at night

  Show description for 2e14661
  jbytheway

  committed
  2e14661

• Vision test for player lighting at night

  Show description for be8f6ce
  jbytheway

  committed
  be8f6ce

Commits on Jan 24, 2019

• Remove coreutils from travis-ci homebrew list

  

  ralreegorganon

  authored and

  kevingranade

  committed
  e52615d

• Food results nutrition (#27252)

  Show description for 475301c
  

  KorGgenT

  authored and

  kevingranade

  committed
  475301c

• Recipe Rebalance (#27542)

  Show description for 3d707cd
  

  KorGgenT

  authored and

  kevingranade

  committed
  3d707cd

• Fixed check of option prerequisites (#27735)

  Show description for be1b069
  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  be1b069

• Wind direction generation / tweaks of windpower (#27772)

  Show description for e64e832
  

  davidpwbrown

  authored and

  kevingranade

  committed
  e64e832

• Mutations - generic_factory (#27774)

  

  Kelenius

  authored and

  kevingranade

  committed
  82d1363

• Make route_adjacent non-static (#27798)

  

  prutschman

  authored and

  kevingranade

  committed
  72c428c

• Fix morale decay check frequency (#27803)

  Show description for ca7031a
  

  davidpwbrown

  authored and

  kevingranade

  committed
  ca7031a

• Merge pull request #27814 from jbytheway/night_light_sources

  Show description for 9572152
  kevingranade

  authored
  9572152

• Create activity for control laptop (#27816)

  Show description for e089877
  

  ifreund

  authored and

  kevingranade

  committed
  e089877

• Merge pull request #27783 from I-am-Erk/npc_cop_3

  Show description for 71ef81f
  Rivet-the-Zombie

  authored
  71ef81f

• Astyle weather_gen (#27822)

  

  Alexey Mostovoy

  authored and

  kevingranade

  committed
  096dabd

• Add reactir flag to vehicle part bitfield.

  kevingranade

  committed
  b872857

• Optimize inbounds checks.

  kevingranade

  committed
  de1c45c

• Fix crash when stacking items

  GoLoT

  committed
  19b6183

• made cockroach nymph less aggressive

  

  davidpwbrown

  committed
  fbc4ca0

• reverted melee-cut

  

  davidpwbrown

  committed
  434d331

• fixed weather reader windchill display

  

  davidpwbrown

  committed
  820fef5

• Update src/map.cpp

  Show description for 40966af
  

  ZhilkinSerg

  and

  kevingranade

  authored
  40966af

• Merge pull request #27833 from davidpwbrown/weather_reader_fix

  Show description for 327fea8
  ZhilkinSerg

  authored
  327fea8

• Merge pull request #27828 from GoLoT/componentstacking_tempfix

  Show description for 06ff7da
  ZhilkinSerg

  authored
  06ff7da

• Merge pull request #27805 from CleverRaven/kevingranade-fix-use-after-erase-zone-deserialize

  Show description for e90b1ed
  ZhilkinSerg

  authored
  e90b1ed

• Merge pull request #27825 from kevingranade/optimize-inbounds

  Show description for a8f1cdf
  ZhilkinSerg

  authored
  a8f1cdf

• Merge pull request #27829 from davidpwbrown/nymph_fix

  Show description for 0525397
  ZhilkinSerg

  authored
  0525397

• Fixed graphic options check

  Show description for d9b52e7
  ZhilkinSerg

  committed
  d9b52e7

• Additional guards in draw_benchmark debug function

  ZhilkinSerg

  committed
  05e443d

• added terrain blocking to wind turbine and upped its power

  

  davidpwbrown

  committed
  7b14660

• removed test code

  

  davidpwbrown

  committed
  20079e8

• removd more redundant code

  

  davidpwbrown

  committed
  44a0c97

• changed comment

  

  davidpwbrown

  committed
  4ec2616

• removed include

  

  davidpwbrown

  committed
  796eb3d

Commits on Jan 25, 2019

• add skinning butchery action

  KorGgenT

  committed
  6a6570e

• if already skinned, won't drop additional skins.

  KorGgenT

  committed
  8dfe1a9

• Merge pull request #27840 from ZhilkinSerg/android-graphics-options

  Show description for 28c87d1
  kevingranade

  authored
  28c87d1

• minor recipe tweaks

  

  KorGgenT

  authored and

  kevingranade

  committed
  6a8e1f9

• minor recipe tweaks

  

  KorGgenT

  authored and

  kevingranade

  committed
  3177adb

• Added stab damage to sojutsu

  Show description for ca13842
  

  Hymore246

  authored and

  kevingranade

  committed
  ca13842

• Added stab damage to sojutsu

  Show description for 6c3cbcd
  

  Hymore246

  authored and

  kevingranade

  committed
  6c3cbcd

• Fix looks_like for memorized tiles

  Show description for f286ca0
  

  jbytheway

  authored and

  kevingranade

  committed
  f286ca0

• Merge pull request #27787 from I-am-Erk/npc-evacuee1-time

  Show description for f81e175
  Rivet-the-Zombie

  authored
  f81e175

• Merge remote-tracking branch 'origin/pr/27849' into 0.D-branch

  Show description for b58b1f2
  kevingranade

  committed
  b58b1f2

• Disallow pseudo items in crafting component selection

  

  ifreund

  authored and

  kevingranade

  committed
  dd3cfb2

• Fix looks_like for memorized tiles

  Show description for ef24fa6
  

  jbytheway

  authored and

  kevingranade

  committed
  ef24fa6

• Merge pull request #27849 from KorGgenT/skinning

  Show description for c2b20ef
  kevingranade

  authored
  c2b20ef

• Disallow pseudo items in crafting component selection

  

  ifreund

  authored and

  kevingranade

  committed
  1aeee0e

• Add (failing) map bounds checking test

  kevingranade

  committed
  1c1d7bf

• Apply virtual tag to map::inbounds so tinymap can override it

  kevingranade

  committed
  407494e

• Restore previous bounds for tinymaps.

  kevingranade

  committed
  7ea5c49

• Fix recipe output portions for junkfood.json entries

  

  Alexander Rowland

  committed
  2eba6a2

• Rename hot dog cooked, uncooked to be singular

  Show description for c831b9e
  

  Alexander Rowland

  committed
  c831b9e

• Move number of charges for corrected junkfood portions into recipes

  

  Alexander Rowland

  committed
  a561917

• Add missing i18n on sidebar

  BrettDong

  committed
  9007d16

• Routine i18n updates as of Jan 25, 2019 based on master branch

  BrettDong

  committed
  1c793b9

• Merge pull request #27853 from kevingranade/fix-inbounds-override

  Show description for beb5d09
  ZhilkinSerg

  authored
  beb5d09

• Merge pull request #27860 from BrettDong/i18n-fix

  Show description for 95f66e3
  ZhilkinSerg

  authored
  95f66e3

• Merge pull request #27861 from BrettDong/i18n-master

  Show description for 5a18119
  ZhilkinSerg

  authored
  5a18119

• Fix spelling of 'acquire'

  

  reinerh

  authored and

  kevingranade

  committed
  44abf4a

• Fix spelling of 'acquire'

  

  reinerh

  authored and

  kevingranade

  committed
  857bd71

Commits on Jan 26, 2019

• Update RetroDays - Buildings, bionics

  

  halfahermit

  authored and

  kevingranade

  committed
  69e5ca3

• Unguard variable declaration

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  ec0e3ee

• Only setup prompt for prying tool if it will actually be displayed

  Show description for 516c1f0
  

  ThinkInvis

  authored and

  kevingranade

  committed
  516c1f0

• Make map deconstructor virtual

  

  ifreund

  authored and

  kevingranade

  committed
  42eeab0

• Quick fix for map memory crash when drawing a destroyed vehicle tile

  

  GoLoT

  authored and

  kevingranade

  committed
  293e103

• fix(butcher): fix "cut up everything" message for low morale

  Show description for 07d6219
  

  Insineer

  authored and

  kevingranade

  committed
  07d6219

• Merge branch '0.D-branch'

  Show description for 5c4dcac
  kevingranade

  committed
  5c4dcac

• Special bionic installation messages for Prototype mutants and masochists (#27749)

  Show description for 72e801b
  

  Firestorm01X2

  authored and

  kevingranade

  committed
  72e801b

• Increase duration of most morale effects

  rselias

  committed
  1391c34

• JSONizing CBM slot feature (#27780)

  Show description for ca3a26e
  

  Firestorm01X2

  authored and

  kevingranade

  committed
  ca3a26e

• Boost vehicle interior heating.

  

  DeltaEpsilon7787

  authored and

  kevingranade

  committed
  3bb94ce

• Boost vehicle interior heating.

  

  DeltaEpsilon7787

  authored and

  kevingranade

  committed
  34cad8d

• added terrain blocking to wind turbine and upped its power

  

  davidpwbrown

  authored and

  kevingranade

  committed
  da0d8a3

• added terrain blocking to wind turbine and upped its power

  

  davidpwbrown

  authored and

  kevingranade

  committed
  0d7b11a

• Moved windgen variables to region json (#27848)

  Show description for 2c2b384
  

  davidpwbrown

  authored and

  kevingranade

  committed
  2c2b384

• npctalk: move NPC needs to JSON (#27858)

  Show description for ff845a0
  

  mlangsdorf

  authored and

  kevingranade

  committed
  ff845a0

• zombie dance dance coach instructor 3k

  

  nsklaus

  authored and

  kevingranade

  committed
  5da8e39

• Update main.cpp header comment

  Show description for 3c087f8
  jbytheway

  committed
  3c087f8

• npctalk: NPC AI follower rules to JSON

  Show description for 5cd6b13
  mlangsdorf

  committed
  5cd6b13

• Disable starting_items test on Clang ASan CI

  Show description for abbaad3
  jbytheway

  committed
  abbaad3

• Deduplicate divide_round_up functions

  Show description for 4aded44
  jbytheway

  committed
  4aded44

• Bind '?' to open_keybindings by default

  Show description for 38ee48b
  jbytheway

  committed
  38ee48b

• Fix Medieval Stuff martial style traits

  ifreund

  committed
  9dbc892

• Merge pull request #27894 from jbytheway/unnecessary_comment

  Show description for e73e57c
  Rivet-the-Zombie

  authored
  e73e57c

Commits on Jan 27, 2019

• Add pry 1 to toolbox

  ifreund

  committed
  3c8c40c

• Merge pull request #27914 from ifreund/toolbox-add-pry

  Show description for a9341fb
  Rivet-the-Zombie

  authored
  a9341fb

• Merge pull request #27909 from jbytheway/divide_round_up_dedupe

  Show description for abcfbdb
  ZhilkinSerg

  authored
  abcfbdb

• Merge pull request #27904 from jbytheway/disable_starting_items_test_on_clang_asan

  Show description for 7142526
  ZhilkinSerg

  authored
  7142526

• Merge pull request #27846 from davidpwbrown/turbine_forest_wind

  Show description for b3d915b
  ZhilkinSerg

  authored
  b3d915b

• Merge pull request #27857 from prestidigitation/fix-food-recipe-portions

  Show description for fa8ccb2
  ZhilkinSerg

  authored
  fa8ccb2

• Merge pull request #27859 from mlangsdorf/npctalk_ally_rules

  Show description for 7e78b20
  ZhilkinSerg

  authored
  7e78b20

• Add pry one to items containg hammers

  ifreund

  committed
  981f9c8

• Serialize recipe charges

  ifreund

  committed
  f64c567

• npctalk: move almost all dialogue into JSON

  Show description for 6a0277e
  mlangsdorf

  committed
  6a0277e

• Add missing i18n on sidebar

  

  BrettDong

  authored and

  ZhilkinSerg

  committed
  b40866e

• Fix recipe output portions for junkfood.json entries

  

  Alexander Rowland

  authored and

  ZhilkinSerg

  committed
  1fd7cb8

• Rename hot dog cooked, uncooked to be singular

  Show description for 62b3e14
  

  Alexander Rowland

  authored and

  ZhilkinSerg

  committed
  62b3e14

• Move number of charges for corrected junkfood portions into recipes

  

  Alexander Rowland

  authored and

  ZhilkinSerg

  committed
  0684bde

• npc: fix NPC followers not closing doors

  Show description for af625fc
  mlangsdorf

  committed
  af625fc

Commits on Jan 28, 2019

• Fixing minor typo in sewer gator description

  MetroidHunter

  committed
  8675561

• Fix some typos

  Cyrano7

  committed
  d969df7

• Trim some more spaces

  Cyrano7

  committed
  34508ce

• Adjust bio_tools description to the real features

  l29ah

  committed
  df42daf

• Fix change to NPC train persuade chance

  Show description for 27f5f2d
  mscarter

  committed
  27f5f2d

• Merge pull request #27933 from MetroidHunter/bugfix/fix_minor_description_for_sewer_gator

  Show description for 2dd2bc1
  Rivet-the-Zombie

  authored
  2dd2bc1

• Merge pull request #27940 from paroid01/fix_train_persuade

  Show description for cd40817
  ZhilkinSerg

  authored
  cd40817

• Merge pull request #27936 from Cyrano7/Typos

  Show description for 9782187
  ZhilkinSerg

  authored
  9782187

• Merge pull request #27932 from mlangsdorf/npc_close_door_fix

  Show description for e4d4227
  ZhilkinSerg

  authored
  e4d4227

• Merge pull request #27931 from l29ah/toolset-desc

  Show description for 24f4cdd
  ZhilkinSerg

  authored
  24f4cdd

• fix_fallback_tiles_rotation (#27930)

  Show description for 4c3ee92
  

  nsklaus

  authored and

  ZhilkinSerg

  committed
  4c3ee92

• Merge pull request #27918 from ifreund/add-pry-to-hammer-recipes

  Show description for e1e4791
  ZhilkinSerg

  authored
  e1e4791

• Merge pull request #27920 from ifreund/serialize-recipe-charges

  Show description for c5477a4
  ZhilkinSerg

  authored
  c5477a4

• Merge pull request #27906 from ifreund/fix-medieval-style-traits

  Show description for 9e8d055
  ZhilkinSerg

  authored
  9e8d055

• Light eater cancels rapid metabolism (#27896)

  Show description for ccd1afc
  

  sneeze-attack

  authored and

  ZhilkinSerg

  committed
  ccd1afc

• Merge pull request #27910 from jbytheway/default_keybindings_keybinding

  Show description for 8efc667
  ZhilkinSerg

  authored
  8efc667

• npctalk: NPC AI follower rules to JSON

  Show description for c3bc827
  

  mlangsdorf

  authored and

  ZhilkinSerg

  committed
  c3bc827

• Fix change to NPC train persuade chance

  Show description for 21bb648
  

  mscarter

  authored and

  ZhilkinSerg

  committed
  21bb648

• Fix some typos

  

  Cyrano7

  authored and

  ZhilkinSerg

  committed
  d9124c5

• Trim some more spaces

  

  Cyrano7

  authored and

  ZhilkinSerg

  committed
  0290729

• npc: fix NPC followers not closing doors

  Show description for 5203009
  

  mlangsdorf

  authored and

  ZhilkinSerg

  committed
  5203009

• Adjust bio_tools description to the real features

  

  l29ah

  authored and

  ZhilkinSerg

  committed
  2f026bb

• fix_fallback_tiles_rotation

  

  nsklaus

  authored and

  ZhilkinSerg

  committed
  e28b5bc

• Serialize recipe charges

  

  ifreund

  authored and

  ZhilkinSerg

  committed
  8d49ad6

• Add pry one to items containg hammers

  

  ifreund

  authored and

  ZhilkinSerg

  committed
  e827405

• Fix Medieval Stuff martial style traits

  

  ifreund

  authored and

  ZhilkinSerg

  committed
  846ecdc

• Light eater cancels rapid metabolism

  

  sneeze-attack

  authored and

  ZhilkinSerg

  committed
  15b6acd

• Bind '?' to open_keybindings by default

  Show description for 5ea2e59
  

  jbytheway

  authored and

  ZhilkinSerg

  committed
  5ea2e59

• Rapid metabolism made purifiable

  sneeze-attack

  authored
  9294d34

• Lint ammo json

  ifreund

  committed
  efdbc7d

• Merge pull request #27951 from ifreund/lint-ammo

  Show description for e02117f
  ZhilkinSerg

  authored
  e02117f

• Merge pull request #27901 from mlangsdorf/npctalk_ally_to_json

  Show description for 77d5cf2
  ZhilkinSerg

  authored
  77d5cf2

• Merge pull request #27890 from rselias/morale_balance

  Show description for 4a0bc2d
  ZhilkinSerg

  authored
  4a0bc2d

Commits on Jan 29, 2019

• Fix crafting resumption

  Show description for ae0d1a8
  

  jbytheway

  authored and

  kevingranade

  committed
  ae0d1a8

• Add test for resuming interrupted crafts

  Show description for 076ce95
  

  jbytheway

  authored and

  kevingranade

  committed
  076ce95

• fix power value placement

  

  nsklaus

  authored and

  kevingranade

  committed
  19183d1

• Changed Inanition to a more general commonly understood term.

  

  Treah

  authored and

  kevingranade

  committed
  19d38d7

• Reorder item variables for efficient packing

  

  OrenAudeles

  authored and

  kevingranade

  committed
  bac0975

• Reduced lethality of tear gas to rough estimate of IRL, leaning towards the deadly side.

  Show description for 51bf7a2
  

  jeremyshannon

  authored and

  kevingranade

  committed
  51bf7a2

• Checking for wielded card when withdrawing cash from ATM

  

  MetroidHunter

  authored and

  kevingranade

  committed
  c66f538

• Add (failing) map bounds checking test

  kevingranade

  committed
  3d2fb09

• Apply virtual tag to map::inbounds so tinymap can override it

  kevingranade

  committed
  5ae2e4b

• Restore previous bounds for tinymaps.

  kevingranade

  committed
  c80dcde

• Increase duration of most morale effects

  

  rselias

  authored and

  kevingranade

  committed
  3dd53d2

• JSONizing CBM slot feature (#27780)

  Show description for 6c27147
  

  Firestorm01X2

  authored and

  kevingranade

  committed
  6c27147

• npctalk: move NPC needs to JSON (#27858)

  Show description for ff2d308
  

  mlangsdorf

  authored and

  kevingranade

  committed
  ff2d308

• Support nested color tags

  Show description for a29a4b3
  

  jbytheway

  authored and

  kevingranade

  committed
  a29a4b3

• Fixing position of morale and power on skinny siderbar

  MetroidHunter

  committed
  1c46208

• Merge branch '0.D-branch'

  kevingranade

  committed
  51ee54e

• Merge branch 'master' into bugfix/CDDA-27927_fix_morale_horizontal_interface

  MetroidHunter

  authored
  bccc1e8

• Merge pull request #27946 from sneeze-attack/rapmet_update

  Show description for 88c8f68
  Rivet-the-Zombie

  authored
  88c8f68

• Make dollchat items display their speech lines again

  hbnix

  committed
  6a60e93

• Adding const correctness for morale horizontal bool

  MetroidHunter

  committed
  dbacaa6

• Merge branch 'bugfix/CDDA-27927_fix_morale_horizontal_interface' of github.com:MetroidHunter/Cataclysm-DDA into bugfix/CDDA-27927_fix_morale_horizontal_interface

  MetroidHunter

  committed
  013d478

• Add lab gates

  sneeze-attack

  committed
  9d763b0

• Add lab-specific terrain

  sneeze-attack

  committed
  bdb7d16

• Switch to lab terrain

  sneeze-attack

  committed
  91e61c3

• Add lab terrain

  sneeze-attack

  committed
  945b08d

Commits on Jan 30, 2019

• RetroAscii tileset - cleanup, update, lint

  halfahermit

  committed
  57f0ab6

• Update gfx/RetroASCIITileset/tile_config.json

  halfahermit

  authored
  8a43072

• Merge pull request #27956 from MetroidHunter/bugfix/CDDA-27927_fix_morale_horizontal_interface

  Show description for 046b8c0
  Rivet-the-Zombie

  authored
  046b8c0

• Fixed cyan color in COLOR.md (#27969)

  Show description for 5a949a1
  

  int-ua

  authored and

  ZhilkinSerg

  committed
  5a949a1

• RetroAscii tileset - cleanup and update (#27966)

  Show description for 0840d8c
  ZhilkinSerg

  authored
  0840d8c

• Merge pull request #27958 from hbnix/fix_dollchat_speech_not_displaying

  Show description for 7f34f29
  ZhilkinSerg

  authored
  7f34f29

• Merge pull request #27962 from sneeze-attack/floorfix_lab

  Show description for f53995c
  ZhilkinSerg

  authored
  f53995c