Code

47#400

Code

Merged

lethosor merged 44 commits intoDFHack:masterDFHack/df-structures:masterfrom PatrikLundell:47PatrikLundell/df-structures:47Copy head branch name to clipboardAug 6, 2020

+1,067-674

Commits

Commits on Apr 15, 2020

• Merge branch 'master' of https://github.com/DFHack/df-structures into 47

  PatrikLundell

  committed
  642955d

  Copy full SHA for 642955d

Commits on Apr 22, 2020

• further identification

  PatrikLundell

  committed
  bce7e34

  Copy full SHA for bce7e34

• Merge branch 'master' of https://github.com/DFHack/df-structures into 47

  PatrikLundell

  committed
  e5bdfdb

  Copy full SHA for e5bdfdb

• minor army_controller adjustments

  PatrikLundell

  committed
  946fe92

  Copy full SHA for 946fe92

Commits on Apr 26, 2020

• additional minor army_controller research

  PatrikLundell

  committed
  3f5d0c9

  Copy full SHA for 3f5d0c9

• merge

  PatrikLundell

  committed
  d98d680

  Copy full SHA for d98d680

• corrected botched comment

  PatrikLundell

  committed
  30235b6

  Copy full SHA for 30235b6

• another schema validation correction

  PatrikLundell

  committed
  f051d86

  Copy full SHA for f051d86

• Merge branch 'master' of https://github.com/DFHack/df-structures into 47

  PatrikLundell

  committed
  337a393

  Copy full SHA for 337a393

Commits on Apr 30, 2020

• sanity, identification, and research

  PatrikLundell

  committed
  d5f952e

  Copy full SHA for d5f952e

• history field identification

  PatrikLundell

  committed
  cf9aca8

  Copy full SHA for cf9aca8

• season_type used for cur_season and moved

  PatrikLundell

  committed
  6e98409

  Copy full SHA for 6e98409

Commits on May 1, 2020

• intrigue and event collection field identification

  PatrikLundell

  committed
  da8e9a7

  Copy full SHA for da8e9a7

• fixed misspelled attributes

  PatrikLundell

  committed
  884a6ad

  Copy full SHA for 884a6ad

• misaligned identified fields, found enum value

  PatrikLundell

  committed
  d1d81d1

  Copy full SHA for d1d81d1

• was still misaligned, but found another enum type in the process

  PatrikLundell

  committed
  391b8a8

  Copy full SHA for 391b8a8

Commits on May 2, 2020

• identified a couple of enum values, general identification

  PatrikLundell

  committed
  4301eca

  Copy full SHA for 4301eca

Commits on May 8, 2020

• field identification

  PatrikLundell

  committed
  6e841a5

  Copy full SHA for 6e841a5

Commits on May 9, 2020

• more musical_forms field identification

  PatrikLundell

  committed
  c55994b

  Copy full SHA for c55994b

Commits on May 10, 2020

• musical_form/scale field identification

  PatrikLundell

  committed
  d1106db

  Copy full SHA for d1106db

Commits on May 12, 2020

• field identification

  PatrikLundell

  committed
  b699e98

  Copy full SHA for b699e98

• merged conflict

  PatrikLundell

  committed
  8f223a3

  Copy full SHA for 8f223a3

Commits on May 14, 2020

• region_weather fields, some enum values

  PatrikLundell

  committed
  a3ab7f3

  Copy full SHA for a3ab7f3

Commits on May 15, 2020

• addressed base-type comments

  PatrikLundell

  committed
  861ed52

  Copy full SHA for 861ed52

Commits on May 16, 2020

• dance form field identification

  PatrikLundell

  committed
  b2df97d

  Copy full SHA for b2df97d

Commits on May 17, 2020

• more dance field identification

  PatrikLundell

  committed
  e0cfb1f

  Copy full SHA for e0cfb1f

Commits on May 21, 2020

• identified enum value

  PatrikLundell

  committed
  d849c9b

  Copy full SHA for d849c9b

Commits on May 22, 2020

• schema limitation work around + fixed syntactic error

  PatrikLundell

  committed
  0d3cb0f

  Copy full SHA for 0d3cb0f

• second schema limitation work around attempt

  PatrikLundell

  committed
  b1f5473

  Copy full SHA for b1f5473

• merge

  PatrikLundell

  committed
  bdc4978

  Copy full SHA for bdc4978

Commits on May 29, 2020

• Merge branch 'master' of https://github.com/DFHack/df-structures into 47

  PatrikLundell

  committed
  c37f1bf

  Copy full SHA for c37f1bf

• identity enums identified and picked growths object data named

  PatrikLundell

  committed
  f16932f

  Copy full SHA for f16932f

• adapted to comments

  PatrikLundell

  committed
  dd109f1

  Copy full SHA for dd109f1

Commits on May 31, 2020

• dead civ flag identified + minor adjustments

  PatrikLundell

  committed
  41f763c

  Copy full SHA for 41f763c

Commits on Jun 2, 2020

• reverted incorrect flag 'identification'

  PatrikLundell

  committed
  2bb7f37

  Copy full SHA for 2bb7f37

Commits on Jun 7, 2020

• named field

  PatrikLundell

  committed
  56d2d60

  Copy full SHA for 56d2d60

Commits on Jun 26, 2020

• tedious and error prone merge

  PatrikLundell

  committed
  89452ec

  Copy full SHA for 89452ec

• fixed one merge error

  PatrikLundell

  committed
  b994d2a

  Copy full SHA for b994d2a

Commits on Aug 6, 2020

• Merge master into PatrikLundell/47 (INCOMPLETE) (DFHack#400)

  Show description for fa23ca6
  lethosor

  committed
  fa23ca6

  Copy full SHA for fa23ca6

• Manually apply historical_figure_relationships.intrigues changes to latest master (ecd6bcc)

  lethosor

  committed
  37d9df8

  Copy full SHA for 37d9df8

• Merge enums, remove duplicate types

  lethosor

  committed
  ef219bf

  Copy full SHA for ef219bf

• Merge master into DFHack#400 again

  Show description for e9b1108
  lethosor

  committed
  e9b1108

  Copy full SHA for e9b1108

• Change historical_figure_relationships.hf_visual.rank back to int16_t

  lethosor

  committed
  6169998

  Copy full SHA for 6169998

• Remove season_type (unused, duplicates "season")

  lethosor

  committed
  546c0fa

  Copy full SHA for 546c0fa