Ralty
|
52184f0470
|
Merge remote-tracking branch 'upstream/main' into new-editors-main
# Conflicts:
# commandline/commands/Compiler.hx
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/MusicBeatState.hx
# source/funkin/backend/MusicBeatSubstate.hx
# source/funkin/backend/chart/Chart.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/scripting/GlobalScript.hx
# source/funkin/backend/system/Controls.hx
# source/funkin/backend/system/MainState.hx
# source/funkin/backend/utils/AudioAnalyzer.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/character/CharacterInfoScreen.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterSelection.hx
# source/funkin/editors/charter/CharterStrumline.hx
# source/funkin/editors/charter/CharterStrumlineButton.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/editors/ui/UIDropDown.hx
# source/funkin/editors/ui/UIFileExplorer.hx
# source/funkin/game/Note.hx
# source/funkin/game/PlayState.hx
# source/funkin/game/SplashGroup.hx
# source/funkin/game/Stage.hx
# source/funkin/game/Strum.hx
# source/funkin/menus/FreeplayState.hx
# source/funkin/options/Options.hx
# source/funkin/options/keybinds/KeybindsOptions.hx
|
2025-07-19 00:57:08 +07:00 |
|
⍚~Nex
|
066dc7d57a
|
Merge remote-tracking branch 'public/main'
|
2025-07-06 04:40:21 +02:00 |
|
 FuroandGitHub
