Code

Reset driving view offset on death#35319

Code

Merged

ZhilkinSerg merged 97 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Ramza13:driving_offsetRamza13/Cataclysm-DDA:driving_offsetCopy head branch name to clipboardNov 5, 2019

+3

Commits

Commits on Oct 10, 2019

• get this centralized for me

  Ramza13

  committed
  daa7960

• commit for me

  Ramza13

  committed
  98e88b3

Commits on Oct 11, 2019

• Merge pull request #1 from CleverRaven/master

  Show description for 49b5652
  Ramza13

  authored
  49b5652

Commits on Oct 12, 2019

• Merge branch 'master' of https://github.com/Ramza13/Cataclysm-DDA

  Ramza13

  committed
  4fd3956

• Disallow running with broken legs and slow walking if you are on the ground

  Ramza13

  committed
  c5ba1eb

• Undo checking in .gitignore

  Ramza13

  committed
  3e56438

• Undo updating proj files

  Ramza13

  committed
  d8bd80c

Commits on Oct 13, 2019

• Migrate method to character

  Ramza13

  committed
  ed491ea

• Revert "Migrate method to character"

  Show description for 048b567
  Ramza13

  committed
  048b567

• Migrated can_run into Character per reviewer advice

  Ramza13

  committed
  5dd9f78

• Update src/character.h

  Show description for 4da1c2b
  

  Ramza13

  and

  anothersimulacrum

  authored
  4da1c2b

• Astyled code

  Ramza13

  committed
  88637aa

• Revert "Astyled code"

  Show description for 7750b7d
  Ramza13

  committed
  7750b7d

• Merge branch 'broken_limb_debuffs' of https://github.com/Ramza13/Cataclysm-DDA into broken_limb_debuffs

  Ramza13

  committed
  9e5f092

• AStyle Merged version

  Ramza13

  committed
  2fc4407

• Merge branch 'master' into broken_limb_debuffs

  Ramza13

  authored
  3765a0d

• Upgraded debug damage self command to allow body part choice

  Ramza13

  committed
  5a77f9b

• Updated logic to prevent wielding with two broken arms and force drop of item on arm break if it can't be wielded anymore

  Ramza13

  committed
  de28e0d

• Merge branch 'master' into broken_limb_debuffs

  Ramza13

  authored
  39ce02e

Commits on Oct 14, 2019

• Prevent using martial arts while on the ground or with two broken arms and reduce damage dealt as well

  Ramza13

  committed
  9984bf4

• Merge branch 'broken_limb_debuffs' of https://github.com/Ramza13/Cataclysm-DDA into broken_limb_debuffs

  Ramza13

  committed
  225a8a8

Commits on Oct 16, 2019

• Merge pull request #2 from CleverRaven/master

  Show description for 3f6b547
  Ramza13

  authored
  3f6b547

• get this centralized for me

  Ramza13

  committed
  452b617

• commit for me

  Ramza13

  committed
  5c8fb32

• Revert "commit for me"

  Show description for cddd683
  Ramza13

  committed
  cddd683

• Revert "get this centralized for me"

  Show description for 882a9b7
  Ramza13

  committed
  882a9b7

• Added back penalty for hindered legs as it woul dstill have effect and decided to still allow martial arts/normal attack damage while on the ground

  Ramza13

  committed
  8bd3216

• Astyle

  Ramza13

  committed
  9690ede

• Merge pull request #3 from CleverRaven/master

  Show description for a9f5095
  Ramza13

  authored
  a9f5095

