Code

Update latest codes.#5

Code

Merged

RedShakespeare merged 178 commits intoRedShakespeare:masterRedShakespeare/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardAug 24, 2019

+36,750-25,293

Commits

Commits on Aug 15, 2019

• Martial Arts Rebalance for Fior Di Battaglia

  Hymore246

  committed
  1a62660

Commits on Aug 17, 2019

• Fixed "Memory leak and crash when falling asleep with a radio on #32968"

  ipcyborg

  committed
  fc7a84e

Commits on Aug 18, 2019

• Fix bug where player could not create woodchip floors

  Show description for f2ac7de
  Widdershin

  authored
  f2ac7de

Commits on Aug 19, 2019

• pull origin and update

  ampersand55

  committed
  f164cb4

• Clean up activity_handlers.cpp a bit

  Show description for 9000afc
  anothersimulacrum

  committed
  9000afc

• Move id from player to Character

  jbytheway

  committed
  9890c6f

• Introduce character_id string typedef

  Show description for 7114ff6
  jbytheway

  committed
  7114ff6

• Overhaul enum <-> string conversion

  Show description for bac4d63
  jbytheway

  committed
  bac4d63

• Simplify std::transform call

  Show description for 49ce85a
  jbytheway

  committed
  49ce85a

• Remove translated string reader - gates.cpp

  Qrox

  committed
  46e4241

• Fix frozen liquids unloading and counting as ammo for bows

  Show description for 584efc1
  EddiTheBambi

  committed
  584efc1

• Remove translated_string_reader: magic

  Qrox

  committed
  fb9cb24

• Remove translated_string_reader: mapdata

  Qrox

  committed
  1944f0a

• Remove translated_string_reader: mattack_actors

  Qrox

  committed
  4fc19cd

• Remove translated_string_reader: morale_types

  Qrox

  committed
  29c0b13

• Remove translated_string_reader: mutation_data

  Qrox

  committed
  34c5e84

• Remove translated_string_reader: npc_class

  Qrox

  committed
  1f8e1d9

• Remove translated_string_reader: requirements

  Qrox

  committed
  f49bade

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into change_volume_to_metric

  ampersand55

  committed
  b9dcad2

• add script used to tools/json_tools

  ampersand55

  committed
  6b63c8d

• Added enums for channels & groups of sound effects.

  Show description for 8495de4
  ipcyborg

  committed
  8495de4

• Update translation documentation

  Qrox

  committed
  fc67186

• Accept translation directly in string_format & add_msg functions

  Qrox

  committed
  afd08e9

• Update data/json/items/armor.json

  Show description for 6489457
  

  ampersand55

  and

  anothersimulacrum

  authored
  6489457

• Update data/json/items/armor.json

  Show description for 682a07e
  

  ampersand55

  and

  anothersimulacrum

  authored
  682a07e

• Update data/json/items/armor.json

  Show description for 64ef034
  

  ampersand55

  and

  anothersimulacrum

  authored
  64ef034

• Update data/json/items/armor.json

  Show description for baf99c8
  

  ampersand55

  and

  anothersimulacrum

  authored
  baf99c8

• Enable readability-container-size-empty

  Show description for e47cd44
  jbytheway

  committed
  e47cd44

• formatting in cddaUpdateJsonVolume.js

  ampersand55

  committed
  3759b6e

• change tool to not update volume 0

  ampersand55

  committed
  656184b

• do not update volume 0

  ampersand55

  committed
  9d055ce

• don't update volume 0

  ampersand55

  committed
  ac5c734

• reapply anothersimulacrums suggestions

  ampersand55

  committed
  4d49516

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into change_volume_to_metric

  ampersand55

  committed
  a606d9f

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into change_volume_to_metric

  ampersand55

  committed
  7e79215

Commits on Aug 20, 2019

• Overload operator<< and operator+ for translation

  Qrox

  committed
  ba886fe

• Overload lcmatch for translation

  Qrox

  committed
  7ffa36d

• Overload colorize for translation

  Qrox

  committed
  2c5cac4

• correct cat

  tenmillimaster

  committed
  1becbf2

• Fix attack judgment while riding

  Show description for e66ef5a
  RedShakespeare

  committed
  e66ef5a

• Added separate channel for radio (instead of using player activity channel).

  Show description for 3dbaa8b
  ipcyborg

  committed
  3dbaa8b

