Code

Merge master in#11

Code

Merged

I-am-Erk merged 118 commits intoI-am-Erk:flatpack1I-am-Erk/Cataclysm-DDA:flatpack1from CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardMay 24, 2019

+14,404-4,281

Commits

Commits on May 19, 2019

• mall miscellanious files

  Show description for f9f75b0
  curstwist

  committed
  f9f75b0

• 2nd story, roof enhancements

  Show description for 249315a
  curstwist

  committed
  249315a

Commits on May 20, 2019

• add fire barrels

  tinukedaya

  committed
  0f295ae

• Update data/json/recipes/recipe_others.json

  Show description for b67eced
  

  tinukedaya

  and

  Alexey Mostovoy

  authored
  b67eced

• Update data/json/recipes/recipe_others.json

  Show description for fd7e16f
  

  tinukedaya

  and

  Alexey Mostovoy

  authored
  fd7e16f

• Update furniture.json

  Show description for a108484
  tinukedaya

  committed
  a108484

Commits on May 21, 2019

• Update furniture.json

  Show description for 63d4740
  tinukedaya

  authored
  63d4740

• document constructions and remove time constant

  

  ymber

  committed
  781de6e

• Update data/json/furniture.json

  Show description for 202cd95
  

  tinukedaya

  and

  matskuman5

  authored
  202cd95

• Update data/json/items/tool/deployable.json

  Show description for 20bf7cb
  

  tinukedaya

  and

  matskuman5

  authored
  20bf7cb

• Update data/json/furniture.json

  Show description for 8a70b67
  

  tinukedaya

  and

  matskuman5

  authored
  8a70b67

• Update data/json/items/tool/deployable.json

  Show description for 98cd9a8
  

  tinukedaya

  and

  matskuman5

  authored
  98cd9a8

• Switch build configurations away from trusty

  Show description for 3151383
  jbytheway

  committed
  3151383

• Fix coverage CXXFLAGS code

  Show description for 16d7b8a
  jbytheway

  committed
  16d7b8a

• Improve .travis.yml comments

  jbytheway

  committed
  ceb41e2

• Try trimming down build somewhat

  jbytheway

  committed
  4ac9823

• Add clang-7, clang-8 Travis builds

  jbytheway

  committed
  f7ed718

• Disable clang-6 and -7 builds on PRs

  jbytheway

  committed
  ce1c718

• Don't install unnecessary 32-bit libraries

  Show description for ff73193
  jbytheway

  committed
  ff73193

Commits on May 22, 2019

• Merge pull request #30731 from ymber/construction_time

  Show description for 6f672ef
  kevingranade

  authored
  6f672ef

• Rock as a spare part

  

  RarkGrames

  authored and

  kevingranade

  committed
  6fa8374

• Merge pull request #30592 from jbytheway/revamp_clang_builds

  Show description for e84f574
  kevingranade

  authored
  e84f574

• Merge pull request #30693 from tinukedaya/Fire-barrels

  Show description for 41a408b
  Rivet-the-Zombie

  authored
  41a408b

• avatar::memorial

  Show description for 3f52a39
  

  KorGgenT

  authored and

  kevingranade

  committed
  3f52a39

• Moved Brawling martial art autolearn code to json

  Show description for 8224cc7
  Hymore246

  committed
  8224cc7

• Replaced battery spawn with full pocket batteries

  Inglonias

  authored
  4db4087

• Changed weight and volume values to be more realistic.

  Greevv

  committed
  19d63d6

• Fixed silly JSON error.

  Greevv

  committed
  e1988bd

• disp_name and skin_name

  KorGgenT

  committed
  3fa1083

