Code

New Dynamic Faction Endings#74126

Code

Merged

Maleclypse merged 68 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom GalacticApple:factionsGalacticApple/Cataclysm-DDA:factionsCopy head branch name to clipboardJun 18, 2024

+309-21

Commits

Commits on May 26, 2024

• adds dynamic faction epilogues

  GalacticApple

  committed
  cd57497

  Copy full SHA for cd57497

• dynamic epilogues update 1

  GalacticApple

  committed
  646c231

  Copy full SHA for 646c231

• Merge branch 'CleverRaven:master' into factions

  GalacticApple

  authored
  5b6bdce

  Copy full SHA for 5b6bdce

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  32a18b6

  Copy full SHA for 32a18b6

• fixed Hub-01 "neutral" ending

  GalacticApple

  committed
  1e72f14

  Copy full SHA for 1e72f14

• Hells Raiders text update

  GalacticApple

  committed
  1d45020

  Copy full SHA for 1d45020

• format fix

  GalacticApple

  committed
  f6bb6c7

  Copy full SHA for f6bb6c7

• added free merchant ending

  GalacticApple

  committed
  2830240

  Copy full SHA for 2830240

• format fixes

  GalacticApple

  committed
  4ffe243

  Copy full SHA for 4ffe243

• correct CLRF type in game.h

  GalacticApple

  committed
  cf53bfe

  Copy full SHA for cf53bfe

• Isherwood text update

  GalacticApple

  committed
  e2ae88c

  Copy full SHA for e2ae88c

• Update src/faction.cpp

  Show description for 41dd8b7
  

  GalacticApple

  and

  github-actions[bot]

  authored
  41dd8b7

  Copy full SHA for 41dd8b7

• Update src/game.cpp

  Show description for b03ae28
  

  GalacticApple

  and

  github-actions[bot]

  authored
  b03ae28

  Copy full SHA for b03ae28

• Update src/game.cpp

  Show description for 6ff7e20
  

  GalacticApple

  and

  github-actions[bot]

  authored
  6ff7e20

  Copy full SHA for 6ff7e20

• Update src/game.cpp

  Show description for ebeb594
  

  GalacticApple

  and

  github-actions[bot]

  authored
  ebeb594

  Copy full SHA for ebeb594

• Update src/game.cpp

  Show description for 73618ea
  

  GalacticApple

  and

  github-actions[bot]

  authored
  73618ea

  Copy full SHA for 73618ea

• Update src/game.h

  Show description for 7c5c47e
  

  GalacticApple

  and

  github-actions[bot]

  authored
  7c5c47e

  Copy full SHA for 7c5c47e

• fix integer variables

  GalacticApple

  committed
  58ac75f

  Copy full SHA for 58ac75f

• char update

  GalacticApple

  committed
  9eb05b3

  Copy full SHA for 9eb05b3

Commits on May 27, 2024

• char fix

  GalacticApple

  committed
  3672471

  Copy full SHA for 3672471

• Update epilogue_factions.json

  GalacticApple

  authored
  8415044

  Copy full SHA for 8415044

Commits on May 28, 2024

• updates

  GalacticApple

  committed
  364dda4

  Copy full SHA for 364dda4

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  4354dec

  Copy full SHA for 4354dec

• fix for faction.cpp and faction.h

  GalacticApple

  committed
  d24b527

  Copy full SHA for d24b527

Commits on May 30, 2024

• Apply suggestions from code review

  Show description for 1d0303c
  

  Maleclypse

  and

  github-actions[bot]

  authored
  1d0303c

  Copy full SHA for 1d0303c

Commits on May 31, 2024

• faction.cpp fixes

  GalacticApple

  committed
  6279bd6

  Copy full SHA for 6279bd6

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  c5756d6

  Copy full SHA for c5756d6

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  d1a2ab9

  Copy full SHA for d1a2ab9

• Update faction.h

  GalacticApple

  committed
  2484866

  Copy full SHA for 2484866

• Update data/json/npcs/factions.json

  Show description for 7650b03
  

  GalacticApple

  and

  github-actions[bot]

  authored
  7650b03

  Copy full SHA for 7650b03

• Update data/json/npcs/factions.json

  Show description for e35c8f1
  

  GalacticApple

  and

  github-actions[bot]

  authored
  e35c8f1

  Copy full SHA for e35c8f1

• Update data/json/npcs/factions.json

  Show description for cc609eb
  

  GalacticApple

  and

  github-actions[bot]

  authored
  cc609eb

  Copy full SHA for cc609eb

• Update data/json/npcs/factions.json

  Show description for 554a3d3
  

  GalacticApple

  and

  github-actions[bot]

  authored
  554a3d3

  Copy full SHA for 554a3d3

• Update data/json/npcs/factions.json

  Show description for b01c75c
  

  GalacticApple

  and

  github-actions[bot]

  authored
  b01c75c

  Copy full SHA for b01c75c

• Update src/faction.cpp

  Show description for 354db49
  

  GalacticApple

  and

  github-actions[bot]

  authored
  354db49

  Copy full SHA for 354db49