|
0ee90abe98
|
Fix wmic (#642)
|
2025-06-04 16:21:28 +02:00 |
|
 FrakitsandGitHub
|
2d76ba4e98
|
get ready for these powers
|
2025-06-04 15:03:25 +03:00 |
|
Ne_Eo
|
c6c870270f
|
Small HTML5 Fixes
|
2025-05-16 01:03:53 +02:00 |
|
Yoshman29
|
5609f18c6a
|
Fixes for Linux systems
|
2025-05-11 11:15:22 +02:00 |
|
lunarcleint
|
ccd1515040
|
acuttaly pmo >:(
|
2025-04-25 23:22:11 -07:00 |
|
lunarcleint
|
4ab77a4eb6
|
getSizeString64
|
2025-03-26 14:37:24 -07:00 |
|
lunarcleint
|
0412203015
|
fix vram in system info
|
2025-03-26 14:23:22 -07:00 |
|
Ne_Eo
|
69a17d5fef
|
Merge branch 'main' into new-editors
|
2025-02-28 16:39:06 +01:00 |
|
Ne_Eo
|
0a1517df6b
|
Fix framerate counter when using timescale
|
2025-02-08 01:24:55 +01:00 |
|
Ne_Eo
|
023e7753b2
|
Merge branch 'main' into new-editors
|
2025-02-06 21:22:45 +01:00 |
|
Ne_Eo
|
cbbb598f52
|
Added some more flags
|
2025-01-24 01:51:25 +01:00 |
|
Ne_Eo
|
fdf53b3d4f
|
Merge branch 'main' into new-editors
|
2025-01-09 20:05:06 +01:00 |
|
Ne_Eo
|
d6dc3ea232
|
Fix typos
|
2024-12-10 04:35:32 +01:00 |
|
Ne_Eo
|
204a151170
|
Merge branch 'main' into new-editors
|
2024-11-15 18:50:48 +01:00 |
|
Ne_Eo
|
625b03eee4
|
Merge branch 'main' into base-fnf-port-remake
|
2024-11-15 14:13:05 +01:00 |
|
 ⍚~NexandNe_Eo
|
596cb850cc
|
What? Constants is evolving into Flags!
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
|
2024-11-15 13:58:35 +01:00 |
|
Ne_Eo
|
2fc32231ab
|
Merge remote-tracking branch 'upstream/main'
|
2024-11-09 01:00:11 +01:00 |
|
Ne_Eo
|
3de3c3f828
|
Allow tweening arrays and shaders
Ignore the contents of this, its just to make it redownload flixel
|
2024-11-08 18:04:05 +01:00 |
|
⍚~Nex
|
4c94bb61a7
|
Merge branch 'main' into base-fnf-port-remake
|
2024-10-21 17:50:30 +02:00 |
|
Ne_Eo
|
5801ed0840
|
Merge branch 'main' into new-editors
|
2024-10-18 03:02:13 +02:00 |
|
Ne_Eo
|
2bfc58ccb0
|
Some optimizations
I wish there was a cleaner way of doing this
|
2024-10-18 02:50:41 +02:00 |
|
Ne_Eo
|
17ce1f147c
|
Merge branch 'main' into new-editors
|
2024-09-14 23:49:06 +02:00 |
|
⍚~Nex
|
bc3e1f1c8c
|
Merge branch 'main' into base-fnf-port-remake
|
2024-09-14 16:19:13 +02:00 |
|
Ne_Eo
|
fd451127c0
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# source/funkin/backend/system/framerate/CodenameBuildField.hx
|
2024-09-07 10:33:00 +02:00 |
|
⍚~Nex
|
e2c79bea7d
|
@usb-port-2 im gonna throw you off a cliff
before i fucking murder you
|
2024-09-07 04:26:12 +02:00 |
|
 dix-nutzandGitHub
|
d9968a8a87
|
disable framerate text selection (#377)
* Update FramerateCategory.hx
* Update MemoryCounter.hx
* Update FramerateCounter.hx
* Update CodenameBuildField.hx
|
2024-09-06 14:35:04 +02:00 |
|
Ne_Eo
|
54b63b87dd
|
Merge branch 'main' into new-editors
|
2024-09-03 01:23:08 +02:00 |
|
⍚~Nex
|
aa22bd6e1d
|
fixing stuff
|
2024-09-02 23:47:11 +02:00 |
|
⍚~Nex
|
32849cfd46
|
Merge branch 'main' into base-fnf-port-remake
|
2024-09-01 03:51:58 +02:00 |
|
⍚~Nex
|
cb1d6fcacf
|
songs/weeks list modes flags
|
2024-09-01 03:47:41 +02:00 |
|
Ne_Eo
|
4a755345a6
|
Merge branch 'main' into new-editors
|
2024-09-01 02:33:38 +02:00 |
|
Ne_Eo
|
f8d1cf08ad
|
Added runtime feature flags
|
2024-09-01 02:31:51 +02:00 |
|
⍚~Nex
|
500cf98e0c
|
editable static costants!
for scripts :D
|
2024-08-31 02:31:05 +02:00 |
|
Ne_Eo
|
dbd2219b20
|
Cleanup + Optimization
|
2024-08-02 00:42:47 +02:00 |
|
Ne_Eo
|
b2774445d8
|
Merge branch 'main' into new-editors
|
2024-07-18 22:01:45 +02:00 |
|
 Ne_EoandGitHub
|
9ff4d838df
|
Meow
From phone
|
2024-07-12 16:24:36 +02:00 |
|
Ne_Eo
|
669f4f37ed
|
Updated Fps counter
|
2024-07-11 18:17:48 +02:00 |
|
NeeEoo
|
f081470554
|
Small optimization
|
2024-04-17 19:46:10 +02:00 |
|
NeeEoo
|
d17ea72c74
|
Organize Imports and remove unused Imports
|
2024-04-11 14:23:02 +02:00 |
|
⍚~Nex
|
ef2891bbe6
|
bye april fools😭
man that was buggy af
|
2024-04-02 23:50:59 +02:00 |
|
lunarcleint
|
014be749e6
|
Squashed commit of the following:
commit 4987983dc6e655183b34258fed905be2fba73e0a
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Mon Apr 1 06:32:22 2024 -0700
fix charter bug
commit 1135b53d4d4ab48fb74a9d5693579d0a2e4923db
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Mon Apr 1 00:46:53 2024 -0700
small changes
commit 102931f3511c9f0423cf887ebf91eaeeb1024abe
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Sun Mar 31 23:03:03 2024 -0700
update spelling mistakes
commit 87ad53ae91bc8b4d3b49af3ebb8c07db9f13765b
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Sun Mar 31 22:40:48 2024 -0700
Chart editor updates
commit 8f7cae8a80a681158ff125c3e2547c9fd4dee7c1
Author: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Mon Apr 1 07:03:30 2024 +0200
Redesigned Chart Editor
commit dbb94ba3bd8455a91883d6e5b59b25da87aefa32
Author: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Mon Apr 1 02:20:57 2024 +0200
Added Stage Editor
|
2024-04-01 06:44:28 -07:00 |
|
NeeEoo
|
f8b20774e3
|
Remove useless indentation
|
2024-03-16 21:15:18 +01:00 |
|
⍚~Nex
|
8cabf1e31d
|
fixing da pr
#242
and also under @NeeEoo suggestion ive deleted that string part in mainmenustate
please tell me if you find another alpha message instead of beta😭
|
2024-02-09 15:07:09 +01:00 |
|
 crowplexusandGitHub
|
b46d816e00
|
Change some strings to comply with the newest version (#242)
* Update README.md
* Update CodenameBuildField.hx
* Update MainMenuState.hx
* Update CodenameBuildField.hx
* Delete unused Main.hx file
|
2024-02-09 13:05:45 +01:00 |
|
lunarcleint
|
e951375e12
|
:FDF
|
2024-02-04 14:15:47 -07:00 |
|
NeeEoo
|
c050ea73ce
|
Small optimizations
|
2023-12-01 02:57:17 +01:00 |
|
lunarcleint
|
a033e92476
|
beatsPerMeasure
|
2023-11-19 15:00:31 -07:00 |
|
NeeEoo
|
27a2b45a5e
|
Small optimizations
|
2023-10-23 17:59:51 +02:00 |
|