[pull] master from CleverRaven:master #28
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
The saiga 410 is gonna get deleted in a future PR
* Handled nowhere parent * Update src/item_location.cpp Co-authored-by: mqrause <[email protected]> --------- Co-authored-by: mqrause <[email protected]>
Update mutations.json
* Add roof to apartment_con_new's stairwell * lint
Fix Dear ImTui Demo
* Added build instructions for Fedora * Move debian header --------- Co-authored-by: strategictraveler <>
* turn off ATMs * actually turn it off; add reference to an ATM * replace aftershock terrain with furniture * add migration * 🫡 Co-authored-by: Karol1223 <[email protected]> * add dummy parser for ter_furn_migration * add required_str * more fixes --------- Co-authored-by: Karol1223 <[email protected]>
…ated EoCs and out of spell JSON (Animist/biomancer edition) (#76160) * Initial commit * Update UI * Fix incorrect multipliers * Do biomancy
Autodrive works on forest trails again (for tiny vehicles)
…76148) * Update eoc_learn_recipes.json * Update data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
[Sky Island] Fix pond recipe failed refunds
Fix overlook in #76029
* Improved companion order failure reporting somewhat * Update src/activity_item_handling.cpp Co-authored-by: Karol1223 <[email protected]> * Update src/activity_item_handling.cpp Co-authored-by: Karol1223 <[email protected]> * Update src/activity_item_handling.cpp Co-authored-by: Karol1223 <[email protected]> --------- Co-authored-by: Karol1223 <[email protected]>
Prevent XEDRA mercenary officer from evolving, which otherwise prevents finishing the haunting fight
* Weekly Changelog 2024-08-26 to 2024-09-02 * Apply suggestions from code review --------- Co-authored-by: David Seguin <[email protected]> Co-authored-by: Maleclypse <[email protected]>
fix explosion in bubble
* show spell components again in the new imGui spell list. Remove broken color tags in spells Currently the new ui does not display spell components, and there are colors tags in spell data that are ignored resolves #75669 and #76137 * colors regression in spell info will be fixed will use correct enery type when displaying "not enough" fixing spell list regression from imgui uilist update * removed unused properties of spellcasting_callback * fix warnings in magic.cpp
…-artifact-version bump version of actions/download-artifact
* ``resources\alien.json`` * ``generic.json`` * ``armor\ammo_pouch.json`` + ``armor\cloaks.json`` * ``comestibles\other.json`` + ``comestibles\raw_veggy.json`` * ``armor\scarfs.json`` * tests
* add baby_monster_group * Simplify baby check * Update src/monmove.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix lost id --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* simplify random assignment of natural hair color * Remove processed_eocs of natural hair color * Add missing hair styles to be reset * Remove duplicated entry of mullet
Add ClangCL to CMake Visual Studio
properly compute colors for palette indexes above 15 in curses builds
… deduction (#76136) * do the fix * Update data/mods/Xedra_Evolved/spells/inventor_spells.json * Update data/mods/Xedra_Evolved/spells/inventor_spells.json --------- Co-authored-by: Maleclypse <[email protected]>
…arch [Xedra Evolved] Extend hedge magic research system, part 2
* Main commit * Remove from tests * Add space for M70 * Spelling errors * fix m1 garand * Plural Sharps * more variants * name fix for Navy * pluralses'sies * Apply suggestions from code review (Thanks DSeyka!) Co-authored-by: DSeyka <[email protected]> * Replacing "str_sp" --------- Co-authored-by: DSeyka <[email protected]>
* Migrate ACT_PULP to the new activity actor system * satisfy clang
Updated default keybindings for changing start dates in character creation menu
fix the skill editor to use the text property instead of textformatted
Fix inconsistent crafting range
* Fix an issue where trying to cast a spell causes the wrong spell to be cast currently selecting a spell in a long sorted spell list will cast the wrong spell due to select spell returing a sorted spell id while handle_action.cpp looks only at the unsorted spells fixes #76042 Fix an issue where trying to cast a spell causes the wrong spell to be cast * Apply suggestions from automated code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * solve issue with closing spell menu with no spell selected streamline the feature and fix a bug * removed an unwanted code comment from the previous commit * Apply suggestions from automated code review local astyle somehow missed those Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )