Skip to content

Commit

Permalink
Merge branch 'master' into patch-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
CloneWith committed Feb 12, 2024
2 parents 663bae0 + b827cdc commit ce3a14b
Show file tree
Hide file tree
Showing 118 changed files with 517 additions and 526 deletions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@
- APK: https://github.com/fluddokt/opsu/issues
- Play Store: https://github.com/AnirudhRahul/opsu-Android/issues
-->

**Operations:** What did you do

**Expected behavior:** What do you expect the program to do

**Actual behaviour:** What did the program actually do

**Extra information:** Platform, version, screenshots, logs, etc.
6 changes: 1 addition & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@

version: 2
updates:
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
- package-ecosystem: "maven"
directory: "/repo"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/SongPacks/
/Songs/
/Temp/
*.log
/.opsu.log
/.opsu.cfg
/.opsu.db*
Expand Down
9 changes: 6 additions & 3 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ The images included in opsu! belong to their respective authors.
* sherrie__fay
* kouyang
* teinecthel
* Attribo555 - "- mini;pur ft. Jimikawa -"
* Spoo - "- {S} 5WC 2023"
* Teddy Kelley - [Source](https://unsplash.com/photos/weuWmzv7xnU) (main menu background)
* User icons designed by Freepik - [Main Website](https://www.freepik.com/)
* [Flat lovely animal avatar collection](https://www.freepik.com/free-vector/flat-lovely-animal-avatar-collection_845660.htm)
* [Another link](https://www.freepik.com/free-vector/wild-and-marine-animal-collection_845661.htm)
* Font Awesome by Dave Gandy - [Website](http://fontawesome.io)
* Font Awesome by Dave Gandy - [Website](https://fontawesome.io)
* Papirus icon theme - [GitHub](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)

## Projects

Expand All @@ -40,6 +43,6 @@ The following projects were referenced in the initial creation of opsu!:

## Theme Song

Rainbows - Kevin MacLeod (incompetech.com)
Licensed under Creative Commons: By Attribution 3.0 License
Rainbows - Kevin MacLeod (incompetech.com)
Licensed under Creative Commons: By Attribution 3.0 License
[Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/)
21 changes: 6 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**opsu!** is an unofficial open-source client for the rhythm game [osu!](https://osu.ppy.sh/), written in Java using [Slick2D](http://slick.ninjacave.com/) and [LWJGL](http://lwjgl.org/) (wrappers around OpenGL and OpenAL).

opsu! runs on Windows, Linux and Android (libGDX port). For Android releases, there is also a [separate repo](https://github.com/clonewith/opsu-droid) and one to [build apks](https://github.com/clonewith/opsu-ABuild).
opsu! runs on Windows and Linux.

Take a look at the original project if you would like to do so:

Expand All @@ -13,8 +13,7 @@ Specially, you may hope to read [relevant wiki articles](https://osu.ppy.sh/wiki

## Getting Started

- Get a copy of opsu! from the [releases](https://github.com/clonewith/opsu/releases) page.
- APK releases can be found [here](https://github.com/clonewith/opsu-droid/releases).
Get a copy of opsu! from the [releases](https://github.com/clonewith/opsu/releases) page.

### Java Setup

Expand Down Expand Up @@ -51,8 +50,9 @@ The following files and folders will be created by opsu! as needed:

## Building

opsu! is distributed as both a [Maven](https://maven.apache.org/) and
[Gradle](https://gradle.org/) project.
opsu! is distributed a [Maven](https://maven.apache.org/) project.

*Note:* Due to technical reasons, the support for [Gradle](https://gradle.org/) has been temporarily dropped. Chances are that we would add it back in the future.

### Maven

Expand All @@ -63,22 +63,13 @@ Maven builds are built to the `target` directory.
- Setting the "XDG" property (`-DXDG=true`) will make the application use XDG folders under Unix-like operating systems.
- Setting the "exclude" property to "ffmpeg" (`-Dexclude=ffmpeg`) will exclude FFmpeg shared libraries from the jar.

### Gradle

Gradle builds are built to the `build` directory.

- To run the project, execute the Gradle task `run`.
- To create a single executable jar, execute the Gradle task `jar`. This will compile a jar to `build/libs/opsu-${version}.jar` with the libraries, resources and natives packed inside the jar.
- Setting the "XDG" property (`-PXDG=true`) will make the application use XDG folders under Unix-like operating systems.
- Setting the "excludeFFmpeg" property (`-PexcludeFFmpeg`) will exclude FFmpeg shared libraries from the jar.

## Contributing

See the [contributing guidelines](CONTRIBUTING.md) for details.

## Credits

This software was created by Jeffrey Han ([@itdelatrisu](https://github.com/itdelatrisu/)). All game concepts and designs are based on work by [osu!](https://osu.ppy.sh/) developer Dean Herbert ([@ppy](https://github.com/ppy)). Other credits can be found [here](CREDITS.md).
This software was originally created by Jeffrey Han ([@itdelatrisu](https://github.com/itdelatrisu/)). All game concepts and designs are based on work by [osu!](https://osu.ppy.sh/) developer Dean Herbert ([@ppy](https://github.com/ppy)). Other credits can be found [here](CREDITS.md).

## License

Expand Down
121 changes: 0 additions & 121 deletions build.gradle

This file was deleted.

Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit ce3a14b

Please sign in to comment.