• Fix missing declarations (#30739)

  Show description for f3049e5
  

  jbytheway

  authored and

  kevingranade

  committed
  f3049e5

• Linted JSON.

  Greevv

  committed
  373a61f

• stomach and guts

  KorGgenT

  committed
  9a011a4

• Fix copy-from for overmap specials

  ralreegorganon

  committed
  9ba420a

• Avoid undefined shift

  jbytheway

  committed
  158cba5

• Avoid uninitialized value in jmapgen_int

  jbytheway

  committed
  0058299

• NOLINT undefined shifts in legacy hash code

  jbytheway

  committed
  81309f4

• Enable clang-analyzer-core.UndefinedBinaryOperatorResult

  Show description for 0ebd6a7
  jbytheway

  committed
  0ebd6a7

• Remove legacy hash code

  Show description for 7fb60a5
  jbytheway

  committed
  7fb60a5

• Add a --user-dir option to the tests

  Show description for 54ce03a
  jbytheway

  committed
  54ce03a

• Use separate user_dir for modded tests

  Show description for 82ab429
  jbytheway

  committed
  82ab429

• Astyle typo fixes

  Hymore246

  committed
  c7a1729

• Update MARTIALART_JSON.md

  Hymore246

  committed
  97e9876

• Saving some future person a bunch of time

  Mooses2k

  committed
  39f03ba

• Add clean water to makeshift steam engine recipe

  Show description for ba291f1
  jmattspartacus

  committed
  ba291f1

Commits on May 23, 2019

• move item_group

  Show description for 8f41913
  curstwist

  committed
  8f41913

• fixed typo in NR-031 description

  Show description for 6dfed79
  

  TheMurderUnicorn

  authored and

  kevingranade

  committed
  6dfed79

• acorn_roasted: remove duplicate entry for itype acorn_roasted

  Show description for e087975
  

  OrenAudeles

  authored and

  kevingranade

  committed
  e087975

• Added empty newline at the end of the file to satisfy the JSON linting gods.

  Greevv

  committed
  829967a

• Merge pull request #30756 from jbytheway/clang_tidy_undefined_binary_operator_result

  Show description for a5904e6
  kevingranade

  authored
  a5904e6

• Merge pull request #30764 from jbytheway/avoid_parallel_test_races

  Show description for 2db2ed1
  kevingranade

  authored
  2db2ed1

• Merge pull request #30752 from Greevv/ferro-rail-fix

  Show description for 25389a7
  Rivet-the-Zombie

  authored
  25389a7

• Move hydroponics mod folders out of a subfolder

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  b0a976c

• Merge pull request #30749 from Inglonias/fix-bandit-tower

  Show description for 5ca0b2e
  ZhilkinSerg

  authored
  5ca0b2e

• Merge pull request #30748 from Hymore246/brawling-autolearn

  Show description for f36fa8d
  ZhilkinSerg

  authored
  f36fa8d

• Merge pull request #30765 from Mooses2k/update-compiling.md

  Show description for 0d6fcdc
  ZhilkinSerg

  authored
  0d6fcdc

• Merge pull request #30766 from jmattspartacus/Clean-Water-Steam-Engines

  Show description for bca1d09
  ZhilkinSerg

  authored
  bca1d09

• Merge pull request #30760 from ralreegorganon/fix-overmap-special-copy-from

  Show description for 73abb7a
  ZhilkinSerg

  authored
  73abb7a

• Restore minimap enemy blink/fade functionality (#30745)

  Show description for 6f28ce1
  

  esotericist

  authored and

  ZhilkinSerg

  committed
  6f28ce1

• Fixes cell phone and talking doll weirdness (#30742)

  Show description for 1fb5681
  

  Inglonias

  authored and

  ZhilkinSerg

  committed
  1fb5681

• Game report: add precise version and name for systems. (#30729)

  Show description for 63b649f
  

  neitsa

  authored and

  ZhilkinSerg

  committed
  63b649f

• Robot salvage system (#30456)

  Show description for 90c58fa
  

  Fris0uman

  authored and

  kevingranade

  committed
  90c58fa

• Merge pull request #30637 from curstwist/add-mall-2nd-floor-and-more-roof

  Show description for efcd359
  kevingranade

  authored
  efcd359

• Add AT4 (#30734)

  Show description for d0ab06a
  

  Phenomphear

  authored and

  kevingranade

  committed
  d0ab06a

• Merge pull request #30758 from KorGgenT/Character

  Show description for a977890
  kevingranade

  authored
  a977890

• Fix some typos in uninstall bionic (#30763)

  Show description for 093c7ea
  

  Fris0uman

  authored and

  kevingranade

  committed
  093c7ea

• Suppress float loop counter warnings

  Show description for 21e21c9
  jbytheway

  committed
  21e21c9

• Switch a loop counter from double to int

  Show description for d1d069d
  jbytheway

  committed
  d1d069d

• Enable clang-analyzer-security.FloatLoopCounter

  Show description for 081bef7
  jbytheway

  committed
  081bef7

• Add -Wmissing-declarations

  Show description for 22b10a5
  jbytheway

  committed
  22b10a5

• Mark some function inline in the json formatter

  jbytheway

  committed
  ec16e32

• Declare some wincurses functions static

  jbytheway

  committed
  28860a9

• Rearrange a bunch of debug OS version functions

  Show description for 6ff60d7
  jbytheway

  committed
  6ff60d7

• Another recently added function should be static

  jbytheway

  committed
  58f5393

• Update bandit_tower_3blc_03.json

  ZhilkinSerg

  authored
  5166ac7

• Fix save/load of avatar-specific variables

  Show description for ed96404
  

  ifreund

  authored and

  kevingranade

  committed
  ed96404

• player log: strip carriage returns from memorial log lines

  OrenAudeles

  committed
  f499359

• Merge pull request #30759 from jbytheway/missing_declarations

  Show description for 30f4e97
  kevingranade

  authored
  30f4e97

• Merge pull request #30774 from jbytheway/clang_tidy_float_loop_counter

  Show description for f22277c
  kevingranade

  authored
  f22277c

• DP tileset update

  

  SomeDeadGuy

  committed
  f483bd5

• Fix missing type in variable declaration for Android.

  neitsa

  committed
  c92030c

• Merge pull request #30786 from OrenAudeles/strip_carriage_return

  Show description for 2b5b468
  ZhilkinSerg

  authored
  2b5b468

• Merge pull request #30790 from neitsa/fix/android_version

  Show description for d87d05e
  ZhilkinSerg

  authored
  d87d05e

• Merge pull request #30787 from SomeDeadGuy/DP_TilesetUpdate

  Show description for 810ebc2
  ZhilkinSerg

  authored
  810ebc2

• Adds fence terrains (#30762)

  Show description for e8e7712
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  e8e7712

• Fix a cast error with Windows gcc-based compilers. (#30792)

  Show description for 9014897
  

  neitsa

  authored and

  ZhilkinSerg

  committed
  9014897

• Merge pull request #30775 from CleverRaven/fix-mod-bandit-batteries

  Show description for 57f85c0
  ZhilkinSerg

  authored
  57f85c0

• Extended descriptions for terrain and furniture (#30610)

  Show description for a65abf4
  

  Mooses2k

  authored and

  ZhilkinSerg

  committed
  a65abf4

• Astyle

  ZhilkinSerg

  committed
  0d804df

• Merge pull request #30793 from ZhilkinSerg/fix-astyle-2019-05-24

  Show description for 11d9d7b
  ZhilkinSerg

  authored
  11d9d7b

Commits on May 24, 2019

• add roof to tire shop

  Show description for ae3cdd5
  curstwist

  committed
  ae3cdd5

• [CR] Electrical damage has a chance to temporarily incapacitate bionics (#29485)

  Show description for 35f8c60
  

  thquinn

  authored and

  kevingranade

  committed
  35f8c60

• Change handmade carbine to accept factory-made magazines as well (#30773)

  Show description for 8f8b616
  

  Rail-Runner

  authored and

  kevingranade

  committed
  8f8b616

• Beggars 2: implement actual begging and begin to add a simple storyline (#30355)

  Show description for e15ac96
  

  I-am-Erk

  authored and

  kevingranade

  committed
  e15ac96

• spell learning

  

  KorGgenT

  authored and

  kevingranade

  committed
  4ad4cae

• move bmi and activity level

  

  KorGgenT

  authored and

  kevingranade

  committed
  164d970

• Adjust coverage of Travis builds (#30768)

  Show description for 447ad3f
  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  447ad3f

• Merge pull request #30797 from curstwist/add-tire-shop-roof

  Show description for 69aef8e
  Rivet-the-Zombie

  authored
  69aef8e

• Set clang-tidy header filter

  Show description for e9a1290
  jbytheway

  committed
  e9a1290

• Merge pull request #30799 from jbytheway/clang_tidy_header_filter

  Show description for 58fdd83
  ZhilkinSerg

  authored
  58fdd83

• Make free functions static to supress missing declarations errors

  ZhilkinSerg

  committed
  fbc616a

• Merge pull request #30800 from ZhilkinSerg/fix-missing-declaration-errors

  Show description for d1a2d23
  ZhilkinSerg

  authored
  d1a2d23

• Replace typedef with using

  Show description for 98103e0
  jbytheway

  committed
  98103e0

• Build chkjson on Travis

  Show description for 419ce85
  jbytheway

  committed
  419ce85

• Try union workaround to function cast warning

  Show description for 0434c76
  jbytheway

  committed
  0434c76

• ignore some warnings in visual studio

  KorGgenT

  committed
  4744eb3

• Merge pull request #30803 from jbytheway/function_cast_workaround

  Show description for f14fa7a
  ZhilkinSerg

  authored
  f14fa7a

• Merge pull request #30804 from KorGgenT/VS-ignore-warnings

  Show description for 0c4f784
  ZhilkinSerg

  authored
  0c4f784

• Merge pull request #30802 from jbytheway/chkjson_on_travis

  Show description for e67819e
  ZhilkinSerg

  authored
  e67819e

• Merge pull request #30801 from jbytheway/typedef_to_using

  Show description for a382891
  ZhilkinSerg

  authored
  a382891

• clang-tidy: Enable modernize-use-using

  Show description for 5f8de7d
  jbytheway

  committed
  5f8de7d

• Add missing conversion from std::string to char*.

  neitsa

  committed
  707c506

• Merge pull request #30805 from jbytheway/clang_tidy_use_using

  Show description for 118324b
  ZhilkinSerg

  authored
  118324b

• move Newchar functions to avatar from player (#30806)

  Show description for 0663c24
  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  0663c24

• Improved changelog generator (#30724)

  Show description for d26d536
  

  KurzedMetal

  authored and

  ZhilkinSerg

  committed
  d26d536

• spell effects (#30428)

  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  2660bc3

• Merge pull request #30811 from neitsa/fix/android_system_version

  Show description for a036fae
  ZhilkinSerg

  authored
  a036fae

• Added three new martial art buff events (#30633)

  Show description for 8403903
  

  Hymore246

  authored and

  ZhilkinSerg

  committed
  8403903

• Faction ownership and thievery (#29834)

  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  4985bb0