Skip to content
This repository has been archived by the owner on Apr 16, 2023. It is now read-only.

Commit

Permalink
Showing 14 changed files with 47 additions and 14 deletions.
1 change: 1 addition & 0 deletions core/assets/localization/default.properties
Original file line number Diff line number Diff line change
@@ -181,6 +181,7 @@ screen.info.info=Information
screen.info.settings=Settings
screen.info.version=View editor version info
screen.info.database=View SFX database changelog
screen.info.databaseVersion=Database: {0}
screen.info.clearRecents=Clear recent games list

screen.version.title0=Yo, it's update time, [CYAN]right?[]
1 change: 1 addition & 0 deletions core/assets/localization/default_de.properties
Original file line number Diff line number Diff line change
@@ -181,6 +181,7 @@ screen.info.info=Informationen
screen.info.settings=Einstellungen
screen.info.version=Siehe Editor Version Info
screen.info.database=Siehe SFX Database Changelog
screen.info.databaseVersion=Datenbank: {0}
screen.info.clearRecents=Letztens benutzte Spiele Liste leeren

screen.version.title0=Yo, Zeit für ein Update, [CYAN]nicht wahr?[]
1 change: 1 addition & 0 deletions core/assets/localization/default_es.properties
Original file line number Diff line number Diff line change
@@ -181,6 +181,7 @@ screen.info.info=Información
screen.info.settings=Opciones
screen.info.version=Ver información de la versión del editor
screen.info.database=Ver cambios en la base de datos
screen.info.databaseVersion=Base de datos: {0}
screen.info.clearRecents=Vaciar la lista de juegos recientes

