1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-08-31 02:45:13 +00:00

Compare commits

...

24 commits

Author SHA1 Message Date
trofim.al d53a132e14 cleanup 2025-07-28 17:38:47 +11:00
trofim.al a3dd2caa56 left watermark mod list 2025-07-28 17:36:55 +11:00
Lasercar c2eff142bd Bunker infiltrated 2025-07-22 14:45:47 -07:00
Eric 2784fa18c0
Merge pull request #5476 from Trofem/api-version-example-mods-for-0.7.0
[CHORE] Updates example_mods's API version up to 0.7.0
2025-07-22 12:03:19 -04:00
Eric ad07fddf89
Merge pull request #5489 from FunkinCrew/main
Update develop to latest main
2025-07-22 11:59:29 -04:00
Eric 2586154376
Merge pull request #5488 from FunkinCrew/develop-v0.7.3
Update main branch to v0.7.3
2025-07-22 11:59:01 -04:00
trofim.al 4768eedd5b api version 0.7.0
Update example mod's API version so it actually loads. part 2.
2025-07-22 15:04:20 +11:00
charlesisfeline 7c675ecf17 the psych confusion continues! 2025-07-22 10:03:25 +08:00
Hyper_ f1c3e99a11 lasercar................................................................................................................................................................................................. 2025-07-22 07:56:29 +08:00
Hyper_ eefe8927c4 The most deranged line loss of all time 2025-07-21 17:43:55 -05:00
cherry 3ff4f14510 Clear key from correct map 2025-07-21 17:13:42 -05:00
Abnormal 955b0db542 THE REALLY COOL STUTTERING FIX!!!!!!!!!!!! 2025-07-21 15:06:19 -05:00
Eric d2df4f0832
Merge pull request #5440 from FunkinCrew/main
Update develop branch
2025-07-21 13:08:44 -04:00
Eric 351719ab13
Merge pull request #5438 from FunkinCrew/EliteMasterEric-patch-4
Update lime, openfl, flixel repo URLs in hmm.json
2025-07-21 13:05:40 -04:00
Eric 4ecfe9863e
Update lime, openfl, flixel repo URLs in hmm.json 2025-07-21 13:05:15 -04:00
Eric 48e140e5c0
Merge pull request #5432 from FunkinCrew/develop-0.7.2
Release the mobile source code already
2025-07-21 12:17:54 -04:00
Hundrec e6bb965d6b
Merge branch 'main' into develop-0.7.2 2025-07-22 00:13:47 +08:00
Baran b00376c88c 0.7.2 bumping is real 2025-07-21 10:33:13 -05:00
CrusherNotDrip 541bb78da9 Bump to 0.7.1 2025-07-16 21:51:46 -05:00
Hundrec 5f5fff870c Update issue templates for Mobile 2025-07-14 08:25:10 -05:00
CrusherNotDrip 52acd86cdf bump versions to 0.7.0 2025-07-14 07:38:31 -05:00
Eric 29f7aca135
Merge pull request #5183 from Hundrec/patch-13
[DOCS] Fix a link in a Changelog entry
2025-06-06 01:14:53 -04:00
Hundrec 35d4d24731
that's not even the right link
what
2025-06-01 01:50:33 -06:00
Hundrec c0dde5c936
missed one
funkin.assets
2025-06-01 01:46:27 -06:00
11 changed files with 94 additions and 45 deletions

View file

@ -20,13 +20,13 @@ body:
label: Platform
description: Which platform are you playing on?
options:
- Android
- iOS/iPadOS
- Newgrounds (Web/HTML5)
- Itch.io (Web/HTML5)
- Itch.io (Downloadable Build) - Windows
- Itch.io (Downloadable Build) - MacOS
- Itch.io (Downloadable Build) - Linux
- Google Playstore - Android
- App Store - iOS
- Windows (Downloadable Build)
- MacOS (Downloadable Build)
- Linux (Downloadable Build)
- Compiled from GitHub Source Code
validations:
required: true
@ -43,11 +43,23 @@ body:
- Safari
- Other (Specify in Description field)
- type: input
attributes:
label: Mobile Device Model
description: (Mobile users only) What mobile device are you playing on?
placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
- type: input
attributes:
label: Mobile OS Version
description: (Mobile users only) What version is your Operating System?
placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
- type: input
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.6.4
placeholder: ex. 0.7.4
validations:
required: true

