Skip to content

Commit bf0de71

Browse files
committed
Merge branch 'dev'
2 parents 0755032 + 12a966b commit bf0de71

File tree

148 files changed

+87942
-1001
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+87942
-1001
lines changed

.editorconfig

Lines changed: 7 additions & 656 deletions
Large diffs are not rendered by default.

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
with:
3030
java-version: '17'
3131
distribution: 'zulu'
32-
cache: gradle
3332

3433
- name: Grant execute permission for gradlew
3534
run: chmod +x gradlew

.github/workflows/deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
with:
2424
java-version: '17'
2525
distribution: 'zulu'
26-
cache: gradle
2726

2827
- name: Grant execute permission for gradlew
2928
run: chmod +x gradlew

BUGS.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# Bugs
22

3-
| Game | Mapper | Mesen | Fceux | Confirmed | Fixed |
4-
|:----:|:------:|:-----:|:-----:|:---------:|:-----:|
5-
|Jin Gwok Sei Chuen Saang (Asia) (Unl)|132|YES|NO|YES|NO|
6-
|Mighty Bomb Jack (Japan)|185|NO|NO|YES|NO|
7-
|Venice Beach Volleyball (Asia) (En) (Super Mega) (Unl)|3|YES|NO|YES|NO|
8-
|2-in-1 (Super 300-in-1) (Pocket Monster)|45|YES|YES|?|NO|
9-
|Mario Party (Mario 3 option)|45|YES|NO|YES|NO|
10-
|Mario 7-in-1|52|YES|YES|?|NO|
11-
|Falsion|108|YES|NO|YES|NO|
12-
|God Slayer - Haruka Tenkuu no Sonata (China)|195|YES|NO|YES|NO|
13-
|Dragon Ball Z II - Gekishin Freeza!! (China) ¹|199|X|NO|YES|NO|
14-
|Bio Senshi Dan - Increaser Tono Tatakai (Japan)|34|YES|NO|YES|NO|
15-
|Dragon Ball - Shen Long no Nazo (Japan)|34|YES|NO|YES|NO|
16-
|Mississippi Satsujin Jiken (Japan)|34|YES|NO|YES|NO|
17-
|Takahashi Meijin no Bugutte Honey (Japan)|34|YES|NO|YES|NO|
18-
|Racemate|168|YES|NO|YES|NO|
3+
| Game | Mapper | Mesen | Fceux | Confirmed | Fixed |
4+
|:------------------------------------------------------:|:------:|:-----:|:-----:|:---------:|:-----:|
5+
| Jin Gwok Sei Chuen Saang (Asia) (Unl) | 132 | YES | NO | YES | NO |
6+
| Mighty Bomb Jack (Japan) | 185 | NO | NO | YES | NO |
7+
| Venice Beach Volleyball (Asia) (En) (Super Mega) (Unl) | 3 | YES | NO | YES | NO |
8+
| 2-in-1 (Super 300-in-1) (Pocket Monster) | 45 | YES | YES | ? | NO |
9+
| Mario Party (Mario 3 option) | 45 | YES | NO | YES | NO |
10+
| Mario 7-in-1 | 52 | YES | YES | ? | NO |
11+
| Falsion | 108 | YES | NO | YES | NO |
12+
| God Slayer - Haruka Tenkuu no Sonata (China) | 195 | YES | NO | YES | NO |
13+
| Dragon Ball Z II - Gekishin Freeza!! (China) ¹ | 199 | X | NO | YES | NO |
14+
| Bio Senshi Dan - Increaser Tono Tatakai (Japan) | 34 | YES | NO | YES | NO |
15+
| Dragon Ball - Shen Long no Nazo (Japan) | 34 | YES | NO | YES | NO |
16+
| Mississippi Satsujin Jiken (Japan) | 34 | YES | NO | YES | NO |
17+
| Takahashi Meijin no Bugutte Honey (Japan) | 34 | YES | NO | YES | NO |
18+
| Racemate | 168 | YES | NO | YES | NO |
1919

2020
* X - Crash
2121
* ¹ - Minor sprite glitch

Project.CodeStyle.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

build.gradle.kts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.adarshr.gradle.testlogger.TestLoggerExtension
22
import com.adarshr.gradle.testlogger.theme.ThemeType
33
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.*
45
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
56

67
buildscript {
@@ -63,12 +64,14 @@ subprojects {
6364
}
6465

6566
tasks.withType<KotlinCompile> {
66-
kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
67-
kotlinOptions.freeCompilerArgs = listOf(
68-
"-Xjvm-default=all", "-Xjsr305=strict",
69-
"-Xno-param-assertions", "-Xno-call-assertions", "-Xno-receiver-assertions",
70-
"-opt-in=kotlin.io.path.ExperimentalPathApi",
71-
)
67+
compilerOptions {
68+
jvmTarget.set(JVM_17)
69+
freeCompilerArgs.addAll(
70+
"-Xjvm-default=all", "-Xjsr305=strict",
71+
"-Xno-param-assertions", "-Xno-call-assertions", "-Xno-receiver-assertions",
72+
"-opt-in=kotlin.io.path.ExperimentalPathApi"
73+
)
74+
}
7275
}
7376

7477
tasks.withType<Test> {

0 commit comments

Comments
 (0)