Skip to content

Commit

Permalink
Merge branch 'CleverRaven:master' into enchantment_stuff_again
Browse files Browse the repository at this point in the history
  • Loading branch information
GuardianDll authored Dec 12, 2024
2 parents 8df5b80 + b871679 commit 80c25fc
Show file tree
Hide file tree
Showing 55 changed files with 2,486 additions and 1,541 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,25 +166,6 @@ jobs:
ccache_limit: 4G
ccache_key: linux-gcc-11-asan

- compiler: g++
os: ubuntu-latest
cmake: 0
native:
pch: 1
tiles: 1
sound: 1
localize: 1
libbacktrace: 1
title: GCC 12, Ubuntu cross-compile to MinGW-Win64, Tiles, Sound
ldflags: -static-libgcc -static-libstdc++
mxe_target: x86_64-w64-mingw32.static.gcc12
wine: wine
# ~285MB in a clean build
# ~36MB compressed
# observed usage: 3.0GB -> 350MB
ccache_limit: 2G
ccache_key: mingw-gcc-12

- compiler: g++-9
os: ubuntu-latest
cmake: 1
Expand Down
9 changes: 9 additions & 0 deletions data/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ Wildlife foods adjust morale
Add dormant zombies to more locations
Add tupelo and nannyberry, hobblebush and autumn olive trees
New exodii rifle
Remade the 3x3 hospital
Some houses are under construction


## Interface:
Expand Down Expand Up @@ -532,6 +534,9 @@ shorten `memorize` hint in crafting GUI search
some little improvements to the AIM drop menu
Allow fine user customization of ImGui colors
Migrate scores window to imgui
Audit `satiety`
Add filter for body part coverage to the crafting GUI
Add filter for clothing layer to the crafting GUI, AIM, inventory etc.


## Mods:
Expand Down Expand Up @@ -873,6 +878,9 @@ Mods can add categories to the help menu
Martial Mastery: Insight is cleared when using other martial arts
[MoM] Change id of Sense Minds sensing effect to use new tileset sprite
[MoM/XE] Add deactivate_conditions to recurring EoCs that don't need to recur for everyone
[Xedra Evolved] Add new time related powers for each default dream class
Aftershock: Replace exosuit forcefield with backpack generator
[MoM] Add new `u_cancel_activity` to unlocking new power/wakeful rest


## Balance:
Expand Down Expand Up @@ -1371,6 +1379,7 @@ fix limb drying rate and related test data
crash on keybind reset in UILIST
Fix broken macOS build due removed folder
Fix an EOC that was looping infinitely and starting more loops as you travel
Allow attacking with CANNOT_MOVE flag


## Performance:
Expand Down
Loading

0 comments on commit 80c25fc

Please sign in to comment.