View file

@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
- type: checkboxes
attributes:
label: Issue Checklist
@ -21,35 +21,25 @@ body:
label: Platform
description: Which platform are you playing on?
options:
- Android
- iOS/iPadOS
- Newgrounds (Web/HTML5)
- Itch.io (Web/HTML5)
- Itch.io (Downloadable Build) - Windows
- Itch.io (Downloadable Build) - MacOS
- Itch.io (Downloadable Build) - Linux
- Windows (Downloadable Build)
- MacOS (Downloadable Build)
- Linux (Downloadable Build)
- Compiled from GitHub Source Code
validations:
required: true
- type: dropdown
attributes:
label: Browser
description: (Web/HTML5 users only) Which browser are you playing on?
options:
- Google Chrome
- Microsoft Edge
- Firefox
- Opera
- Safari
- Other (Specify in Description field)
- type: input
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.6.4
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.7.4
validations:
required: true
- type: markdown
attributes:
value: "## Describe the charting issue(s)."

View file

@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
- type: checkboxes
attributes:
label: Issue Checklist
@ -22,6 +22,8 @@ body:
label: Platform
description: Which platform are you compiling for?
options:
- Android
- iOS/iPadOS
- Web/HTML5
- Desktop (Windows)
- Desktop (Mac)
@ -33,11 +35,11 @@ body:
- type: input
attributes:
label: Version
description: Which version are you compiling? The game version is in the bottom left corner of the main menu or in the project.hxp file.
placeholder: ex. 0.6.4
description: Which version are you compiling? The game version is in the bottom left corner of the main menu or in the project.hxp file.
placeholder: ex. 0.7.4
validations:
required: true
- type: markdown
attributes:
value: "## Describe your compiling issue."

View file

@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: "# PLEASE READ THE [CONTRIBUTING GUIDE](https://github.com/FunkinCrew/Funkin/blob/main/docs/CONTRIBUTING.md) BEFORE OPENING ISSUES!"
- type: checkboxes
attributes:
label: Issue Checklist
@ -21,11 +21,13 @@ body:
label: Platform
description: Which platform are you playing on?
options:
- Android
- iOS/iPadOS
- Newgrounds (Web/HTML5)
- Itch.io (Web/HTML5)
- Itch.io (Downloadable Build) - Windows
- Itch.io (Downloadable Build) - MacOS
- Itch.io (Downloadable Build) - Linux
- Windows (Downloadable Build)
- MacOS (Downloadable Build)
- Linux (Downloadable Build)
- Compiled from GitHub Source Code
validations:
required: true
@ -42,11 +44,23 @@ body:
- Safari
- Other (Specify in Description field)
- type: input
attributes:
label: Mobile Device Model
description: (Mobile users only) What mobile device are you playing on?
placeholder: ex. iPhone 16, Galaxy S25, iPad 11th Gen
- type: input
attributes:
label: Mobile OS Version
description: (Mobile users only) What version is your Operating System?
placeholder: ex. iOS 18.5, Android 15, iPadOS 18.5
- type: input
attributes:
label: Version
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.6.4
description: Which version are you playing on? The game version is in the bottom left corner of the main menu.
placeholder: ex. 0.7.4
validations:
required: true
@ -61,7 +75,7 @@ body:
- type: textarea
attributes:
label: Description
description: Include screenshots or videos of the crash happening. Provide as much detail as you can.
description: Include screenshots or videos of the crash happening. Provide as much detail as you can.
placeholder: Describe the crash here...
validations:
required: true
@ -77,7 +91,7 @@ body:
- type: textarea
attributes:
label: Crash logs
description: These can be found in the logs folder where Funkin.exe is.
description: These can be found in the logs folder where Funkin.exe is, or in your mobile device's file explorer.
placeholder: Upload your logs here...
validations:
required: true

View file

