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

Merge master into development #6547

Merged
merged 23 commits into from
Sep 1, 2023
Merged

Merge master into development #6547

merged 23 commits into from
Sep 1, 2023

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Sep 1, 2023

timedemo file regenerated from the current master with the --demo 0 --record 1 trick

kphoenix137 and others added 23 commits August 26, 2023 01:10
@kphoenix137 @AJenbo
Add Save Game confirmation
00e8d8d
@kphoenix137
Fix cursor jitter when clicking inv items (diasurgical#6510)
2a39339
@AJenbo
Revert "Fix cursor jitter when clicking inv items (diasurgical#6510)"
c91e693 
This reverts commit 2a39339.
@StephenCWills
Shift software cursor graphic and remove special casing (diasurgical#…
45dbe6a 
…6512)
@ephphatha @AJenbo
Find the closest point when pasting items on the edge of the stash
dd296d2
@ephphatha @AJenbo
Clean up hit detection for inventory slots when pasting large items
fb97eb7
@kphoenix137
Validate Item Locations (diasurgical#6427)
9995c00
@StephenCWills @AJenbo
Fix PlayerNetPack validation and tests
4deae11
@tsunamistate
Upgrade vcpkg baseline commit (diasurgical#6528)
e9de3cc
@kphoenix137
Fix automap (diasurgical#6513)
e3d79ae
@tsunamistate @AJenbo
Add draft for 1.5.1 release notes in metainfo
6cfa1cc
@tsunamistate @AJenbo
Fix typo in changelog
3411bd0
@Mr-Bajs
Small changes to swedish translation (diasurgical#6397)
37614c4
@AJenbo
Delete .bettercodehub.yml
c0caedc
@kphoenix137
Add duration parameter to InitDiabloMsg() (diasurgical#6514)
d468208
@AJenbo
Update CHANGELOG.md (diasurgical#6531)
24b3455
@AJenbo
Update 1.5.1 release notes in metainfo
26977f3
@ephphatha @AJenbo
Fix handling of gamepad cursor movement following item cursor change
070a119
@ephphatha @AJenbo
Move to the first inventory column from the left hand while holding w…
0d292b1 
…ide items
@AJenbo
Update CHANGELOG.md
52b806c
@ephphatha @AJenbo
fix cursor alignment following gamepad movement in stash
c85fcbd 
align the cursor to the middle of the cell/region when moving through the stash to match the way we simulate mouse movement for inventory cells
@ephphatha @AJenbo
handle stash item swapping using the gamepad a bit better
bd8aab0
@glebm
Merge branch 'master' into dev-merged
af869ac
@glebm glebm requested a review from AJenbo September 1, 2023 19:52
@glebm glebm enabled auto-merge (rebase) September 1, 2023 19:52
AJenbo
AJenbo approved these changes Sep 1, 2023
View reviewed changes
Copy link
Member

@AJenbo AJenbo left a comment

Choose a reason for hiding this comment

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

Thanks :)

auto-merge was automatically disabled September 1, 2023 20:53

Rebase failed

@AJenbo AJenbo merged commit af869ac into diasurgical:development Sep 1, 2023
18 checks passed
@glebm glebm deleted the dev-merged branch September 1, 2023 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AJenbo AJenbo AJenbo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@glebm @AJenbo @kphoenix137 @StephenCWills @ephphatha @tsunamistate @Mr-Bajs