• Update src/faction.cpp

  Show description for 599ade8
  

  GalacticApple

  and

  github-actions[bot]

  authored
  599ade8

  Copy full SHA for 599ade8

• Update src/faction.cpp

  Show description for f2c7646
  

  GalacticApple

  and

  github-actions[bot]

  authored
  f2c7646

  Copy full SHA for f2c7646

• Update src/faction.cpp

  Show description for 45dbb1d
  

  GalacticApple

  and

  github-actions[bot]

  authored
  45dbb1d

  Copy full SHA for 45dbb1d

• Update src/faction.h

  Show description for b2af5bb
  

  GalacticApple

  and

  github-actions[bot]

  authored
  b2af5bb

  Copy full SHA for b2af5bb

• Update data/json/npcs/factions.json

  Show description for 02f643f
  

  GalacticApple

  and

  github-actions[bot]

  authored
  02f643f

  Copy full SHA for 02f643f

• Update data/json/npcs/factions.json

  Show description for a8e659d
  

  GalacticApple

  and

  github-actions[bot]

  authored
  a8e659d

  Copy full SHA for a8e659d

• Update src/faction.cpp

  Show description for e8db0c0
  

  GalacticApple

  and

  github-actions[bot]

  authored
  e8db0c0

  Copy full SHA for e8db0c0

• consumes_food fix

  GalacticApple

  committed
  96c1755

  Copy full SHA for 96c1755

• actual consumes_food fix

  GalacticApple

  committed
  ce16a2a

  Copy full SHA for ce16a2a

• Update src/faction.h

  Show description for 4ab7263
  

  GalacticApple

  and

  github-actions[bot]

  authored
  4ab7263

  Copy full SHA for 4ab7263

• json fix

  GalacticApple

  committed
  5707a7a

  Copy full SHA for 5707a7a

• Update src/faction.h

  Show description for fff1db0
  

  GalacticApple

  and

  github-actions[bot]

  authored
  fff1db0

  Copy full SHA for fff1db0

• text update

  GalacticApple

  committed
  5a8740d

  Copy full SHA for 5a8740d

• Update data/json/npcs/factions.json

  Show description for b3e7525
  

  GalacticApple

  and

  github-actions[bot]

  authored
  b3e7525

  Copy full SHA for b3e7525

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  2f42115

  Copy full SHA for 2f42115

• another text update

  GalacticApple

  committed
  92a6c7a

  Copy full SHA for 92a6c7a

• astyle fix

  GalacticApple

  committed
  0c9eb0b

  Copy full SHA for 0c9eb0b

• Update src/faction.cpp

  Show description for e627283
  

  GalacticApple

  and

  github-actions[bot]

  authored
  e627283

  Copy full SHA for e627283

• Update src/faction.cpp

  Show description for d3fc083
  

  GalacticApple

  and

  github-actions[bot]

  authored
  d3fc083

  Copy full SHA for d3fc083

• text update

  GalacticApple

  committed
  5a13a42

  Copy full SHA for 5a13a42

• Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm-DDA into factions

  GalacticApple

  committed
  c22dfa9

  Copy full SHA for c22dfa9

• typo

  GalacticApple

  committed
  fa30c6b

  Copy full SHA for fa30c6b

• removed testing values

  GalacticApple

  committed
  6fe59fe

  Copy full SHA for 6fe59fe

Commits on Jun 2, 2024

• Update src/faction.cpp

  Show description for 178b5fc
  

  GalacticApple

  and

  anothersimulacrum

  authored
  178b5fc

  Copy full SHA for 178b5fc

• Update src/faction.cpp

  Show description for 9b37101
  

  GalacticApple

  and

  anothersimulacrum

  authored
  9b37101

  Copy full SHA for 9b37101

• Update src/faction.cpp

  Show description for 9578ff0
  

  GalacticApple

  and

  anothersimulacrum

  authored
  9578ff0

  Copy full SHA for 9578ff0

• Update src/faction.cpp

  Show description for 5bc9f57
  

  GalacticApple

  and

  anothersimulacrum

  authored
  5bc9f57

  Copy full SHA for 5bc9f57

• Update src/game.cpp

  Show description for 8230dbd
  

  GalacticApple

  and

  anothersimulacrum

  authored
  8230dbd

  Copy full SHA for 8230dbd

• Update src/faction.h

  Show description for 0bef362
  

  GalacticApple

  and

  anothersimulacrum

  authored
  0bef362

  Copy full SHA for 0bef362

• Merge branch 'CleverRaven:master' into factions

  GalacticApple

  authored
  4b0d91c

  Copy full SHA for 4b0d91c

• Update factions.json

  GalacticApple

  authored
  1dd469d

  Copy full SHA for 1dd469d

Commits on Jun 11, 2024

• Merge branch 'CleverRaven:master' into factions

  GalacticApple

  authored
  5668960

  Copy full SHA for 5668960

Commits on Jun 18, 2024

• Apply suggestions from code review

  Maleclypse

  authored
  7b6af24

  Copy full SHA for 7b6af24