@ -432,7 +432,7 @@ Select. ([3d3e2bd](https://github.com/FunkinCrew/Funkin/commit/3d3e2bd3786b85814
* @JackXson-Real made their first contribution in [#4346](https://github.com/FunkinCrew/Funkin/pull/4346)
* @VioletSnowLeopard made their first contribution in [#4382](https://github.com/FunkinCrew/Funkin/pull/4382)
* @superpowers04 made their first contribution in [#4729](https://github.com/FunkinCrew/Funkin/pull/4729)
* @ShadzXD made their first contribution in [#62](https://github.com/FunkinCrew/Funkin/pull/4729)
* @ShadzXD made their first contribution in [funkin.assets#62](https://github.com/FunkinCrew/funkin.assets/pull/62)

View file

@ -60,7 +60,7 @@ This section provides guidelines to follow when [opening an issue](https://githu
## Requirements
Make sure you're playing:
- the latest version of the game (currently v0.6.4)
- the latest version of the game (currently v0.7.4)
- without any mods
- on [Newgrounds](https://www.newgrounds.com/portal/view/770371) or downloaded from [itch.io](https://ninja-muffin24.itch.io/funkin)

View file

@ -6,7 +6,7 @@
"name": "EliteMasterEric"
}
],
"api_version": "0.5.0",
"api_version": "0.7.0",
"mod_version": "1.0.0",
"license": "Apache-2.0"
}

View file

@ -6,7 +6,7 @@
"name": "EliteMasterEric"
}
],
"api_version": "0.5.0",
"api_version": "0.7.0",
"mod_version": "1.0.0",
"license": "Apache-2.0"
}

View file

@ -46,7 +46,7 @@
"type": "git",
"dir": null,
"ref": "08fc955ca87f192a971719a675f1d3b21709725d",
"url": "https://github.com/FunkinCrew/flixel-mobile"
"url": "https://github.com/FunkinCrew/flixel"
},
{
"name": "flixel-addons",
@ -171,7 +171,7 @@
"type": "git",
"dir": null,
"ref": "c750ebf6b48c4bc018abe9855fbae5ffdbc4771a",
"url": "https://github.com/FunkinCrew/lime-mobile"
"url": "https://github.com/FunkinCrew/lime"
},
{
"name": "mconsole",
@ -213,7 +213,7 @@
"type": "git",
"dir": null,
"ref": "a0df7c3afe360c9af59a76e45007dbf4e53b5131",
"url": "https://github.com/FunkinCrew/openfl-mobile"
"url": "https://github.com/FunkinCrew/openfl"
},
{
"name": "polymod",

View file

@ -546,6 +546,24 @@ class PolymodHandler
return enabledMods;
}
/**
* Retrieve a list of title and version of all enabled mods.
* @return An array of active mod along side with its version
*/
public static function getAllModsList():Array<String>
{
var modMetadata:Array<ModMetadata> = getAllMods(); // TODO: change to getEnabledMods()
return [
for (mod in modMetadata)
{
var title = mod.title?.trim();
if (title == null || title == '') title = mod.id;
var version = mod.modVersion?.toString().trim();
'$title v$version';
}
];
}
/**
* Clear and reload from disk all data assets.
* Useful for "hot reloading" for fast iteration!

View file

@ -31,6 +31,9 @@ import funkin.util.TouchUtil;
import funkin.api.newgrounds.Referral;
import funkin.ui.mainmenu.UpgradeSparkle;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
#if FEATURE_POLYMOD_MODS
import funkin.modding.PolymodHandler;
#end
#if FEATURE_DISCORD_RPC
import funkin.api.discord.DiscordClient;
#end
@ -325,7 +328,17 @@ class MainMenuState extends MusicBeatState
// This has to come AFTER!
if (this.leftWatermarkText != null)
{
this.leftWatermarkText.text = Constants.VERSION;
this.leftWatermarkText.text = '';
#if FEATURE_POLYMOD_MODS
var modList:Array<String> = PolymodHandler.getAllModsList();
if (modList.length > 0)
{
this.leftWatermarkText.text += 'Mods:\n' + modList.join("\n") + '\n\n';
this.leftWatermarkText.y -= (modList.length + 2) * 15;
}
#end
this.leftWatermarkText.text += Constants.VERSION;
#if FEATURE_NEWGROUNDS
if (NewgroundsClient.instance.isLoggedIn())