Code

Follow up#50

Code

Merged

Soupster89 merged 54 commits intoSoupster89:masterSoupster89/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardFeb 21, 2020

+32,675-1,338

Commits

Commits on Feb 15, 2020

• Tweak mapgen for animal pound

  arijust

  authored
  e25ef72

Commits on Feb 17, 2020

• Raised chances for monster spawns.

  arijust

  authored
  941e9de

Commits on Feb 18, 2020

• Tweak mapgen.

  arijust

  authored
  1b7b073

• Tweaks.

  arijust

  authored
  1c58018

• Further tweaks.

  arijust

  authored
  6b3aa63

• Final tweaks.

  arijust

  authored
  fb8a107

• Move activity_id and itype_id definition

  ZhilkinSerg

  committed
  0e609a4

• Removed redundant empty lines

  ZhilkinSerg

  committed
  cbac63b

• Removed redundant empty statements

  ZhilkinSerg

  committed
  c652b96

• Removed non-implemented functions

  ZhilkinSerg

  committed
  40e2c32

• Removed unused declarator

  ZhilkinSerg

  committed
  e9ad1c3

• Combined var declaration and assignment

  ZhilkinSerg

  committed
  801dcd7

• Reverse position of parking.

  Show description for 53cc3ba
  arijust

  authored
  53cc3ba

Commits on Feb 19, 2020

• Apply suggestions from code review

  ZhilkinSerg

  authored
  5d4be2c

• Move string consts

  Ramza13

  committed
  c2ba6db

Commits on Feb 20, 2020

• Merge pull request #38141 from ZhilkinSerg/sa-2020-02-18

  Show description for 142295b
  kevingranade

  authored
  142295b

• Put BrownLikeBears in the repo (#38136)

  Fris0uman

  authored
  b1865fe

• Create lore.md

  KorGgenT

  committed
  aeaff85

• Update type of 22_casing_new (#38172)

  Show description for 24a32c0
  Kilvoctu

  authored
  24a32c0

• Merge pull request #38168 from Ramza13/even_more_string_consts

  Show description for 2bf1c1e
  ZhilkinSerg

  authored
  2bf1c1e

• Auto-travel; prompt when overburdened, and allow stamina-resting (#38113)

  

  davidpwbrown

  authored
  bac0389

• Don't penalize strong characters for dragging

  Show description for ad087d4
  wapcaplet

  committed
  ad087d4

• Move string consts/rename string consts

  Ramza13

  committed
  e6cb983

• Merge pull request #38177 from wapcaplet/drag-while-strong

  Show description for 256c539
  ZhilkinSerg

  authored
  256c539

• Move more string consts into single file (#38169)

  Ramza13

  authored
  07995cd

• Merge pull request #38176 from Ramza13/string_consts_and_more

  Show description for 9c9835f
  ZhilkinSerg

  authored
  9c9835f

• Move more string consts into single file (#38175)

  Ramza13

  authored
  571efb2

• Merge pull request #38174 from KorGgenT/magic-lore-text

  Show description for f5babd6
  Rivet-the-Zombie

  authored
  f5babd6

• Prevent monsters from leaping to their death in water (#38150)

  jkraybill

  authored
  f3fbeb8

• Move string consts into single file (#38181)

  Ramza13

  authored
  55cabb7

• Magazine name to object

  snipercup

  committed
  fc61e64

• Added "Trap Back button" option to Android prelaunch menu

  ZhilkinSerg

  committed
  6169bce

• Updated Android build process

  Show description for b4fcb44
  ZhilkinSerg

  authored
  b4fcb44

• Merge pull request #38187 from CleverRaven/android-2020-02-21

  Show description for 4851348
  ZhilkinSerg

  authored
  4851348

• Merge pull request #36870 from ZhilkinSerg/android-2019-12-29

  Show description for b8cd4c0
  ZhilkinSerg

  authored
  b8cd4c0

• Merge pull request #38186 from snipercup/Magazine-name-to-object-2

  Show description for 123f1b6
  ZhilkinSerg

  authored
  123f1b6

• Move string consts into single file (#38184)

  Ramza13

  authored
  19c5698

• More string consts into single file (#38183)

  Ramza13

  authored
  05940bf

• Add missing row.

  arijust

  authored
  0142e23

• Bionic name to object

  snipercup

  committed
  f304837

• Magazine name to object

  snipercup

  committed
  34ac021

Commits on Feb 21, 2020

• Alphabetize the debug skill wishlist

  Show description for 471a2d3
  wapcaplet

  committed
  471a2d3

• Merge pull request #38191 from snipercup/Magazine-name-to-object

  Show description for d73a8b9
  ZhilkinSerg

  authored
  d73a8b9

• Merge pull request #38188 from snipercup/Bionic-name-to-object

  Show description for feb8e6b
  ZhilkinSerg

  authored
  feb8e6b

• Merge pull request #38194 from wapcaplet/debug-sort-skills

  Show description for eda55f9
  ZhilkinSerg

  authored
  eda55f9

• More string consts into single file (#38189)

  Ramza13

  authored
  4fffd96

• Move string consts into single file (#38195)

  Ramza13

  authored
  b1b48ba

• Merge pull request #38046 from arijust/animal_pound

  Show description for 7cc215e
  Rivet-the-Zombie

  authored
  7cc215e

• Update explosives to use corrrect explosive power, casing mass, and fragment mass. (#37710)

  Show description for bec1cba
  Brian-Otten

  authored
  bec1cba

• Added ups_charges_modifier handling for gunmods (#37766)

  eilaattwood

  authored
  e1fdec2

• Allow delete and extend qualities in item definitions (#37804)

  ZhilkinSerg

  authored
  50653f7

• Handle FILTHY tag when unloading/reloading items (#37927)

  ZhilkinSerg

  authored
  955132f

• Remove unused variable (#38197)

  ZhilkinSerg

  authored
  7206b26

• house palette tweak (#38119)

  Show description for fef327b
  LilShiningMan

  authored
  fef327b