 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 |
|
|
Ne_Eo
|
a6fcb3d237
|
Merge branch 'main' into pr/397
|
2025-06-06 20:39:24 +02:00 |
|
|
Ne_Eo
|
94296ffb44
|
Merge remote-tracking branch 'upstream/main'
|
2025-05-07 15:47:35 +02:00 |
|
|
Ne_Eo
|
c2a7b5af11
|
Trim + Optimize images
|
2025-05-07 14:48:40 +02: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 |
|
|
Ne_Eo
|
6c0b245634
|
Optimize images (-808.7 KB)
The following weren't optimized since they did not retain the pixels fully:
- assets/images/editors/charter/strumline-drag.png
|
2025-04-10 02:16:15 +02:00 |
|
|
Ne_Eo
|
c81aaf171a
|
Optimize images
|
2025-03-01 19:24:49 +01:00 |
|
|
NyxieFemboy
|
3250cdb436
|
I think this should be everything?
|
2025-02-18 13:37:49 -05:00 |
|
|
TheZoroForce240
|
cb4a95678c
|
Negative and decimal support for event numbers (and some other changes)
|
2025-02-02 09:48:11 +00:00 |
|
|
TheZoroForce240
|
3e13bf50c6
|
Continuous bpm change event, lots of other reworks and fixes
|
2025-02-01 21:13:46 +00:00 |
|
|
Ne_Eo
|
18ea916f1a
|
Change how editor icons work
|
2025-01-17 15:23:32 +01:00 |
|
|
Verwex
|
16672e9f59
|
editor icon reorganization + 3 more editor icons
|
2025-01-16 23:53:23 +01:00 |
|
|
RaltyandNyxieFemboy
|
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 |
|
|
Ne_Eo
|
79dae9ed61
|
Added Event UI Scripts
|
2024-11-19 20:20:42 +01:00 |
|
|
Ralty
|
daf3179f79
|
Conductor Final Continuous Tempo & Time Sigs
|
2024-10-25 19:14:56 +07:00 |
|
|
Ne_Eo
|
85c38b266a
|
Made the time signature event icon dynamic
|
2024-10-12 23:06:55 +02:00 |
|
|
NyxieFemboy
|
8da7faa0b4
|
time Signature functionality wip
|
2024-10-06 15:10:51 -04:00 |
|
|
VerwexandNe_Eo
|
d5740b4e24
|
editor picker icons
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
|
2024-09-19 22:03:27 +02:00 |
|
|
Cobalt BarandGitHub
|
3ce7561f56
|
Asset optimization (#373)
* run oxipng on assets and art
* reset dialogueBox-evil.png and strumline-drag.png
|
2024-08-25 02:29:43 +02:00 |
|
|
lunarcleint
|
66f946d724
|
polish everything up
|
2024-03-22 22:26:43 -07:00 |
|
|
lunarcleint
|
6875b2126f
|
stuff
|
2024-03-22 20:52:08 -07:00 |
|
|
lunarcleint
|
d9c21c2b11
|
tweak deleter thingy
|
2024-03-22 18:26:48 -07:00 |
|
|
lunarcleint
|
64b7b6b297
|
canceling autosaves
|
2024-03-22 16:52:25 -07:00 |
|
|
lunarcleint
|
ac4617437a
|
autosaves :D
|
2024-03-22 04:30:09 -07:00 |
|
|
NeeEoo
|
f8b20774e3
|
Remove useless indentation
|
2024-03-16 21:15:18 +01:00 |
|
|
lunarcleint
|
f446c638c5
|
QAUNTIZED DRAGGING + some animation changes :D
|
2024-02-03 22:09:56 -07:00 |
|
|
lunarcleint
|
a136e8b0f6
|
new warning assets
|
2024-02-03 21:00:45 -07:00 |
|
|
lunarcleint
|
5721ce68a0
|
some new assets (not warnings)
|
2024-02-03 20:28:45 -07:00 |
|
|
lunarcleint
|
4059cdfc44
|
ok fix scroll speed change colors
|
2024-02-03 15:11:47 -07:00 |
|
|
lunarcleint
|
1c9332f283
|
New event icons
|
2024-02-03 15:06:49 -07:00 |
|
|
⍚~Nexandlunarcleint
|
5d3671c5e6
|
FINALLY new ui assets :DD
bar volume and audio sprites by me
volume icon lil rework by lunar
Co-Authored-By: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
|
2024-02-02 17:59:34 +01:00 |
|
|
lunarcleint
|
c4d92f8cfc
|
NEW EVENTS GUYS
|
2024-02-01 19:24:26 -07:00 |
|
|
⍚~Nex
|
be3ffd6e4f
|
possibility to undo and redo note type changes yay
|
2024-01-05 03:26:55 +01:00 |
|
|
lunarcleint
|
e3fc778c04
|
ok i added the buttons
|
2023-12-09 14:29:52 -07:00 |
|
|
lunarcleint
|
c0da2fadf2
|
add text box to slider (still needs to be visually fixed)
|
2023-10-07 21:16:44 -07:00 |
|
|
lunarcleint
|
559a308558
|
playback speed looks good
|
2023-10-07 16:22:23 -07:00 |
|
|
lunarcleint
|
74f430154a
|
remove all ivan assets
|
2023-09-26 16:44:58 -07:00 |
|
|
lunarcleint
|
357815187f
|
Finish update
|
2023-09-18 21:21:29 -07:00 |
|
|
lunarcleint
|
f5dbe5e7c3
|
warning changes
|
2023-09-18 15:15:11 -07:00 |
|
|
lunarcleint
|
3556d96f6b
|
Warning shit added
|
2023-09-17 17:34:05 -07:00 |
|
|
lunarcleint
|
0543f6c401
|
hopefully fix empty events
|
2023-09-16 12:40:08 -07:00 |
|
|
lunarcleint
|
1c9f8c2f59
|
bug fixes/lock
|
2023-08-29 17:16:53 -07:00 |
|
|
lunarcleint
|
22638048d8
|
making dragging look a bit better (still need to add limits)
|
2023-08-26 11:37:39 -07:00 |
|
|
lunarcleint
|
2c4df59ccd
|
remove hover note for now
|
2023-08-24 19:06:10 -07:00 |
|
|
NeeEoo
|
e0e646a3d0
|
Added Error popups
|
2023-08-19 21:18:13 +02:00 |
|
|
lunarcleint
|
1903764eaa
|
finished ui bar
|
2023-08-14 20:52:46 -07:00 |
|
|
lunarcleint
|
6d7834ec09
|
changes
|
2023-08-14 19:22:55 -07:00 |
|
|
lunarcleint
|
84539808d7
|
ui audio player bassicly finished (all we need are volume bar sprites)
|
2023-08-14 18:45:28 -07:00 |
|
|
lunarcleint
|
7d993189ca
|
ui sound player functional
|
2023-08-13 19:18:20 -07:00 |
|