screen.version.title0=Hey, hay que actualizar, [CYAN]¿verdad?[]
1 change: 1 addition & 0 deletions core/assets/localization/default_fr.properties
Original file line number Diff line number Diff line change
@@ -181,6 +181,7 @@ screen.info.info=Informations
screen.info.settings=Options
screen.info.version=Infos de la version de l'éditeur
screen.info.database=Regarder le journal de la base de données
screen.info.databaseVersion=Base de données: {0}
screen.info.clearRecents=Supprimer la liste des jeux récents
screen.version.title0=C'est le moment de mettre à jour, [CYAN]n'est-ce-pas?[]
2 changes: 1 addition & 1 deletion core/src/main/kotlin/io/github/chrislo27/rhre3/RHRE3.kt
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import io.github.chrislo27.toolboks.version.Version
object RHRE3 {

const val TITLE = "Rhythm Heaven Remix Editor 3"
val VERSION: Version = Version(3, 6, 5, "")
val VERSION: Version = Version(3, 6, 6, "")
const val WIDTH = 1280
const val HEIGHT = 720
val DEFAULT_SIZE = WIDTH to HEIGHT
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ class EditorVersionScreen(main: RHRE3Application)
override fun onLeftClick(xPercent: Float, yPercent: Float) {
super.onLeftClick(xPercent, yPercent)
Gdx.net.openURI(RHRE3.GITHUB_RELEASES)
val stage = stage as GenericStage
val stage: GenericStage<EditorVersionScreen> = this@EditorVersionScreen.stage
stage.backButton.enabled = true
}
}.apply {
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ import io.github.chrislo27.rhre3.soundsystem.beads.BeadsSoundSystem
import io.github.chrislo27.rhre3.stage.GenericStage
import io.github.chrislo27.rhre3.track.PlayState
import io.github.chrislo27.rhre3.track.Remix
import io.github.chrislo27.rhre3.util.JavafxStub
import io.github.chrislo27.rhre3.util.attemptRememberDirectory
import io.github.chrislo27.rhre3.util.getDefaultDirectory
import io.github.chrislo27.rhre3.util.persistDirectory
@@ -302,7 +301,7 @@ class ExportRemixScreen(main: RHRE3Application)
Platform.runLater {
isChooserOpen = true
val fileChooser = createFileChooser()
val file: File? = fileChooser.showSaveDialog(JavafxStub.application.primaryStage)
val file: File? = fileChooser.showSaveDialog(null)
isChooserOpen = false
if (file != null && main.screen == this) {
fileChooser.initialDirectory = if (!file.isDirectory) file.parentFile else file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ import io.github.chrislo27.rhre3.RHRE3
import io.github.chrislo27.rhre3.RHRE3Application
import io.github.chrislo27.rhre3.editor.Editor
import io.github.chrislo27.rhre3.registry.GameMetadata
import io.github.chrislo27.rhre3.registry.GameRegistry
import io.github.chrislo27.rhre3.stage.FalseCheckbox
import io.github.chrislo27.rhre3.stage.GenericStage
import io.github.chrislo27.rhre3.stage.TrueCheckbox
@@ -40,6 +41,7 @@ class InfoScreen(main: RHRE3Application)
private val editor: Editor
get() = ScreenRegistry.getNonNullAsType<EditorScreen>("editor").editor
private lateinit var clearRecentsButton: Button<InfoScreen>
private lateinit var dbVersionLabel: TextLabel<InfoScreen>

init {
stage as GenericStage<InfoScreen>
@@ -84,7 +86,7 @@ class InfoScreen(main: RHRE3Application)
val buttonHeight = 0.1f
val fontScale = 0.75f

// left
// left heading
centre.elements += TextLabel(palette, centre, centre).apply {
this.location.set(screenX = padding,
screenY = 1f - (padding + buttonHeight * 0.8f),
@@ -94,7 +96,7 @@ class InfoScreen(main: RHRE3Application)
this.text = "screen.info.settings"
}

// right
// right heading
centre.elements += TextLabel(palette, centre, centre).apply {
this.location.set(screenX = 1f - (padding + buttonWidth),
screenY = 1f - (padding + buttonHeight * 0.8f),
@@ -103,6 +105,7 @@ class InfoScreen(main: RHRE3Application)
this.isLocalizationKey = true
this.text = "screen.info.info"
}
// current program version
centre.elements += TextLabel(palette, centre, centre).apply {
this.location.set(screenX = 1f - (padding + buttonWidth),
screenY = 1f - (padding + buttonHeight * 0.8f) * 2,
@@ -112,6 +115,18 @@ class InfoScreen(main: RHRE3Application)
this.textWrapping = false
this.text = RHRE3.VERSION.toString()
}
dbVersionLabel = object : TextLabel<InfoScreen>(palette, centre, centre) {

}.apply {
this.location.set(screenX = 1f - (padding + buttonWidth),
screenY = 1f - (padding + buttonHeight * 0.8f) * 3,
screenWidth = buttonWidth,
screenHeight = buttonHeight * 0.8f)
this.isLocalizationKey = false
this.textWrapping = false
this.text = "DB VERSION"
}
centre.elements += dbVersionLabel

// info buttons
// Credits
@@ -133,7 +148,7 @@ class InfoScreen(main: RHRE3Application)
screenWidth = buttonWidth,
screenHeight = buttonHeight)
}
// Editor version
// Editor version screen
centre.elements += object : Button<InfoScreen>(palette, centre, centre) {
override fun onLeftClick(xPercent: Float, yPercent: Float) {
super.onLeftClick(xPercent, yPercent)
@@ -151,7 +166,7 @@ class InfoScreen(main: RHRE3Application)
screenWidth = buttonWidth,
screenHeight = buttonHeight)
}
// Database version
// Database version changelog
centre.elements += object : Button<InfoScreen>(palette, centre, centre) {
override fun onLeftClick(xPercent: Float, yPercent: Float) {
super.onLeftClick(xPercent, yPercent)
@@ -379,6 +394,7 @@ class InfoScreen(main: RHRE3Application)
override fun show() {
super.show()
clearRecentsButton.enabled = GameMetadata.recents.isNotEmpty()
dbVersionLabel.text = Localization["screen.info.databaseVersion", "v${GameRegistry.data.version}"]
}

override fun tickUpdate() {
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ import io.github.chrislo27.rhre3.RHRE3Application
import io.github.chrislo27.rhre3.editor.Editor
import io.github.chrislo27.rhre3.stage.GenericStage
import io.github.chrislo27.rhre3.track.MusicData
import io.github.chrislo27.rhre3.util.JavafxStub
import io.github.chrislo27.rhre3.util.attemptRememberDirectory
import io.github.chrislo27.rhre3.util.err.MusicLoadingException
import io.github.chrislo27.rhre3.util.getDefaultDirectory
@@ -124,7 +123,7 @@ class MusicSelectScreen(main: RHRE3Application)
Platform.runLater {
isChooserOpen = true
val fileChooser = createFileChooser()
val file: File? = fileChooser.showOpenDialog(JavafxStub.application.primaryStage)
val file: File? = fileChooser.showOpenDialog(null)
isChooserOpen = false
if (file != null && main.screen == this) {
isLoading = true
Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ class OpenRemixScreen(main: RHRE3Application)
Platform.runLater {
isChooserOpen = true
val fileChooser = createFileChooser()
val file: File? = fileChooser.showOpenDialog(JavafxStub.application.primaryStage)
val file: File? = fileChooser.showOpenDialog(null)
isChooserOpen = false
if (file != null && main.screen == this) {
isLoading = true
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@ import io.github.chrislo27.rhre3.editor.Editor
import io.github.chrislo27.rhre3.registry.GameMetadata
import io.github.chrislo27.rhre3.stage.GenericStage
import io.github.chrislo27.rhre3.track.Remix
import io.github.chrislo27.rhre3.util.JavafxStub
import io.github.chrislo27.rhre3.util.attemptRememberDirectory
import io.github.chrislo27.rhre3.util.getDefaultDirectory
import io.github.chrislo27.rhre3.util.persistDirectory
@@ -117,7 +116,7 @@ class SaveRemixScreen(main: RHRE3Application)
Platform.runLater {
isChooserOpen = true
val fileChooser = createFileChooser()
val file: File? = fileChooser.showSaveDialog(JavafxStub.application.primaryStage)
val file: File? = fileChooser.showSaveDialog(null)
isChooserOpen = false
if (file != null && main.screen == this) {
fileChooser.initialDirectory = if (!file.isDirectory) file.parentFile else file
15 changes: 15 additions & 0 deletions docs/Crediting.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Crediting the use of RHRE3

I hope you really enjoyed using RHRE3! I don't require credit with anything
made with RHRE3, but it would be very appreciated if you provided a link
to the program, using [https://github.com/chrislo27/RhythmHeavenRemixEditor](https://github.com/chrislo27/RhythmHeavenRemixEditor)
as the URL. You can put this in a YouTube description or wherever else it is convenient.

Example:<br>
>Made with Rhythm Heaven Remix Editor 3: https://github.com/chrislo27/RhythmHeavenRemixEditor
In Presentation Mode, this data is already provided on-screen. If you're
distributing a RHRE3-exported MP3, there is already metadata with some of this information.

If you are modifying the source code and releasing it, please bear in mind of the code license and its requirements, which is the GNU General Public License v3.0.
[You can find the text version here.](https://github.com/chrislo27/RhythmHeavenRemixEditor/blob/master/LICENSE.txt)
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Readme

This readme is up to date with version `v3.6.5`.
This readme is up to date with version `v3.6.6`.

## How does a remix work?
Remixes in RHRE3 have changed since RHRE2.
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ public version of RHRE3.

### **RHRE3 (most current)**
* [README](README.md)
* [Crediting RHRE3](Crediting.md)
* [Themes](Themes.md)
* [`OutOfMemoryError` when loading music](Out-of-memory-on-music.md)
* [Launch arguments](Launch-arguments.md)

0 comments on commit 38e32fe

Please sign in to comment.