Code

Make consuming take time#40117

Code

Closed

Ramza13 wants to merge 30 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Ramza13:consume_timeRamza13/Cataclysm-DDA:consume_timeCopy head branch name to clipboard

+429-319

Commits

Commits on May 1, 2020

• Add spurge seeds

  Rail-Runner

  committed
  3838c3b

  Copy full SHA for 3838c3b

• Add item groups

  Rail-Runner

  committed
  e7e2d87

  Copy full SHA for e7e2d87

Commits on May 3, 2020

• Works with constant 5 minute time

  Ramza13

  committed
  a1110ab

  Copy full SHA for a1110ab

Commits on May 4, 2020

• Get time set correctly and containers handeld and medicine

  Ramza13

  committed
  cf091cc

  Copy full SHA for cf091cc

• Fix verb

  Ramza13

  committed
  8d058cb

  Copy full SHA for 8d058cb

• Formatting

  Ramza13

  committed
  0b9c3f2

  Copy full SHA for 0b9c3f2

• Merge branch 'master' into consume_time

  Ramza13

  authored
  314b291

  Copy full SHA for 314b291

• Hopefully fix all pockets conflicts

  Ramza13

  committed
  9200334

  Copy full SHA for 9200334

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

  Ramza13

  committed
  4fa8898

  Copy full SHA for 4fa8898

• Fix merge conflict

  Ramza13

  committed
  65f527b

  Copy full SHA for 65f527b

• Fix build

  Ramza13

  committed
  3bd3a9d

  Copy full SHA for 3bd3a9d

• Build fix once more

  Ramza13

  committed
  d31e9bc

  Copy full SHA for d31e9bc

• Fix crafting iteminfo test

  kevingranade

  committed
  b4cbba5

  Copy full SHA for b4cbba5

• storage definition hotfix

  kevingranade

  committed
  2ebad2a

  Copy full SHA for 2ebad2a

• Merge pull request CleverRaven#40049 from Rail-Runner/plants3

  Show description for 0c4d9b2
  Rivet-the-Zombie

  authored
  0c4d9b2

  Copy full SHA for 0c4d9b2

• Migrate inventory_ui.cpp and game_inventory.cpp to ui_adaptor

  Qrox

  committed
  8cc6f88

  Copy full SHA for 8cc6f88

• map fixes (CleverRaven#40113)

  curstwist

  authored
  6b7fa02

  Copy full SHA for 6b7fa02

• Update materials for bullet damage type (CleverRaven#40112)

  anothersimulacrum

  authored
  141e5ff

  Copy full SHA for 141e5ff

• Consume menu fix (CleverRaven#40108)

  KorGgenT

  authored
  54afa14

  Copy full SHA for 54afa14

• Merge pull request CleverRaven#40123 from kevingranade/fix-iteminfo-crafting-test

  Show description for 7ba9c31
  ZhilkinSerg

  authored
  7ba9c31

  Copy full SHA for 7ba9c31

• CFRelease CFString objects

  Show description for 5ed7427
  akirashirosawa

  authored
  5ed7427

  Copy full SHA for 5ed7427

• Make point and tripoint abs functions into methods. (CleverRaven#40106)

  kevingranade

  authored
  6d444b8

  Copy full SHA for 6d444b8

• Merge pull request CleverRaven#40094 from Qrox/migrate-ui-12

  Show description for 6f79dc9
  ZhilkinSerg

  authored
  6f79dc9

  Copy full SHA for 6f79dc9

• Merge pull request CleverRaven#40131 from akirashirosawa/fix-macos-memory-leak

  Show description for 7780822
  ZhilkinSerg

  authored
  7780822

  Copy full SHA for 7780822

• Remove uneeded code

  Ramza13

  committed
  64d8209

  Copy full SHA for 64d8209

• Fix style issue

  Ramza13

  committed
  63bbe9a

  Copy full SHA for 63bbe9a

• Code review suggestions

  Ramza13

  committed
  0c29d97

  Copy full SHA for 0c29d97

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

  Ramza13

  committed
  b305853

  Copy full SHA for b305853

• Code review changes/rebase

  Ramza13

  committed
  2a7e0de

  Copy full SHA for 2a7e0de

• Formatting

  Ramza13

  committed
  8911bad

  Copy full SHA for 8911bad