Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #70957 #73973

Closed
wants to merge 136 commits into from
Closed

Backport #70957 #73973

wants to merge 136 commits into from

Conversation

Procyonae
Copy link
Contributor

Summary

None

Purpose of change

Solves a stable blocker

Describe the solution

Backport #70957

Describe alternatives you've considered

Testing

Additional context

I-am-Erk and others added 30 commits January 21, 2024 00:32
@I-am-Erk @github-actions
Update version strings for H-stable branch (CleverRaven#70663)
5d069f2 
* Update Makefile

still set to 0.F!

* Update release.yml

* Update vcpkg.json

* Update vcpkg.json

* Update version.cpp

* Update main_menu.cpp

* Update src/main_menu.cpp

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>
@kevingranade
make 0.H release candidates bump gh-page build
2a2797e
@kevingranade
Update matrix build to target 0.H-branch
a6d100a
@kevingranade
Update msvc build to target 0.H-branch
d42119c
@kevingranade
Update pr-validator.yml for 0.H-branch
f64e70e
@kevingranade
Update release.yml for 0.H-branch
2a32cf8
@kevingranade
Update text-changes-analyzer.yml for 0.H-branch
a5a63f1
@kevingranade
Update .github/workflows/gh-pages-rebuild.yml
88d5597
@kevingranade
Update matrix.yml
dfa2790
@kevingranade
Update .github/workflows/msvc-full-features.yml
46e5630
@Maleclypse
Merge pull request CleverRaven#73638 from CleverRaven/kevingranade-0.…
06c20a0 
…H-automation

Automation changes for 0.H release candidates
@Procyonae @LyleSY
Backport CleverRaven#73632
6b42819 
Co-Authored-By: LyleSY <[email protected]>
@I-am-Erk
Merge pull request CleverRaven#73660 from Procyonae/Backport73632
cc8e8cb 
Backport CleverRaven#73632
@Procyonae @katemonster33 @andrei8l
Fixing an issue where item_pocket::better_pocket causes undefined beh…
cbac3cf 
…avior when used in sorting (CleverRaven#72942) (CleverRaven#73669)

Co-authored-by: Kate <[email protected]>
Co-authored-by: andrei <[email protected]>
@Procyonae @Brambor
d for debug (keybinding) (CleverRaven#73113) (CleverRaven#73670)
8a34b25 
Co-authored-by: Brambor <[email protected]>
@Procyonae @BrettDong
Fix int32_t overflow in energy display (CleverRaven#73673)
2371148 
Co-authored-by: Binrui Dong <[email protected]>
@BrettDong @Procyonae
Fix map deserialization error (CleverRaven#71860)
813d224
@kevingranade
Backport updated release notes generation workflow to 0.H (CleverRave…
bef2bac 
…n#73686)

* Backport updated release notes generation workflow to 0.H
@kevingranade
Seperate concurrency label for release candidate
dd37e8c 
Otherwise 0.H or experimental build can just get skipped.
@kevingranade
fix second instance of release label
ff383b1
@akrieger @kevingranade
Fix MSVC release build translations compilation
d567532
@Procyonae @Qrox
Include unistd.h for getpid on MSYS2 (CleverRaven#70769) (CleverRaven…
8791258 
…#73683)

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
@kevingranade
dereference the std optional
456277a
@Procyonae @GuardianDll
fix lamp_oil recipe (CleverRaven#73685)
2917cec 
Co-authored-by: Anton Simakov <[email protected]>
@dseguin
Merge pull request CleverRaven#73684 from Procyonae/Backport71860
9e77385 
Backport CleverRaven#71860
@GuardianDll @Procyonae
make pupating explosion quieter
4125db4
@casswedson @Procyonae
fix pupating nuclar detonation (CleverRaven#73526)
5974106 
no more mininuke loudness levels from exploding pupating zeds also
increase aoe cause they were failing to spawn even if the pupating zed
was by itself with nothig around it, tweak a few things also add a
description sound

Co-authored-by: casswedson <[email protected]>
@wwkk222208 @Procyonae
NPCs will prioritize wielding ranged weapons when allowed. (CleverRav…
c28518c 
…en#72222)

* NPCs will  prioritize wielding ranged weapons when allowed.

* style of comment
@RenechCDDA @Procyonae
Test for NPCs preferring to wield guns
0917c6e
@nornagon @Procyonae
fix (f)ire "draw what" menu repeating same gun
fd6a398
@github-actions github-actions bot added Items: Food / Vitamins Comestibles and drinks Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Melee Melee weapons, tactics, techniques, reach attack Character / World Generation Issues and enhancements concerning stages of creating a character or a world [Python] Code made in Python Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Items: Containers Things that hold other things Code: Tooling Tooling that is not part of the main game but is part of the repo. Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing Appliance/Power Grid Anything to do with appliances and power grid Mods: No Hope Relating to the mod No Hope EOC: Effects On Condition Anything concerning Effects On Condition Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Desert Region Anything relating to the Desert Region mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Bombastic Perks Mods: Mind Over Matter labels May 20, 2024
github-actions[bot]
github-actions bot reviewed May 20, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @bombasticSlacks @I-am-Erk @Standing-Storm @Night-Pryanik

@Procyonae Procyonae closed this May 20, 2024
@Procyonae Procyonae deleted the Backport70957 branch December 1, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
Appliance/Power Grid Anything to do with appliances and power grid Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Character / World Generation Issues and enhancements concerning stages of creating a character or a world Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling EOC: Effects On Condition Anything concerning Effects On Condition Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Info / User Interface Game - player communication, menus, etc. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Mechanics: Enchantments / Spells Enchantments and spells Melee Melee weapons, tactics, techniques, reach attack Missions Quests and missions Mods: Aftershock Anything to do with the Aftershock mod Mods: Bombastic Perks Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Desert Region Anything relating to the Desert Region mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership [Python] Code made in Python Spawn Creatures, items, vehicles, locations appearing on map Translation I18n Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.