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 develop into master #676

Merged
merged 29 commits into from
Jun 21, 2024
Merged

Merge develop into master #676

merged 29 commits into from
Jun 21, 2024

Conversation

Drewol
Copy link
Owner

@Drewol Drewol commented Jun 21, 2024

No description provided.

Drewol and others added 29 commits July 27, 2022 18:39
@Drewol
Fix crash on F12 with empty song list
5253994
@Drewol
Revert "Futile laser tweaks..."
c6ecc7f 
This reverts commit 79f7b4b.
@Drewol
Revert "Merge pull request #454 from ASleepyCat/laser-fix-2"
fb239f1 
This reverts commit cd86945, reversing
changes made to afd52a9.
@Drewol
Revert "Merge pull request #453 from ASleepyCat/laser-fix"
dbccf3f 
This reverts commit afd52a9, reversing
changes made to 5284dcc.
@Drewol
Revert "Merge pull request #434 from ASleepyCat/laser-changes"
e6336b4 
This reverts commit 6526429, reversing
changes made to f9754f4.
@Drewol
Update some reverted files to latest version
ed950c0
@Drewol
Forgot some files
d76e7fb
@Drewol
Hardcode laser assist with values from Hoshikara's fork
fb63382
@Drewol
Remove vcpkg from mac build
9c27364
@Drewol
Remove vcpkg from mac build
3ae9866
@Drewol
Merge pull request #633 from Drewol/laser-system-revert
4fb618e 
Laser system revert
@Drewol
Disable werror in pipeline
ccbedaa
@Drewol
Update build.yml
6629139
@FructoseJuice
Fixed bug #646
e3ac5c9 
Fixed bug where volume will revert to default value instead of user set value when loading into title screen for the first time.
@Drewol
Add missing brackets to Application::Run case
93e2a7c
@Drewol
Merge pull request #647 from FructoseJuice/develop
7895040 
Fixed volume loading as default value
@Drewol
button_hit lua can return color for lane beam
b244b4b
@SkyLeite
Set MacOS libraries in CMakeLists.txt
669a55d 
Fixes #471
Fixes #654
@Drewol
Merge pull request #655 from SkyLeite/develop
2358d3a 
Fix missing libjpeg in ARM MacOS and set MacOS libraries in CMakeLists.txt
@SkyLeite
Update to CPR 1.10.5
096ef35
@Drewol
Merge pull request #657 Update to CPR 1.10.5
76c359f 
from SkyLeite/develop
@SkyLeite
Set gamedir to $XDG_DATA_HOME and copy assets to it on creation
9a9dae3
@SkyLeite
Document -gamedir flag and asset loading
861fc14
@Drewol
Set gameDir to $XDG_DATA_HOME and copy assets on initialization #658
cc7402a 
from SkyLeite/develop
@0chroma
add install targets to cmake, check for data in XDG_DATA_DIRS instead of
4532c33 
just the executable path
@0chroma
be more specific about which folders should be installed in cmake
7a8490a
@Drewol
Merge pull request #661 from 0chroma/develop
162e40d 
Changes for easier Linux packaging
@0chroma
fix cmakelists path issue on install
6768eff
@Drewol
Merge pull request #663 from 0chroma/develop
f264d38 
fix double nesting issue on cmake install
@Drewol Drewol merged commit 8d18eb4 into master Jun 21, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Drewol @FructoseJuice @SkyLeite @0chroma