Code

test#16

Code

Closed

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

+1,271,643-751,901

Commits

Commits on Jul 4, 2019

• process_temperature: add temperature-only weather_generator function

  Show description for 9305bc0
  OrenAudeles

  committed
  9305bc0

  Copy full SHA for 9305bc0

• process_temperature: most items are not corpses

  Show description for a8bc3aa
  OrenAudeles

  committed
  a8bc3aa

  Copy full SHA for a8bc3aa

• process_temperature: use maptiles for heat radiation and convection calc

  Show description for b4f37bd
  OrenAudeles

  committed
  b4f37bd

  Copy full SHA for b4f37bd

• process_temperature: add very short-term cache for item::goes_bad proc

  Show description for dd886f6
  OrenAudeles

  committed
  dd886f6

  Copy full SHA for dd886f6

• process_temperature: astyle

  OrenAudeles

  committed
  b20497a

  Copy full SHA for b20497a

• process_temperature: clang-tidy, remove commented code, typo

  OrenAudeles

  committed
  a0a49aa

  Copy full SHA for a0a49aa

• process_temperature: DRY, remove unnecessary type conversion

  Show description for 9b2a067
  OrenAudeles

  committed
  9b2a067

  Copy full SHA for 9b2a067

Commits on Jul 5, 2019

• Use normal functions instead of lambdas

  ZhilkinSerg

  committed
  3e29bf2

  Copy full SHA for 3e29bf2

• Update src/weather_gen.cpp

  Show description for f723f51
  

  OrenAudeles

  and

  ZhilkinSerg

  authored
  f723f51

  Copy full SHA for f723f51

• de_dyncast: virtual function to return player ptr if player or derived

  Show description for ed5c68e
  OrenAudeles

  committed
  ed5c68e

  Copy full SHA for ed5c68e

• de_dyncast: remove dynamic_cast from map::creature_in_field

  Show description for 9a33941
  OrenAudeles

  committed
  9a33941

  Copy full SHA for 9a33941

• de_dyncast: remove dynamic_cast from non_dead_range Creature iter valid

  OrenAudeles

  committed
  813eefc

  Copy full SHA for 813eefc

• de_dyncast: remove dynamic_cast from Creature::auto_find_hostile_target

  OrenAudeles

  committed
  244045a

  Copy full SHA for 244045a

• de_dyncast: remove dynamic_cast from monster::attitude_to

  OrenAudeles

  committed
  547e1e7

  Copy full SHA for 547e1e7

• de_dyncast: astyle

  OrenAudeles

  committed
  96940fa

  Copy full SHA for 96940fa

• de_dyncast: remove extra const

  OrenAudeles

  committed
  5ba9350

  Copy full SHA for 5ba9350

Commits on Jul 6, 2019

• load time strings for effects

  

  ymber

  committed
  6d45431

  Copy full SHA for 6d45431

• use time duration strings in effect definitions

  

  ymber

  committed
  2854933

  Copy full SHA for 2854933

• player_movemode: change player::move_mode to enum from string

  Show description for d999781
  OrenAudeles

  committed
  d999781

  Copy full SHA for d999781

• player_movemode: switch all uses of player::move_mode to enum comparison

  OrenAudeles

  committed
  b8eca7d

  Copy full SHA for b8eca7d

• Convert various loops to range-for

  Show description for bb37fa2
  jbytheway

  committed
  bb37fa2

  Copy full SHA for bb37fa2

• Suppress modernize-loop-convert on some loops

  Show description for 411dce3
  jbytheway

  committed
  411dce3

  Copy full SHA for 411dce3

• Enable clang-tidy modernize-loop-convert

  jbytheway

  committed
  d4cc0d1

  Copy full SHA for d4cc0d1

• add trailer park roofs

  curstwist

  committed
  6b3b98f

  Copy full SHA for 6b3b98f

• Fix use after being move

  Show description for f302bee
  BevapDin

  committed
  f302bee

  Copy full SHA for f302bee

• add veterinarian roof

  curstwist

  committed
  ab39464

  Copy full SHA for ab39464

