Ralty
e4be3bd427
Merge branch 'Time-Signature-Changes' into new-conductor
...
# Conflicts:
# .gitignore
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/chart/ChartData.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/system/Conductor.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterEvent.hx
# source/funkin/editors/charter/CharterEventScreen.hx
# source/funkin/editors/charter/CharterMetaDataScreen.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/game/PlayState.hx
2025-07-16 19:27:05 +07:00
⍚~Nex
e6766cdcd7
dev mode implementation
2025-07-07 01:53:02 +02:00
Ralty
34b4de31fc
Should be done
2025-07-06 10:33:25 +07:00
⍚~Nex
1b0ad7d3a6
some more stuff SOMEONE HAVE TO TEST THESE 2 COMM
2025-07-06 04:44:46 +02:00
⍚~Nex
066dc7d57a
Merge remote-tracking branch 'public/main'
2025-07-06 04:40:21 +02:00
Ralty
5ee4ff2a10
can you please lock in
2025-07-05 19:07:57 +07:00
Ralty
bdfb1d31b4
Update Conductor.hx
2025-07-05 19:06:48 +07:00
Ralty
1a66b7109c
Merge remote-tracking branch 'upstream/main' into pr/397
2025-07-05 18:23:41 +07:00
Ralty
2b533d62f5
dummyChange & lastBeatChange
2025-07-05 18:19:49 +07:00
07ae6b643c
FINALLY fixed the issue with GlobalState blowing up when pressing F5. ( #666 )
...
* peak is happening
<r>RED<r>
* oops
* oops x2
forgot I left a trace when loading up global.hx from `Assets` lol
* **State / SubState reloading broken rn but pushing changes to see if anyone can fix**
* Human... I remember you
<r>disabling reloading substates cuz it broke...<r>
* <y>forgor to edit assets global.hx<y>
* lemme see
* kk
* opa
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 01:46:42 +02:00
sage and GitHub
291c1d25bf
Allow pathBack on Linux (for the command) ( #658 )
2025-07-02 11:32:14 -04:00
Til and GitHub
8eee609756
vcr.ttf changes when switching mods now, if it was inside source code ( #672 )
2025-07-02 11:37:19 +02:00
Ralty
9982236321
Whoops!
2025-06-30 22:29:21 +07:00
Ralty
241b87ad58
Change event params a bit and fix cam zooming
2025-06-30 10:49:38 +07:00
Ne_Eo
a6fcb3d237
Merge branch 'main' into pr/397
2025-06-06 20:39:24 +02:00
Furo and GitHub
0ee90abe98
Fix wmic ( #642 )
2025-06-04 16:21:28 +02:00
Furo
a990da0849
Fix Version Being Null + Fixed Icon Transitions Offset
2025-06-04 15:59:02 +02:00
Frakits and GitHub
f048942bcc
i fucking hate this dude holy shit
2025-06-04 16:02:09 +03:00
Frakits and GitHub
2992e01069
ts pmo icl
2025-06-04 15:52:45 +03:00
Frakits and GitHub
8d026c9fc6
oops 😶
2025-06-04 15:25:48 +03:00
Frakits and GitHub
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
Ne_Eo
31042a9039
Allow addons in mods folder
...
This allows people to add addons using `mods/<mymod>/addons/<myaddon>/`
2025-05-16 01:00:22 +02:00
Yoshman29
5609f18c6a
Fixes for Linux systems
2025-05-11 11:15:22 +02:00
TheZoroForce240
2b087dc96e
floating point fixes (hopefully)
2025-05-05 17:53:43 +01:00
Ne_Eo
a7415783bc
Merge branch 'main' into pr/397
2025-05-05 15:38:45 +02:00
Ne_Eo
13033b2675
Merge remote-tracking branch 'upstream/main'
2025-04-10 02:24:58 +02:00
⍚~Nex
cfe209067c
updated vslice structures + using the class funcs
2025-04-04 23:28:49 +02:00
Ne_Eo
ba53853832
Fixed 2 bugs
2025-04-04 00:49:23 +02:00
⍚~Nex
56e0b3a1e5
also
2025-04-03 02:25:00 +02:00
⍚~Nex
4b145bf62e
A LOT OF NEW STUFF + more vslice events WIP
...
JUST GOTTA MAKE THE TWEEN ON THE CAMERA MOVEMENT FRUNCTION PROPERLY AND WE'RE GOOD
(and also make the charter not save not changed paramteres)
2025-04-02 01:50:00 +02:00
Ne_Eo
a8dfab7121
Sleep if Haxe Version Change
2025-03-16 02:57:50 +01:00
NyxieFemboy
04fcedfe9f
Revert "i hope i put this in the right place"
...
This reverts commit 733428e7ee
2025-03-10 11:50:43 -04:00
NyxieFemboy
733428e7ee
i hope i put this in the right place
2025-03-10 11:32:55 -04:00
Ne_Eo
bcde8c8709
Small changes
2025-03-02 20:31:25 +01:00
Ne_Eo
3851ede84d
Merge remote-tracking branch 'upstream/main'
2025-02-28 16:38:04 +01:00
⍚~Nex
2227231264
Merge branch 'main' into pr/397
2025-02-25 19:38:41 +01:00
28396e28bb
openalsoft audio fix ( #552 )
...
Co-authored-by: Smokey <78874128+Smokey555@users.noreply.github.com >
Co-authored-by: Cobalt Bar <79053181+CobaltBar@users.noreply.github.com >
2025-02-15 16:44:19 +01:00
Ne_Eo
0a1517df6b
Fix framerate counter when using timescale
2025-02-08 01:24:55 +01:00
⍚~Nex
a06128472c
after ages VERBOSE MODE
2025-02-06 23:23:26 +01:00
Ne_Eo
28868d8652
Better logs helpers
2025-02-06 21:14:24 +01:00
TheZoroForce240
3e13bf50c6
Continuous bpm change event, lots of other reworks and fixes
2025-02-01 21:13:46 +00:00
Frakits and GitHub
59b0c2ddee
nape integration support...
2025-01-31 16:31:48 +02:00
Ne_Eo
bb42fdc583
Fixed bug with last commit + more bug fixes
2025-01-24 02:49:42 +01:00
Ne_Eo
cbbb598f52
Added some more flags
2025-01-24 01:51:25 +01:00
TheZoroForce240 and GitHub
2f6207b11b
fixing beat and measure lines with time sig changes ( #2 )
2025-01-11 14:16:46 -05:00
Ne_Eo
0e47728d0f
Merge branch 'main' into pr/397
2025-01-10 16:33:08 +01:00
Ralty and NyxieFemboy
dca41cfbc2
Merge pull request #1 from Raltyro/Continuous-Tempo-Change
...
Continuous Tempo Change (Thank you Ralty, Im sorry Im still learning this stuff)
2025-01-10 02:40:43 -05:00
⍚~Nex
5ab8a02a10
Merge remote-tracking branch 'public/main'
2025-01-03 19:18:18 +01:00
300f38d290
[ENHANCEMENT] Prevent accidental selecting when tabbing back in ( #513 )
...
* prevent accidental selecting
* made something better
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-01-02 15:56:33 +01:00
Ralty