Merge master, then fix compilation #12
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
|
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered. |
…ic-action-ar-bionic Remove the music action from AR bionic
…rrection Correct naming of Arisaka calibre
…intless-slur-b-gone Kill a pointless slur
fix GitHub errors; save `overmap_fast_travel` & `overmap_fast_scroll`
…orrection Correct naming of Desert Tec > Desert Tech in the MDRX assembly descriptions
* 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) (CleverRaven#76160) * Initial commit * Update UI * Fix incorrect multipliers * Do biomancy
…orest_trails Autodrive works on forest trails again (for tiny vehicles)
…leverRaven#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
* 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]>
…cer-evolving 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
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…rRaven#76149) * 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 CleverRaven#75669 and CleverRaven#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
…mp-download-artifact-version bump version of actions/download-artifact
Fix player_display: false where it shouldn't be. This was added in CleverRaven#69591 with seasonal mutations and should have been removed when the rest of those changes were removed.
Corrected rotation alignment correction
Toggle between the map and look around
…technomancer-eoc-rework [Magiclysm] Move bulk of spellcasting proficiency processing to dedicated EoCs and out of spell JSON (Finish)
* Initial commit * Fix plurals
Fix some random NPC's mission
* try fix TRex bio op * try fix zom spino bio op * try fix zombie upgrades
…rinkable (CleverRaven#76458) * Initial commit * Add sleepiness chance to the cold * Remove unused resist effect * Add nightmares * Prevent liquid from freezing * Phrasing
[MoM] Cancelling Gateway area attunement cancels attunement
* [DinoMod] Astrodon * Update monstergroups_egg.json * Update hatchling.json * Update juvenile.json * Update dinosaur.json * Update dictionary.txt * plural * Update zed-dinosaur.json * Update fungus.json * Update zinosaur_burned.json * Update zinosaur_upgrade.json * zinosaur groups * round * round zombie * Update wilderness.json * Update dinosaur.json
* add ammo category to clips * remove field handled by copy-from * Remove suggested items from ammo category
Remove spacing at start of ImGui uilist and right-align context text.
…-additions Release instructions and extend some jq tools
…ription Migrate extended description (`x`->`e`) to imgui
* add faults to a guns that can have them * Thank you Ferret Co-authored-by: TheShadowFerret <[email protected]> * Lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Fix ATM terrain to furniture migration
…ng profs) (CleverRaven#76159) * Weakpoints & Butchery * Linty boi
Some cleanup of vehicle code
* Update mf_wild.json corrected grammar of american zebra * Update mf_domestic.json fix grammar * Update biokinesis.json fix grammar * Update spell_scrolls.json Fix grammar * Update artifact_grade_items.json grammar * Update scenarios.json grammar * Update house_detatched5.json tile fix * Update bungalow23.json Fixed tables with standard palette, kitchen was left as flooring up to existing furniture is common practice, if uniformity is preferred I can come back to it, and I'm honestly not sure what to do with the pantry... * Update house34.json Added a separate terrain + furniture parameter for indoor potted plants, same fix will be used going forward. * Update house38.json floor parameter added for indoor potted plant * Update gambling_hall.json linoleum floor parameter added for heavy duty freezer * Update data/json/mapgen/house/house34.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/house/house34.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/house/house34.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update house34.json * Update gambling_hall.json oops * Update gambling_hall.json comma * Update bungalow23.json Linting? This is confusing me NGL. * Update bungalow23.json pleasing the Git God --------- Co-authored-by: Maleclypse <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Initial commit * count o to 4--some might have lost their jewelry
…the metabolism coldness. (CleverRaven#76435) * Update xe_playable_gracken.json * Update data/mods/Xedra_Evolved/mutations/xe_playable_gracken.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>
|
ImGui was updated on upstream master. This is no longer necessary. |
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.
Summary
Bugfixes "Merge master, then fix compilation"
Purpose of change
ActivateItemwas renamed toActivateItemByIDin newer ImGui, but the code used the old one.Describe the solution
Use
ActivateItemByID.Describe alternatives you've considered
Testing
It compiles now. (Does it? Didn't link on my machine.)
Additional context