• Magiclysm - Added 'Troll' (#32207)

  Show description for a7c1bed
  

  Zmedaris

  authored and

  KorGgenT

  committed
  a7c1bed

  Copy full SHA for a7c1bed

Commits on Jul 7, 2019

• monsters can now cast spells as special attacks (#32108)

  

  KorGgenT

  authored and

  kevingranade

  committed
  af44c86

  Copy full SHA for af44c86

• add vfw roof

  curstwist

  committed
  d02d117

  Copy full SHA for d02d117

• Use normal functions instead of lambdas (#32120)

  kevingranade

  authored
  9d298a9

  Copy full SHA for 9d298a9

• Prevent fire from spreading onto nonflammable tile

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  fc51a0a

  Copy full SHA for fc51a0a

• [CR] Being grabbed drastically reduce your dodging ability (#32152)

  Show description for 9a3cd79
  

  Anton Burmistrov

  authored and

  kevingranade

  committed
  9a3cd79

  Copy full SHA for 9a3cd79

• Use time duration strings for effects (#32185)

  Show description for 2a40e38
  kevingranade

  authored
  2a40e38

  Copy full SHA for 2a40e38

• Merge pull request #32205 from jbytheway/modernize_for_loop_convert

  Show description for c40148f
  kevingranade

  authored
  c40148f

  Copy full SHA for c40148f

• Merge pull request #32209 from BevapDin/qrh

  Show description for ae41111
  kevingranade

  authored
  ae41111

  Copy full SHA for ae41111

• Check for emptiness before summoning something

  Show description for 1d335b9
  

  BevapDin

  authored and

  kevingranade

  committed
  1d335b9

  Copy full SHA for 1d335b9

• Merge pull request #32208 from curstwist/add-roof-to-veternarian

  Show description for f3ce46a
  ZhilkinSerg

  authored
  f3ce46a

  Copy full SHA for f3ce46a

• Merge pull request #32206 from curstwist/add-trailer-park-roofs

  Show description for a8d0753
  ZhilkinSerg

  authored
  a8d0753

  Copy full SHA for a8d0753

• add warehouse roof

  curstwist

  committed
  3e9036d

  Copy full SHA for 3e9036d

• Magiclysm: demon spider

  KorGgenT

  committed
  9313d7e

  Copy full SHA for 9313d7e

• demon spider lair

  KorGgenT

  committed
  a62ae77

  Copy full SHA for a62ae77

• demon spider lair design

  KorGgenT

  committed
  57be43b

  Copy full SHA for 57be43b

• Update data/mods/Magiclysm/terrain.json

  Show description for 8ce9416
  

  KorGgenT

  and

  Alexey Mostovoy

  committed
  8ce9416

  Copy full SHA for 8ce9416

• Update data/mods/Magiclysm/worldgen/demon_spider_lair.json

  Show description for 9b8be75
  

  KorGgenT

  and

  Alexey Mostovoy

  committed
  9b8be75

  Copy full SHA for 9b8be75

• more edits

  KorGgenT

  committed
  6476e91

  Copy full SHA for 6476e91

• fix json loading error

  KorGgenT

  committed
  23d78de

  Copy full SHA for 23d78de

• more minor updates

  KorGgenT

  committed
  d11efea

  Copy full SHA for d11efea

• field prob removed

  KorGgenT

  committed
  b1bb9aa

  Copy full SHA for b1bb9aa

• add demon spiderlings to forest group

  KorGgenT

  committed
  149d08f

  Copy full SHA for 149d08f

• add missing harvest entry

  KorGgenT

  committed
  db8ab8f

  Copy full SHA for db8ab8f

• lint

  KorGgenT

  committed
  339eec6

  Copy full SHA for 339eec6

• Eliminate unecessary monster enumeration

  Show description for 00fa009
  kevingranade

  authored
  00fa009

  Copy full SHA for 00fa009

• reorder melee weaponry a bit

  I-am-Erk

  committed
  07bcd78

  Copy full SHA for 07bcd78

• astyle effects

  kevingranade

  authored
  7534ca2

  Copy full SHA for 7534ca2

• A couple other move-arounds

  I-am-Erk

  committed
  ae9dba6

  Copy full SHA for ae9dba6

• Remove winded recovery effect from oxygen tank

  kevingranade

  authored
  551a82f

  Copy full SHA for 551a82f

• Add reinforced knife spear

  I-am-Erk

  committed
  0df1a70

  Copy full SHA for 0df1a70

• adjust name, add a bunch of knives to recipe

  I-am-Erk

  committed
  5c29631

  Copy full SHA for 5c29631

• Add an upgrade recipe version

  I-am-Erk

  committed
  6484b88

  Copy full SHA for 6484b88

• Correct oxygenator description (#32216)

  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  764ddfd

  Copy full SHA for 764ddfd

• Merge pull request #32213 from curstwist/add-vfw-roof

  Show description for a316839
  ZhilkinSerg

  authored
  a316839

  Copy full SHA for a316839

• Merge pull request #32214 from curstwist/add-warehouse-roof

  Show description for 19b2313
  ZhilkinSerg

  authored
  19b2313

  Copy full SHA for 19b2313

• Merge pull request #32220 from CleverRaven/kevingranade-nox-wind-recover

  Show description for 0aa1914
  ZhilkinSerg

  authored
  0aa1914

  Copy full SHA for 0aa1914

• Merge pull request #32217 from CleverRaven/kevingranade-astyle-effects

  Show description for dac6304
  ZhilkinSerg

  authored
  dac6304

  Copy full SHA for dac6304

• Merge pull request #32215 from CleverRaven/kevingranade-eliminate-monster-enumeration

  Show description for 2ff7a1b
  ZhilkinSerg

  authored
  2ff7a1b

  Copy full SHA for 2ff7a1b

• tweak stats and requirements

  I-am-Erk

  committed
  0a58e4c

  Copy full SHA for 0a58e4c

• Update recipe_weapon.json

  I-am-Erk

  committed
  a1608f4

  Copy full SHA for a1608f4

• Really astyle effect.cpp

  kevingranade

  committed
  7a08874

  Copy full SHA for 7a08874

• Update home_improvement.json

  I-am-Erk

  committed
  f7ff2a3

  Copy full SHA for f7ff2a3

• dont inline function template

  

  ymber

  committed
  18d1116

  Copy full SHA for 18d1116

• Merge pull request #32159 from KorGgenT/demon-spider

  Show description for 8e5ede3
  Rivet-the-Zombie

  authored
  8e5ede3

  Copy full SHA for 8e5ede3

• Merge pull request #32153 from OrenAudeles/de_dyncast

  Show description for b4d2930
  kevingranade

  authored
  b4d2930

  Copy full SHA for b4d2930

• Merge branch 'master' into player_movemode

  kevingranade

  authored
  e38dade

  Copy full SHA for e38dade

• Merge pull request #32203 from OrenAudeles/player_movemode

  Show description for bb9b779
  kevingranade

  authored
  bb9b779

  Copy full SHA for bb9b779

• Fix some fields not getting proccessed

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  d56ea51

  Copy full SHA for d56ea51

• Dead People Tileset Update

  Show description for 068af20
  

  SomeDeadGuy

  committed
  068af20

  Copy full SHA for 068af20

• Remove usage of non-existing flag NONFLAMMALBE

  Show description for 1ab2115
  BevapDin

  committed
  1ab2115

  Copy full SHA for 1ab2115

• Merge pull request #32228 from BevapDin/lee

  Show description for 4d61767
  ZhilkinSerg

  authored
  4d61767

  Copy full SHA for 4d61767

• Merge pull request #32223 from ymber/inline_read

  Show description for 7f2d21b
  ZhilkinSerg

  authored
  7f2d21b

  Copy full SHA for 7f2d21b

• Clean up melee.json and some other egregiously badly organized files (#32218)

  Show description for 49c4f79
  

  I-am-Erk

  authored and

  ZhilkinSerg

  committed
  49c4f79

  Copy full SHA for 49c4f79

• Adds mi-go encampment terrain and overmap (#32055)

  

  I-am-Erk

  authored and

  ZhilkinSerg

  committed
  15a61fb

  Copy full SHA for 15a61fb

• Import plf list header for modification

  Show description for 9a6e144
  ifreund

  committed
  9a6e144

  Copy full SHA for 9a6e144

• Remove uneeded preprocessor defines

  ifreund

  committed
  4b344c3

  Copy full SHA for 4b344c3

• Astyle

  ifreund

  committed
  568ccd4

  Copy full SHA for 568ccd4

• Fix style

  Show description for d9b4f87
  ifreund

  committed
  d9b4f87

  Copy full SHA for d9b4f87

• Use cata namespace

  ifreund

  committed
  195bdad

  Copy full SHA for 195bdad

• Replace typedefs with using

  ifreund

  committed
  a55535c

  Copy full SHA for a55535c

• Fix a couple typos

  ifreund

  committed
  776aee6

  Copy full SHA for 776aee6

• Add list test cases

  ifreund

  committed
  488a837

  Copy full SHA for 488a837

• Move colony and list test helpers to new header

  ifreund

  committed
  faa5eb1

  Copy full SHA for faa5eb1

• cleanup zoo file

  Show description for bce3b7c
  curstwist

  committed
  bce3b7c

  Copy full SHA for bce3b7c

• Routine i18n updates on 7 Jul 2019

  BrettDong

  committed
  dedfb9f

  Copy full SHA for dedfb9f

• add zoo roofs

  curstwist

  committed
  9e84869

  Copy full SHA for 9e84869

• Fix namespace comment

  ifreund

  committed
  4def91c

  Copy full SHA for 4def91c

• remove invalid spell id from spellbook

  KorGgenT

  committed
  32dea7a

  Copy full SHA for 32dea7a

• Merge branch 'master' into reinforce-knife-spears

  I-am-Erk

  authored
  f9db2da

  Copy full SHA for f9db2da

• restore incorrectly removed stuff

  I-am-Erk

  authored
  f0b3c6a

  Copy full SHA for f0b3c6a

• restore incorrectly deleted stuff

  I-am-Erk

  authored
  aac0aa3

  Copy full SHA for aac0aa3

• fix incorrect deletions

  I-am-Erk

  authored
  11e1fee

  Copy full SHA for 11e1fee

• restore accidental deletions

  Show description for bca7572
  I-am-Erk

  authored
  bca7572

  Copy full SHA for bca7572

• Merge pull request #32238 from KorGgenT/invalid-spell-id

  Show description for 09fe5a7
  ZhilkinSerg

  authored
  09fe5a7

  Copy full SHA for 09fe5a7

• add electronics store roofs (#32233)

  

  curstwist

  authored and

  ZhilkinSerg

  committed
  e9d7fbe

  Copy full SHA for e9d7fbe

• Merge pull request #32235 from BrettDong/i18n

  Show description for 27cd0e3
  ZhilkinSerg

  authored
  27cd0e3

  Copy full SHA for 27cd0e3

• Merge pull request #32237 from curstwist/add-roof-to-zoo

  Show description for 30efe0a
  ZhilkinSerg

  authored
  30efe0a

  Copy full SHA for 30efe0a

• Merge pull request #32226 from SomeDeadGuy/Dead-People-Tileset-update

  Show description for 50a3b99
  ZhilkinSerg

  authored
  50a3b99

  Copy full SHA for 50a3b99

• Add spike spear, adjust descriptions and details

  I-am-Erk

  committed
  7375c79

  Copy full SHA for 7375c79

• add small knives to spike spear options

  I-am-Erk

  committed
  ef3353e

  Copy full SHA for ef3353e

• the blade of exact zero

  I-am-Erk

  committed
  eb8f621

  Copy full SHA for eb8f621

• remove duplicate spell

  KorGgenT

  committed
  f1de88a

  Copy full SHA for f1de88a

• make itemgroups folder

  KorGgenT

  committed
  a5a6180

  Copy full SHA for a5a6180

• add tiered spellbook itemgroups

  KorGgenT

  committed
  f706ed5

  Copy full SHA for f706ed5

• add spellbook loot tiers

  KorGgenT

  committed
  4d574d3

  Copy full SHA for 4d574d3

• use spellbook loot groups

  KorGgenT

  committed
  aa06113

  Copy full SHA for aa06113

• create spell scrolls

  KorGgenT

  committed
  0717534

  Copy full SHA for 0717534

• create scroll itemgroups

  KorGgenT

  committed
  7b4a736

  Copy full SHA for 7b4a736

• add spell scroll itemgroups to spellbook loot itemgroups

  KorGgenT

  committed
  9676907

  Copy full SHA for 9676907

• Magiclysm: Used Bookstore and Nothic

  KorGgenT

  committed
  c75d0d1

  Copy full SHA for c75d0d1

• no capital letter

  KorGgenT

  committed
  3208005

  Copy full SHA for 3208005

• add damage type to necrotic gaze

  KorGgenT

  committed
  227873a

  Copy full SHA for 227873a

• Update overmap_terrain.json

  KorGgenT

  committed
  7c3a0a6

  Copy full SHA for 7c3a0a6

• Add (tri)point::to_string() and tripoint::xy()

  Show description for 3abb2e4
  jbytheway

  committed
  3abb2e4

  Copy full SHA for 3abb2e4

• Refactor generic_inbounds

  Show description for 28cbd6f
  jbytheway

  committed
  28cbd6f

  Copy full SHA for 28cbd6f

Commits on Jul 8, 2019

• Fix durations of longer than 248 days displaying as "forever"

  Show description for 03b92f8
  brannamm

  committed
  03b92f8

  Copy full SHA for 03b92f8

• Formatting change

  brannamm

  committed
  662d992

  Copy full SHA for 662d992

• Formatting change after actually running astyle

  brannamm

  committed
  17b7378

  Copy full SHA for 17b7378

• Merge pull request #32219 from KorGgenT/magiclysm-used-bookstore

  Show description for 2bdaa21
  Rivet-the-Zombie

  authored
  2bdaa21

  Copy full SHA for 2bdaa21

• Firwood fix - about 30min per planks

  

  Leosky

  authored and

  kevingranade

  committed
  e7ab273

  Copy full SHA for e7ab273

• scent_block_defer: wait until committing modifications to test inbounds

  Show description for 9d36f0d
  

  OrenAudeles

  authored and

  kevingranade

  committed
  9d36f0d

  Copy full SHA for 9d36f0d

• Merge pull request #32119 from OrenAudeles/process_item

  Show description for 948b8a6
  kevingranade

  authored
  948b8a6

  Copy full SHA for 948b8a6

• remove number from add_item (#32252)

  

  davidpwbrown

  authored and

  KorGgenT

  committed
  5f096ff

  Copy full SHA for 5f096ff

• Merge pull request #32234 from ifreund/better-list

  Show description for f8ee22c
  kevingranade

  authored
  f8ee22c

  Copy full SHA for f8ee22c

• Merge pull request #32242 from jbytheway/generic_inbounds_overhaul

  Show description for 3b8996a
  kevingranade

  authored
  3b8996a

  Copy full SHA for 3b8996a

Commits on Jul 9, 2019

• demon spider fix

  

  KorGgenT

  authored and

  kevingranade

  committed
  fc341f7

  Copy full SHA for fc341f7

• Fixes zero minute craft times

  

  81Denton

  authored and

  kevingranade

  committed
  40e3a64

  Copy full SHA for 40e3a64

• Adds skeletal shocker zombies (#32115)

  Show description for e4ca07d
  

  aoae23

  authored and

  kevingranade

  committed
  e4ca07d

  Copy full SHA for e4ca07d

• Add a better knife spear (#32222)

  Show description for 5fdcda0
  kevingranade

  authored
  5fdcda0

  Copy full SHA for 5fdcda0

• Remove vehicle name changes on ownership - Just append owner string to vehicle display (#32241)

  Show description for 7c3a82f
  

  davidpwbrown

  authored and

  kevingranade

  committed
  7c3a82f

  Copy full SHA for 7c3a82f

• Obsolete fusion gun & bionic, move to Aftershock

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  81e4634

  Copy full SHA for 81e4634

• adjust stat penalty to only happen when emaciated (#32246)

  

  KorGgenT

  authored and

  kevingranade

  committed
  b1f3d01

  Copy full SHA for b1f3d01

• lint monsters.json (#32270)

  

  esotericist

  authored and

  KorGgenT

  committed
  866479b

  Copy full SHA for 866479b

• fixed mana increments for nature's trance and summon bear (#32265)

  

  b0urgeoisie

  authored and

  KorGgenT

  committed
  9535f07

  Copy full SHA for 9535f07

• Merge pull request #32244 from brannamm/indefinitely_long_update

  Show description for 17141af
  Rivet-the-Zombie

  authored
  17141af

  Copy full SHA for 17141af

Commits on Jul 10, 2019

• Revert "supress clang tidy warning about legacy casts"

  kevingranade

  committed
  8eec292

  Copy full SHA for 8eec292