Skip to content

Commit 69cad98

Browse files
authored
Merge branch 'master' into squid-gui/spectate(nicknames)
2 parents 3fb5645 + def13b7 commit 69cad98

26 files changed

+1111
-547
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
args: ['--fix=lf']
2121
- id: trailing-whitespace
2222
- repo: https://github.com/python-jsonschema/check-jsonschema
23-
rev: 0.31.2
23+
rev: 0.32.1
2424
hooks:
2525
- id: check-github-workflows
2626
- repo: https://github.com/Lucas-C/pre-commit-hooks

changelog.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Template for new versions:
1616

1717
## New Features
1818

19+
- `gui/design`: add option to draw N-point stars, hollow or filled or inverted, and change the main axis to orient in any direction
20+
1921
## Fixes
2022

2123
## Misc Improvements
@@ -27,20 +29,34 @@ Template for new versions:
2729
# Future
2830

2931
## New Tools
32+
- `deteriorate`: (reinstated) allow corpses, body parts, food, and/or damaged clothes to rot away
33+
- `modtools/moddable-gods`: (reinstated) create new deities from scratch
3034

3135
## New Features
3236
- `gui/spectate`: added "Prefer nicknamed" to the list of options
37+
- `gui/mod-manager`: when run in a loaded world, shows a list of active mods -- click to export the list to the clipboard for easy sharing or posting
38+
39+
## Fixes
40+
- `starvingdead`: properly restore to correct enabled state when loading a new game that is different from the first game loaded in this session
41+
- `starvingdead`: ensure undead decay does not happen faster than the declared decay rate when saving and loading the game
42+
43+
## Misc Improvements
44+
- `remove-stress`: also applied to long-term stress, immediately removing stressed and haggard statuses
45+
46+
## Removed
47+
48+
# 51.11-r1
3349

3450
## Fixes
3551
- `list-agreements`: fix date math when determining petition age
3652
- `gui/petitions`: fix date math when determining petition age
53+
- `gui/rename`: fix commandline processing when manually specifying target ids
54+
- `gui/sandbox`: restore metal equipment options when spawning units
3755

3856
## Misc Improvements
3957
- `fix/loyaltycascade`: now also breaks up brawls and other intra-fort conflicts that *look* like loyalty cascades
4058
- `makeown`: remove selected unit from any current conflicts so they don't just start attacking other citizens when you make them a citizen of your fort
4159

42-
## Removed
43-
4460
# 51.09-r1
4561

4662
## New Features

0 commit comments

Comments
 (0)