• Fixed function definitions to compile without sound

  ipcyborg

  committed
  f7415e1

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into change_volume_to_metric

  ampersand55

  committed
  a349cf7

• add other volume values to script

  ampersand55

  committed
  3263ebb

• run script again and update files

  ampersand55

  committed
  099741a

• Merge branch 'change_volume_to_metric' of https://github.com/ampersand55/Cataclysm-DDA into change_volume_to_metric

  ampersand55

  committed
  16c2fb9

• Fixed calculation (was int instead of double)

  ipcyborg

  committed
  fcf4615

• Update doc to use metric units in string format (#33386)

  Show description for 51f45ee
  

  Fris0uman

  and

  KorGgenT

  committed
  51f45ee

• Add inital configuration for a build action

  kevingranade

  authored
  2c23eb9

• Fix accessing invalid pointer.

  Show description for ede39d0
  BevapDin

  committed
  ede39d0

• Consistency update: use it instead of p->weapon

  Show description for 54e9ddd
  BevapDin

  committed
  54e9ddd

• Fix accessing remove items.

  Show description for 0faa426
  BevapDin

  committed
  0faa426

• Define sewage_treatment overmap terrains

  

  AMurkin

  committed
  f6f6e06

• Update used_bookstore.json

  pepesito1122

  committed
  c6b6977

• Merge pull request #33404 from CleverRaven/kevingranade-build-action

  Show description for 5b7c6f1
  ZhilkinSerg

  authored
  5b7c6f1

• Merge pull request #33400 from jbytheway/clang_tidy_readability_container_size_empty

  Show description for 6037828
  ZhilkinSerg

  authored
  6037828

• Merge pull request #33384 from tenmillimaster/sodabottle

  Show description for a5e73e9
  ZhilkinSerg

  authored
  a5e73e9

• fix #33364 and more trouble related to profressions with flashlight (#33366)

  Show description for 2970983
  

  pierredavidbelanger

  authored and

  ZhilkinSerg

  committed
  2970983

• Merge pull request #33363 from EddiTheBambi/frozen_liquid_ammo_fix

  Show description for 1cf093c
  ZhilkinSerg

  authored
  1cf093c

• Merge pull request #33344 from jbytheway/character_id

  Show description for 84b589f
  ZhilkinSerg

  authored
  84b589f

• Merge pull request #33406 from AMurkin/alt_map_key-sewage_treatment

  Show description for b3a3f63
  ZhilkinSerg

  authored
  b3a3f63

• Merge pull request #33405 from BevapDin/jbn

  Show description for 46fbee2
  ZhilkinSerg

  authored
  46fbee2

• Merge pull request #33380 from Qrox/remove-translated-string-reader

  Show description for 5055b30
  ZhilkinSerg

  authored
  5055b30

• Merge pull request #33356 from anothersimulacrum/code-cleanup

  Show description for 2e424ef
  ZhilkinSerg

  authored
  2e424ef

• Fix encumbrance window in character info and armor layer screens (#33276)

  Show description for 32304c4
  

  Qrox

  authored and

  ZhilkinSerg

  committed
  32304c4

• Jsonize Cbm power generation (#33302)

  Show description for 96b1c34
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  96b1c34

• Update build action configuration

  Show description for 5e473d6
  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  5e473d6

Commits on Aug 21, 2019

• Change all instances of "volume" in JSONs to be a metric string (#33367)

  

  ampersand55

  authored and

  kevingranade

  committed
  e706ab9

• Try reducing fetch-depth when checking out repository (#33414)

  kevingranade

  authored
  c23b57c

• Rename Disinfectant to Antiseptic (#33387)

  Show description for 8cdb739
  

  Fris0uman

  authored and

  kevingranade

  committed
  8cdb739

• Add install step, install ncurses development library (#33412)

  kevingranade

  authored
  1a04806

• Fix overzealous replacement

  kevingranade

  committed
  6c1322f

• Allow "place_monster" to spawn exactly one monster from a monster group (#33256)

  

  Hirmuolio

  authored and

  kevingranade

  committed
  baefa54

• Remove empty keybinding for auto travel mode

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  f1a5348

• Merge pull request #33297 from ipcyborg/fix-32968-sound-mem-leak

  Show description for 94aac50
  kevingranade

  authored
  94aac50

• Add descriptions for all the Free Merchant NPC missions. (#33325)

  

  Petethegoat

  authored and

  kevingranade

  committed
  406dd4d

• Fix foods getting negative rot when the date of cataclysm is not zero (#33345)

  

  Hirmuolio

  authored and

  kevingranade

  committed
  700df88

• Allow crafting liquids without adequate available empty container space (#33320)

  

  misterprimus

  authored and

  kevingranade

  committed
  eef6fa4

• Add washing kit, change sponge/washboard washing

  Show description for 86ccca4
  

  anothersimulacrum

  authored and

  kevingranade

  committed
  86ccca4

• fix frozen acid drops (#33350)

  

  misterprimus

  authored and

  kevingranade

  committed
  84ad947

• Astyle

  kevingranade

  committed
  5478321

• Add json style check workflow (#33415)

  kevingranade

  authored
  433a419

• Merge pull request #33261 from Hymore246/rebalance-fior

  Show description for 55bcd4c
  Rivet-the-Zombie

  authored
  55bcd4c

• Add a cata_variant type

  Show description for 056d6f0
  jbytheway

  committed
  056d6f0

• Add event class and simple event bus

  Show description for 4f8354a
  jbytheway

  committed
  4f8354a

• Add a more convenient cata_variant constructor

  Show description for 663f42b
  jbytheway

  committed
  663f42b

• Add more explanatory comments

  jbytheway

  committed
  dcf6dcf

• Avoid throwing exceptions from event::get

  jbytheway

  committed
  3b75162

• Add character_id and std::string to cata_variant

  Show description for fce2237
  jbytheway

  committed
  fce2237

• Update killing events

  Show description for 8cfe3d9
  jbytheway

  committed
  8cfe3d9

• Make event_subscriber and event_bus non-movable

  Show description for de527cb
  jbytheway

  committed
  de527cb

• Rephrase static_assert to appease clang warning

  jbytheway

  committed
  a1dcf85

• Remove improvised flamethrower

  

  ymber

  committed
  314ea63

• Fix monsters spawn not giving precedence to designated location

  ralreegorganon

  committed
  c23ebf7

• Fixed "Wielding MBR vest with magazines allow to duplicate magazines #33189"

  ipcyborg

  committed
  e3c8e20

• Typo fixes

  harakka

  authored
  a3ca5f2

• Use point in main_menu.h and output.h (#33417)

  Show description for 0235134
  

  jbytheway

  authored and

  ZhilkinSerg

  committed
  0235134

• Merge pull request #33421 from ralreegorganon/fix-monster-spawn-location

  Show description for 254e919
  ZhilkinSerg

  authored
  254e919

• Merge pull request #33422 from ipcyborg/fix-33189-pickup-duplicate

  Show description for 21928e3
  ZhilkinSerg

  authored
  21928e3

• Merge pull request #33419 from ymber/flamethrower

  Show description for 445e768
  ZhilkinSerg

  authored
  445e768

• All the Realism: Guns Edition, Handguns Chapter (#32542)

  Show description for 8eb9ac0
  

  roaringjohn

  authored and

  ZhilkinSerg

  committed
  8eb9ac0

• Merge pull request #32891 from jbytheway/event_bus

  Show description for e56aa02
  ZhilkinSerg

  authored
  e56aa02

• Craftable lab kit for issue #33254 (#33397)

  Show description for 59d443e
  

  alkemann

  authored and

  ZhilkinSerg

  committed
  59d443e

• Remove unnecessary usage of string_format as the called function will do it.

  Show description for 60a27ba
  BevapDin

  committed
  60a27ba

• Remove unnecessary usage of string_format, use string concatenation instead.

  BevapDin

  committed
  21c7f19

• Remove pointless use of string_format( "%s", ... )

  Show description for 41a354f
  BevapDin

  committed
  41a354f

• Remove useless use of string_format

  Show description for 30ec221
  BevapDin

  committed
  30ec221

• Enable translation for some strings.

  BevapDin

  committed
  c53d9fe

• Don't string format item description,

  Show description for 1340d7c
  BevapDin

  committed
  1340d7c

• Fix translation in moves_to_string:

  Show description for b089d66
  BevapDin

  committed
  b089d66

• Simplify item name for generic (undefined) item types

  BevapDin

  committed
  86ad262

• Reduce difficulty of tarp_raincatcher trap

  Show description for 050c081
  ArkonRawl

  committed
  050c081

• Change JSON style check job name

  ZhilkinSerg

  authored
  1b32322

• Add move support to mtype_special_attack

  Show description for 56282b7
  jbytheway

  committed
  56282b7

• Merge pull request #33427 from harakka/patch-1

  Show description for 9d051a0
  ZhilkinSerg

  authored
  9d051a0

• Merge pull request #33439 from CleverRaven/actions-update-2019-08-21

  Show description for 49e5760
  ZhilkinSerg

  authored
  49e5760

• Store spell_id, not pointer, in spell

  Show description for e2e4f94
  jbytheway

  committed
  e2e4f94

Commits on Aug 22, 2019

• Add deconstruction recipe for mininuke

  Show description for d1528cc
  jbytheway

  committed
  d1528cc

• change turn_zero to start_of_cataclysm (#33444)

  

  KorGgenT

  authored and

  kevingranade

  committed
  a45ab51

• Update used_bookstore.json

  pepesito1122

  committed
  75143e4

• Add telescopic umbrella deconstruct

  snipercup

  committed
  5747a5a

• Merge pull request #33407 from pepesito1122/fixing-used-bookstore-nothic-room

  Show description for d27eb66
  Rivet-the-Zombie

  authored
  d27eb66

• Merge pull request #33262 from jbytheway/enum_conversions

  Show description for 16fb9ca
  kevingranade

  authored
  16fb9ca

• Increase availability of tin and only allow it to be extracted with electrolysis (#33301)

  Show description for bead954
  

  ampersand55

  authored and

  kevingranade

  committed
  bead954

• Revise 300 BLK items and recipes (#33333)

  

  Matthew Taylor

  authored and

  kevingranade

  committed
  5f031d3

• Make backpacks more consistent (#33347)

  

  ampersand55

  authored and

  kevingranade

  committed
  b367eae

• Add sword cane (#33426)

  

  Fris0uman

  authored and

  kevingranade

  committed
  0d21888

• Merge pull request #33441 from jbytheway/fix_migo_attack_crash

  Show description for c3529e8
  kevingranade

  authored
  c3529e8

• Absurdist Texts (#33452)

  

  tenmillimaster

  authored and

  kevingranade

  committed
  5e2f27e

• New foes for the Collapsed Tower (#33322)

  

  John-Candlebury

  authored and

  kevingranade

  committed
  50c6f05

• Add kill_tracker, and move stuff from game to it

  Show description for 347bd7d
  

  jbytheway

  authored and

  kevingranade

  committed
  347bd7d

• Merge pull request #33435 from ArkonRawl/reduce-difficulty-of-tarp-raincatcher

  Show description for f6fc900
  kevingranade

  authored
  f6fc900

• No terrorism (#33453)

  

  Qrox

  authored and

  kevingranade

  committed
  5687d45

• Remove nonstandard string function

  Show description for 5d0e011
  kevingranade

  authored
  5d0e011

• Enable readability-inconsistent-declaration-parameter-name

  Show description for da53b5c
  jbytheway

  committed
  da53b5c

• Merge pull request #33456 from CleverRaven/kevingranade-no-strnlen

  Show description for 2cce782
  ZhilkinSerg

  authored
  2cce782

• Start obsoleting microreactor CBMs (#33440)

  Show description for 27d0675
  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  27d0675

• Merge pull request #33455 from snipercup/Add-telescopic-umbrella-deconstruct

  Show description for a94b303
  ZhilkinSerg

  authored
  a94b303

• Merge pull request #33430 from BevapDin/hps

  Show description for 8348c9f
  ZhilkinSerg

  authored
  8348c9f

• Merge pull request #33447 from jbytheway/mininuke_disassembly

  Show description for 78c35c7
  ZhilkinSerg

  authored
  78c35c7

• Fix NPCs getting fat with Disabled NPC Needs mod (#33457)

  

  Hirmuolio

  authored and

  ZhilkinSerg

  committed
  b7a533c

• Partially fixed incorrectly displayed in_process messages

  Raschert0

  committed
  4b07ab2

• Merge pull request #33425 from jbytheway/clang_tidy_readability_inconsistent_declaration_parameter_name

  Show description for a7e3321
  ZhilkinSerg

  authored
  a7e3321

• QOL improvement: "Don't prompt for a direction for an action if there is only one direction possible" (#33431)

  Show description for 7c8279a
  

  ipcyborg

  authored and

  ZhilkinSerg

  committed
  7c8279a

• Partially fixed incorrectly displayed in_process messages (#33429)

  ZhilkinSerg

  authored
  6682e3c

• Merge pull request #33388 from RedShakespeare/mechbot

  Show description for 6aeb08b
  ZhilkinSerg

  authored
  6aeb08b

• Burrowing monsters are now able to dig under certain terrain (#33274)

  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  2bda93b

• resolve merge conflict

  ampersand55

  committed
  e467357

• update 'storage' to metric

  ampersand55

  committed
  f20526c

• update tool

  ampersand55

  committed
  2945615

• fix #33124 , now sheet of glass is consumed after being placed as a trap

  pierredavidbelanger

  committed
  aad3e47

• Added check for null: fixed compilation with gcc 7.4.

  ipcyborg

  committed
  a6ff92d

• Merge pull request #33467 from ipcyborg/fix-compile-gcc-7.4

  Show description for 82197cf
  ZhilkinSerg

  authored
  82197cf

• added direct sleeveless underwear top recipe (#33464)

  

  Steffen

  authored and

  ZhilkinSerg

  committed
  4cf4f6b

• Merge pull request #33465 from pierredavidbelanger/fix-glass-trap-does-not-consume-glass-sheet

  Show description for c00f585
  ZhilkinSerg

  authored
  c00f585

• Anarchist classics and other changes to philosophy_book snippets (#33460)

  Show description for 17f77f1
  

  2 peopleauthored and

  ZhilkinSerg

  committed
  17f77f1

• Change "storage" volume to metric units (#33462)

  Show description for 28cd247
  ZhilkinSerg

  authored
  28cd247

• Jsonize Weight capacity modifier for armor and CBM (#33394)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  e888867

• Reset mount moves on dismount (#33461)

  Show description for 3825c95
  

  davidpwbrown

  authored and

  kevingranade

  committed
  3825c95

Commits on Aug 23, 2019

• add rural roads for farm special

  curstwist

  committed
  71da22e

• Reduced Rocket Fuel Cost For Moddified Mininukes (#33480)

  Show description for 45af3d3
  

  EkarusRyndren

  authored and

  ZhilkinSerg

  committed
  45af3d3

• Show needs in the comestible inventory windows (#33481)

  Show description for d01d881
  

  pierredavidbelanger

  authored and

  ZhilkinSerg

  committed
  d01d881

• add rural roads for farm special (#33479)

  ZhilkinSerg

  authored
  7ff9545

• Add u_buy_monster talk effect (#33446)

  Show description for 156c7a6
  

  ralreegorganon

  authored and

  ZhilkinSerg

  committed
  156c7a6

• Merge pull request #33335 from Widdershin/patch-1

  Show description for 9119b82
  Rivet-the-Zombie

  authored
  9119b82

• Fixed "Activating items near character with empty hands and 0 volume capacity does not (always) work #33473"

  Show description for 2c4b5d7
  ipcyborg

  committed
  2c4b5d7

• An initial run of volume update script

  alkemann

  committed
  0a080c9

• Update tools/json_tools/cddaUpdateJsonVolume.js

  Show description for 4277302
  

  alkemann

  and

  ampersand55

  authored
  4277302

• Routine i18n updates on 23 Aug 2019

  BrettDong

  committed
  e09c21d

• fix missing plural

  

  Fris0uman

  committed
  44e0dd6

• need unconscious cyborg clarification

  

  Fris0uman

  committed
  0280ef9

Commits on Aug 24, 2019

• Update snippets.json

  ZhilkinSerg

  authored
  1426fab

• Merge pull request #33488 from BrettDong/i18n

  Show description for 3f14bfb
  ZhilkinSerg

  authored
  3f14bfb

• Output dmg numbers from ridden mech melee attacks (#33489)

  Show description for e9dd90b
  

  alkemann

  authored and

  ZhilkinSerg

  committed
  e9dd90b

• Fix missing plural in a snippet (#33494)

  Show description for a0f60d9
  ZhilkinSerg

  authored
  a0f60d9

• Merge pull request #33485 from alkemann/volumes

  Show description for 40cbf11
  ZhilkinSerg

  authored
  40cbf11

• Add pr validator workflow (#33478)

  Show description for 5122a9c
  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  5122a9c

• Merge pull request #33484 from ipcyborg/fix-33473-wield-and-use

  Show description for 566c2ba
  ZhilkinSerg

  authored
  566c2ba