• Fix some typos (CleverRaven#34730)

  Show description for bbd31db
  

  Cyrano7

  authored and

  Ramza13

  committed
  bbd31db

• Add a strong antibiotic.

  Show description for 48d38fe
  

  TheRafters

  authored and

  Ramza13

  committed
  48d38fe

• Less than half the chance of antibiotics

  

  TheRafters

  authored and

  Ramza13

  committed
  8d57919

• Add to hospital_lab and hard_drugs itemgroups

  Show description for b09fe69
  

  TheRafters

  authored and

  Ramza13

  committed
  b09fe69

• Use the STRONG_ANTIBIOTIC flag

  Show description for 7137c74
  

  TheRafters

  authored and

  Ramza13

  committed
  7137c74

• Commas!

  Show description for fe23abb
  

  TheRafters

  authored and

  Ramza13

  committed
  fe23abb

• Remove redundant field

  

  TheRafters

  authored and

  Ramza13

  committed
  5e50a3a

• renamed to dapterocozamin

  Show description for df3d1f0
  

  TheRafters

  authored and

  Ramza13

  committed
  df3d1f0

• Dapterocozamin was too damned long

  Show description for 5155089
  

  TheRafters

  authored and

  Ramza13

  committed
  5155089

• too slang like

  Show description for c6a96f1
  

  TheRafters

  authored and

  Ramza13

  committed
  c6a96f1

• translocation ignores fall damage

  

  KorGgenT

  authored and

  Ramza13

  committed
  3ce4fc0

• move spores() and blossoms() from player:: to Character:: (CleverRaven#34736)

  Show description for a0c4d1e
  

  KorGgenT

  authored and

  Ramza13

  committed
  a0c4d1e

• add some domestic furniture and terrain (CleverRaven#34734)

  Show description for 5c6cfc0
  

  curstwist

  authored and

  Ramza13

  committed
  5c6cfc0

• Vertical move effects (CleverRaven#34732)

  Ramza13

  committed
  488d4d6

• add roof, landscaping, cosmetic changes to house_w_1

  

  curstwist

  authored and

  Ramza13

  committed
  8d710ec

• player::position to Character

  

  KorGgenT

  authored and

  Ramza13

  committed
  ecb383f

• npctrade: use drop_invalid_inventory() instead of drop_items()

  Show description for e5cf9a7
  

  mlangsdorf

  authored and

  Ramza13

  committed
  e5cf9a7

• Update clang-tidy text style check (CleverRaven#34716)

  Show description for ca1af9f
  

  Qrox

  authored and

  Ramza13

  committed
  ca1af9f

• Autoclave menu gives more information about denials (CleverRaven#34722)

  Show description for 4620bac
  

  Fris0uman

  authored and

  Ramza13

  committed
  4620bac

• Fix furniture door pathfinding

  

  KnightosMaster

  authored and

  Ramza13

  committed
  716f606

• Get rid of auto in favor of proper types

  

  ZhilkinSerg

  authored and

  Ramza13

  committed
  5ceffdf

• Fix pull request template misleading formatting (CleverRaven#34763)

  Show description for 838e617
  

  reed501

  authored and

  Ramza13

  committed
  838e617

• Martial Arts Rebalance for Taekwondo

  

  Hymore246

  authored and

  Ramza13

  committed
  b4ab731

• take_weapon has priority over disarm

  

  Hymore246

  authored and

  Ramza13

  committed
  53a2ab1

• Fix for item variable

  

  Hymore246

  authored and

  Ramza13

  committed
  fc169a7

• Astyle fix

  

  Hymore246

  authored and

  Ramza13

  committed
  f3efabe

• Astyle fix again

  

  Hymore246

  authored and

  Ramza13

  committed
  c224dbb

• mon_centipede looks like mon_centipede_giant

  

  barsoosayque

  authored and

  Ramza13

  committed
  2224555

• Fuji's Military Professions Mod (CleverRaven#34767)

  

  NotFuji

  authored and

  Ramza13

  committed
  9a289d1

• Fixed inactive incendiary grenades not exploding if thrown in fire (CleverRaven#34769)

  Show description for 2f370dc
  

  Night-Pryanik

  authored and

  Ramza13

  committed
  2f370dc

• Fixed speed indicator overlapping stamina indicator

  

  Night-Pryanik

  authored and

  Ramza13

  committed
  d9ed534

• Running/crouching while swimming will result in faster/slower swim speed (CleverRaven#34770)

  Show description for 9861854
  

  Night-Pryanik

  authored and

  Ramza13

  committed
  9861854

• Fix disabled limb check for bicycles

  

  AlexMooney

  authored and

  Ramza13

  committed
  7568ee9

• add tele_sight to itemgroups

  

  snipercup

  authored and

  Ramza13

  committed
  4e3ab76

• changed celery volume to better reflect the mass-to-volume ratio in real life

  

  y2s82

  authored and

  Ramza13

  committed
  ef15602

• Revert "add tele_sight to itemgroups"

  

  ZhilkinSerg

  authored and

  Ramza13

  committed
  32f1ef1

• Fix astyle regression (2019-10-15) (CleverRaven#34772)

  Show description for 5733a0e
  

  ZhilkinSerg

  authored and

  Ramza13

  committed
  5733a0e

• Check for duplicate entries in active_npc before inserting.

  

  ipcyborg

  authored and

  Ramza13

  committed
  588654d

• Changelog thru october (CleverRaven#34731)

  Show description for 7d70f76
  

  2 peopleauthored and

  Ramza13

  committed
  7d70f76

• Crafting display infinite (CleverRaven#34726)

  Ramza13

  committed
  1b523e3

• Switched the Stats and Traits tab in the character creation screen

  

  Xanderga

  authored and

  Ramza13

  committed
  35fe1d9

• Prevent counterattacks if tired or dead (CleverRaven#34793)

  Show description for b95bf4c
  

  Hymore246

  authored and

  Ramza13

  committed
  b95bf4c

• BUG: Fix redundancy error in cattail-jelly recipe

  

  Oddant1

  authored and

  Ramza13

  committed
  b80ac4d

• Fix immersion suit Iuse

  

  John-Candlebury

  authored and

  Ramza13

  committed
  8d462d6

• Updated type section of technique description

  

  Hymore246

  authored and

  Ramza13

  committed
  f86ef30

• move clothes item_groups

  

  curstwist

  authored and

  Ramza13

  committed
  8224120

• Fix repair activity for tools in vehicle

  Show description for 91f0a94
  

  ifreund

  authored and

  Ramza13

  committed
  91f0a94

• Remove unneeded code from read_do_turn

  

  KnightosMaster

  authored and

  Ramza13

  committed
  87f02ca

• add roof, landscaping to house_w_2

  

  curstwist

  authored and

  Ramza13

  committed
  a0b378d

• Usuable not dirty bionics in inv always green

  

  RDru

  authored and

  Ramza13

  committed
  bd40106

• finish reorganizing furniture.json (CleverRaven#34758)

  Show description for d386e87
  

  curstwist

  authored and

  Ramza13

  committed
  d386e87

• change crossed_threshold() scope and test_crossing_threshold() parameter to Character (CleverRaven#34761)

  Show description for a6aef18
  

  KorGgenT

  authored and

  Ramza13

  committed
  a6aef18

• Migrate move mode and related code from player (CleverRaven#34762)

  Show description for 3f7b1f3
  

  ifreund

  authored and

  Ramza13

  committed
  3f7b1f3

• Tweaked NPC "Trade how many" menu

  

  Night-Pryanik

  authored and

  Ramza13

  committed
  7b8ef1b

• Allow auto targeting mode for turrets only with installed turret control unit (CleverRaven#34202)

  Show description for c75cf5d
  

  Night-Pryanik

  authored and

  Ramza13

  committed
  c75cf5d

• Changed how unarmed xp is calculated (CleverRaven#34723)

  

  Xanderga

  authored and

  Ramza13

  committed
  73565ed

• Fixed targeting UI issue for reach attack.

  

  ipcyborg

  authored and

  Ramza13

  committed
  19dc3c3

• removes extra capacity

  

  Fris0uman

  authored and

  Ramza13

  committed
  aaedbe8

• Mythological replicas work with martial arts

  Show description for 0d14c25
  

  TheShadowFerret

  authored and

  Ramza13

  committed
  0d14c25

• Fix: Dialogs not showing while tailoring.

  

  OzoneH3

  authored and

  Ramza13

  committed
  0a10873

• Magiclysm - Introducing Channel Wands and Disposable Wands (CleverRaven#34653)

  Show description for 806d5fb
  

  foulman

  authored and

  Ramza13

  committed
  806d5fb

Commits on Oct 22, 2019

• Merge pull request #4 from CleverRaven/master

  Show description for a096b1e
  Ramza13

  authored
  a096b1e

• Complete merge

  Ramza13

  committed
  b872eb6

Commits on Nov 1, 2019

• Merge pull request #5 from CleverRaven/master

  Show description for 356458d
  Ramza13

  authored
  356458d

Commits on Nov 4, 2019

• Merge pull request #6 from CleverRaven/master

  Show description for c55c171
  Ramza13

  authored
  c55c171

• undo accidental change

  Ramza13

  committed
  9d76789

• Merge branch 'master' of https://github.com/Ramza13/Cataclysm-DDA

  Ramza13

  committed
  20f6281

• reset view offset on death

  Ramza13

  committed
  642cf41