EliteMasterEric
c3577b32ef
Port changes to ChartEditorState
2023-06-08 16:53:52 -04:00
EliteMasterEric
f959cbd950
ACTUALLY move MusicBeatSubState
2023-06-08 16:52:44 -04:00
EliteMasterEric
3005aa1f3b
Added legacy importer
2023-06-08 16:48:34 -04:00
EliteMasterEric
ac876c2f59
Fixes to Character preview window
2023-06-08 16:48:13 -04:00
EliteMasterEric
91a9c385b3
WIP of note preview
2023-06-08 16:47:48 -04:00
EliteMasterEric
657d898090
Additional file read/write functions
2023-06-08 16:42:02 -04:00
EliteMasterEric
3f2558d26a
Validated formatting of 338 XML files.
2023-06-08 16:34:06 -04:00
EliteMasterEric
e68f9ca9a1
Validated formatting of 203 HX files.
2023-06-08 16:30:45 -04:00
EliteMasterEric
a2b08e3e34
Update hxCodec
2023-06-06 17:38:40 -04:00
EliteMasterEric
1d3c4d61a6
Syntax fixes to get the branch to build
2023-06-06 17:38:31 -04:00
Cameron Taylor
7a04a2d774
blueball check
2023-06-04 01:19:08 -04:00
Cameron Taylor
2d772a526b
no skipping easter egg!!
2023-06-02 15:56:40 -04:00
EliteMasterEric
9f8d1dbac2
Playstate fixes WIP (TODO: fix compile errors)
2023-06-02 15:35:01 -04:00
EliteMasterEric
a017fb2074
Remove old charting state
2023-06-02 15:25:36 -04:00
EliteMasterEric
123682dc69
Added new constants/defaults.
2023-06-02 15:25:28 -04:00
EliteMasterEric
c9fb6bc51f
Further typo fixes
2023-06-02 15:25:13 -04:00
EliteMasterEric
4851ff5c27
Internal rework to song events
2023-06-02 14:35:28 -04:00
EliteMasterEric
57caeef802
Work on re-enabling cutscenes
2023-06-02 14:35:08 -04:00
EliteMasterEric
b126ac28f4
state->State
2023-06-02 14:34:47 -04:00
EliteMasterEric
4d539fdda2
Substate -> SubState (capitalization fix)
2023-06-01 18:52:58 -04:00
EliteMasterEric
fd5c546005
Fixed a bug where assets from other weeks wouldn't load
2023-06-01 16:00:15 -04:00
EliteMasterEric
09318c258b
Remove old story menu state
2023-06-01 15:59:56 -04:00
Eric
b49a2857e5
Revert guaranteed fakeout
2023-06-01 00:33:30 -04:00
EliteMasterEric
374f03dae3
Fakeout death now uses HScript
2023-06-01 00:31:32 -04:00
Cameron Taylor
2d16aab488
snds effects
2023-05-31 03:28:53 -04:00
Cameron Taylor
dbab5a912d
death alt easter egg
2023-05-31 03:03:10 -04:00
EliteMasterEric
121fc13153
Added some utility functions
2023-05-30 16:21:24 -04:00
EliteMasterEric
6412cb3aee
Fix bug where story mode breaks after first playthrough
2023-05-30 16:21:12 -04:00
EliteMasterEric
a2ddeec5bb
Daddy Dearest animation fixes
2023-05-30 16:20:57 -04:00
EliteMasterEric
4efafe8a78
Health icon refactors/fixes
2023-05-26 17:10:35 -04:00
EliteMasterEric
872f7c93e8
Added onAdd event so GF character can fix position in Tutorial
2023-05-26 17:10:08 -04:00
Cameron Taylor
6ab391d57a
Merge pull request #99 from FunkinCrew/feature/split-vocals
...
Ported chart format (fixing story menu) and split vocals
2023-05-26 14:13:14 -04:00
Cameron Taylor
503a0107c7
Merge pull request #98 from FunkinCrew/bugfix/character-crashes
...
Bugfix/character crashes
2023-05-26 13:44:59 -04:00
EliteMasterEric
dc932eb8d7
A few bug fixes related to vocal tracks
2023-05-25 19:36:32 -04:00
EliteMasterEric
2af4a51b15
Merge branch 'master' into feature/split-vocals
2023-05-25 18:39:41 -04:00
EliteMasterEric
2f10de3594
New refactor to VoicesGroup to make multiple vocal tracks actually work
2023-05-25 18:34:26 -04:00
EliteMasterEric
317c127730
Deprecation warning fixes (no actual logic changes tho)
2023-05-25 18:33:39 -04:00
EliteMasterEric
010d5672bb
Fix for FlxSound error; fix typo in Spirit class
2023-05-24 16:11:29 -04:00
EliteMasterEric
482de2a122
Added Nightmare difficulty (stub)
2023-05-22 20:55:53 -04:00
EliteMasterEric
09654170ed
Erect mixes play properly when selected
2023-05-22 13:47:01 -04:00
EliteMasterEric
a599dbea11
Reworked Story Menu (data driven)
2023-05-17 16:42:58 -04:00
EliteMasterEric
021f7a0a1c
Work in progress on story menu data storage rework
2023-05-16 22:09:53 -04:00
Cameron Taylor
03cab4a326
Merge pull request #81 from FunkinCrew/results-anims
...
different result screen in progress
2023-04-24 17:59:20 -04:00
Cameron Taylor
e802aa885b
gf shit fix
2023-04-21 17:39:27 -04:00
Cameron Taylor
03f48289e1
Merge pull request #84 from FunkinCrew/bugfix/songeventscriptevent
...
Fixed an issue where SongEventScriptEvent would not be dispatched
2023-04-20 16:56:05 -04:00
EliteMasterEric
337802a6bf
Fixed an issue where SongEventScriptEvent would not be dispatched
2023-04-20 13:48:15 -04:00
Cameron Taylor
6fe747eac1
true perfect
2023-04-19 04:08:03 -04:00
Cameron Taylor
b4468a45c3
no more shit loops!
2023-04-19 03:00:52 -04:00
Cameron Taylor
2fefb657ec
excellent looping issue
2023-04-19 02:51:47 -04:00
Cameron Taylor
7c225bea18
no forced shit mode
2023-04-17 17:59:47 -04:00
Cameron Taylor
e872dddd15
looping fix
2023-04-17 17:59:22 -04:00
Cameron Taylor
b1dfbb2ef2
shit one
2023-04-17 11:02:45 -04:00
Cameron Taylor
c2e340ef19
variation and hmm fix
2023-04-16 18:57:18 -04:00
Cameron Taylor
f411cdac88
different result screen in progress
2023-04-16 15:33:20 -04:00
Cameron Taylor
2271025bc2
sticker loadin up nice!
2023-04-10 16:05:37 -04:00
Cameron Taylor
6fb517059d
proper load/deload on freeplay and story
2023-04-10 14:44:32 -04:00
Cameron Taylor
67a56f7416
loaded up teehee
2023-04-06 01:39:27 -04:00
Cameron Taylor
de7fab4371
sticker funzies
2023-04-05 17:35:19 -04:00
Cameron Taylor
1a5b68acd8
substate loading type beat
2023-04-05 00:56:02 -04:00
Cameron Taylor
41e6a270f0
sticker swag out
2023-04-04 22:38:45 -04:00
Cameron Taylor
2de744cdcf
stickers uploaded
2023-04-04 22:24:00 -04:00
Cameron Taylor
5a0ce60b36
Merge pull request #73 from FunkinCrew/inputspitter-rfc
...
make game use rfc format for spitting inputs
2023-03-28 12:21:43 -04:00
Ravy
c68ed233f9
make game use rfc format for spitting inputs
2023-03-18 19:47:23 +00:00
Cameron Taylor
0905b2c4b1
fixed exit bugs
2023-03-16 22:02:56 -04:00
Cameron Taylor
0d9c19d630
freeplay exit generally workin
2023-03-16 01:03:45 -04:00
Cameron Taylor
91724133d7
lil polish stuff!
2023-03-16 00:55:25 -04:00
Cameron Taylor
4a6b961046
ezier transition stuff
2023-03-16 00:17:52 -04:00
Cameron Taylor
014a8f320b
freeplay exiting stuff
2023-03-15 21:05:15 -04:00
Cameron Taylor
f32330914e
score fix for ravy teehe
2023-03-09 12:39:56 -05:00
Cameron Taylor
bf7a42d143
Merge pull request #20 from FunkinCrew/chart-editor-fixes-with-dave
...
Chart editor fixes with dave
2023-03-08 13:24:39 -05:00
Cameron Taylor
f9a7e309fb
score change
2023-03-02 04:20:03 -05:00
Cameron Taylor
d76bb07935
windows fix thing for mac
2023-03-01 20:27:29 -05:00
EliteMasterEric
75b4c732db
Mac fix, doh!
2023-03-01 18:22:28 -05:00
EliteMasterEric
fe92d00a04
Numerous chart editor fixes.
2023-02-28 21:06:09 -05:00
EliteMasterEric
20e6c7a2be
Fix 5 or 6 issues with charting
2023-02-28 13:17:28 -05:00
EliteMasterEric
f0432773e8
Merge branch 'master' of https://github.com/FunkinCrew/Funkin-secret
2023-02-23 22:15:31 -05:00
Cameron Taylor
9ef5974e52
build fix?
2023-02-22 15:30:58 -05:00
EliteMasterEric
9455689de9
Adobe animate fixes
2023-02-22 15:26:01 -05:00
Cameron Taylor
9ff3d4355d
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2023-02-22 15:01:07 -05:00
Cameron Taylor
dd73539294
inputSpitter for ravy
2023-02-22 14:46:46 -05:00
EliteMasterEric
e035adab72
Merge branch 'feature/flxanimate'
2023-02-21 21:01:22 -05:00
EliteMasterEric
cdd8cd2ed2
Basic working tankman sprites and cutscenes
2023-02-21 20:58:15 -05:00
Cameron Taylor
460da18804
slowly implementing CTRL-z movement
2023-02-09 01:31:43 -05:00
Cameron Taylor
169309e17d
selection and ctrl Z
2023-02-08 04:34:32 -05:00
Cameron Taylor
33976a619e
selection command in progress
2023-02-08 04:17:47 -05:00
Cameron Taylor
501e159797
selection outline
2023-02-08 01:40:27 -05:00
Cameron Taylor
b8f9a241f4
stuff in progress teehee
2023-02-03 20:21:04 -05:00
Cameron Taylor
ca443411be
stage edit funny moments
2023-02-03 18:10:06 -05:00
EliteMasterEric
8329196118
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2023-02-02 18:28:11 -05:00
EliteMasterEric
2ed4752399
Fixed bug where playbar wasn't showing
2023-02-02 18:26:03 -05:00
EliteMasterEric
a598d88152
WIP
2023-02-02 18:08:30 -05:00
EliteMasterEric
39585f9794
WIP on Animate
2023-02-01 16:18:41 -05:00
Cameron Taylor
0f9d0a6c98
stage editor in progress
2023-01-27 02:38:37 -05:00
EliteMasterEric
634258535c
Applied new code style to source/ and assets/data/
2023-01-22 22:25:45 -05:00
EliteMasterEric
e922c026a9
Merge branch 'feature/chart-editor-events'
2023-01-22 20:03:08 -05:00
EliteMasterEric
6d7913786e
Working events in chart editor
2023-01-22 19:55:30 -05:00
Cameron Taylor
6ddc735445
2hot stuff in progress wahoo
2023-01-11 00:42:03 -05:00
Cameron Taylor
341d8726b2
PAUSE AND STEPPING WORKING WITH MUSIC
2023-01-06 03:21:54 -05:00
Cameron Taylor
968c5b7a50
can spin wahoo! also merge fixes hehe
2023-01-05 23:37:08 -05:00
EliteMasterEric
7f9171203a
Merge branch 'feature/2-chart-2-editor'
2023-01-02 17:43:19 -05:00
EliteMasterEric
6d233b93e0
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2023-01-02 17:41:19 -05:00
EliteMasterEric
6b3c15348b
Autosave and save-on-quit for chart editor
2023-01-02 17:40:53 -05:00
EliteMasterEric
b3b7fb49c2
Difficulty selector and player previews
2022-12-17 15:19:42 -05:00
Cameron Taylor
e1f53d288d
freeplay highscore stuff
2022-12-16 17:10:22 -05:00
EliteMasterEric
a2d803cc83
Note quant snapping
2022-12-14 15:33:30 -05:00
Cameron Taylor
0b24dd537e
Merge branch 'freeplay-sort'
2022-12-14 13:55:01 -05:00
Cameron Taylor
4af5905100
better freeplay number
2022-12-14 12:25:12 -05:00
Eric Myllyoja
234dc0ac19
Vocal group work
2022-12-13 17:38:55 -05:00
Eric Myllyoja
9db6f7f32a
Merge remote-tracking branch 'origin/feature/week-4-gameplay'
2022-12-08 19:52:09 -05:00
Eric Myllyoja
19b2f3799a
Chart wizard plus shader fixes
2022-12-08 19:33:47 -05:00
Cameron Taylor
6a01c3008c
proper result screen masking !
2022-12-07 02:29:48 -05:00
Cameron Taylor
3f28fdb92c
song name on result screen stuff WIP
2022-12-02 21:37:07 -05:00
Eric Myllyoja
fbf92acf23
Work on Upload Vocals dialog
2022-12-01 17:32:10 -05:00
Eric Myllyoja
3f6cbb61d4
WIP on new chart wizard
2022-11-25 20:48:05 -05:00
Eric Myllyoja
20ac91bbd9
WIP on splash screen
2022-11-24 19:09:47 -05:00
Eric Myllyoja
7ddfe82dab
Polymod fix
2022-11-23 20:52:03 -05:00
Eric Myllyoja
37ae96fba7
Added confirm and AFK animations to BF on freeplay menu
2022-11-15 02:23:44 -05:00
Eric Myllyoja
7190a3b47a
Pico flips you off now
2022-11-14 23:30:35 -05:00
Eric Myllyoja
49edef40cc
Tried to get spectogram working
2022-11-09 21:33:39 -05:00
Eric Myllyoja
1dac530940
More cursor types
2022-11-08 17:28:09 -05:00
Eric Myllyoja
ee89815981
Several QOL features for chart editor, custom cursor logic
2022-11-08 16:32:00 -05:00
Eric Myllyoja
709cfab6a7
Merge branch 'feature/chart-editor'
2022-10-27 09:37:13 -04:00
Eric Myllyoja
6e8feecef1
Many improvements to chart system and song format logic
2022-10-26 01:14:29 -04:00
MasterEric
fc4f398157
Playbar fixes
2022-10-14 23:01:41 -04:00
Eric Myllyoja
a423424715
Notifications and more
2022-10-13 21:32:19 -04:00
Eric Myllyoja
cedb224783
More chart editor progress (selection)
2022-10-12 21:42:40 -04:00
Eric Myllyoja
7d21d80915
Clipboard rework
2022-10-11 03:14:57 -04:00
Eric Myllyoja
175908f827
Updated chartformat v7
2022-10-10 20:04:09 -04:00
Eric Myllyoja
36a49affee
Chart editor basic difficulty switching
2022-10-07 00:37:21 -04:00
Cameron Taylor
085cc45253
cute hearts
2022-09-28 03:40:51 -04:00
Cameron Taylor
9c2efc4d0e
fav in progress
2022-09-28 02:50:53 -04:00
Cameron Taylor
bbdd750d3b
hold infinite scroll stuff
2022-09-27 04:53:34 -04:00
Cameron Taylor
4918c4f645
alphabetical sorting stuuuuf
2022-09-27 04:37:42 -04:00
Cameron Taylor
09a037b20b
basic sort and search
2022-09-26 18:22:45 -04:00
MasterEric
8a2e4687b2
Fixed TitleState not firing onBeat
2022-09-26 17:18:19 -04:00
Eric Myllyoja
679ca4aafb
Tweaks to song events
2022-09-24 15:02:10 -04:00
MasterEric
7b71fc2dff
Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor
2022-09-24 01:29:53 -04:00
MasterEric
cdc23f0809
Working new chart format (not working everything else :') )
2022-09-24 01:28:39 -04:00
Cameron Taylor
182c7e3aa4
new highscore thingie
2022-09-23 16:28:17 -04:00
Cameron Taylor
4eb1b5bb78
quick and dirty new highscore check
2022-09-23 16:12:18 -04:00
Cameron Taylor
84b5c9e0fd
score popin thingie
2022-09-23 15:42:12 -04:00
Cameron Taylor
58fe9c8f8c
got g-friend codeed
2022-09-23 14:26:50 -04:00
Eric Myllyoja
bb5ed65d27
Further conductor/bpm stuff
2022-09-23 00:49:42 -04:00
Cameron Taylor
1a1ac2a866
timing stuff all nice XD
2022-09-22 16:21:31 -04:00
Cameron Taylor
becef12c9f
positioning enough...
2022-09-22 15:48:27 -04:00
Eric Myllyoja
9ebb566b2a
WIP on conductor rework
2022-09-22 06:34:03 -04:00
Cameron Taylor
46c15e76f1
colors and numbers teehee
2022-09-22 04:09:06 -04:00
Cameron Taylor
8cd96a7b0d
difficulties
2022-09-21 21:03:31 -04:00
Cameron Taylor
6b0e009b05
boom box stuff for results XD
2022-09-21 20:26:16 -04:00
Cameron Taylor
3f42d22d5b
name change stuff and some placements
...
also commit lol!
2022-09-21 18:01:48 -04:00
Cameron Taylor
3d8d5ebdec
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
2022-09-20 15:53:57 -04:00
Cameron Taylor
7c0c09775a
results ending variations
2022-09-20 13:18:40 -04:00
Cameron Taylor
37267dd7e2
songs in progres
2022-09-20 13:01:37 -04:00
Cameron Taylor
afa1a9d13c
better combo stuf
2022-09-20 02:37:43 -04:00
Cameron Taylor
1dbb4099ec
basic result screen in progress counting tallies
2022-09-20 02:16:12 -04:00
Cameron Taylor
f70b581bf8
song event trace prototype
2022-09-17 05:51:21 -04:00
Cameron Taylor
f47e67e073
event parsing prototyping
2022-09-17 05:38:45 -04:00
Eric Myllyoja
7fbdbcdfad
Fix merge issues
2022-09-16 15:38:36 -04:00
Eric Myllyoja
79751222e1
Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor
2022-09-16 15:38:19 -04:00
Eric Myllyoja
3597b09a46
Finished song data loader
2022-09-16 15:37:00 -04:00
Cameron Taylor
f07d172219
data stuff moved OUT of Note.hx!
2022-09-16 01:44:50 -04:00
Eric Myllyoja
848874eaac
Fix merge conflicts
2022-09-14 22:28:37 -04:00
Eric Myllyoja
51a7282d40
Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor
2022-09-14 22:28:04 -04:00
Eric Myllyoja
194d8e6ce6
WIP on song data loading
2022-09-13 01:09:30 -04:00
Cameron Taylor
43b952b321
char input haxeUI stuff
2022-09-08 16:39:31 -04:00
Cameron Taylor
e15815afa8
initial haxeui for character offset editor
2022-09-08 04:03:50 -04:00
Eric Myllyoja
3a085e9333
Combo counter tweaks, stage position tweaks
2022-09-08 02:48:51 -04:00
Eric Myllyoja
baab8e101f
Stage builder improvements, Weekend 1 stage
2022-09-08 01:09:22 -04:00
Eric Myllyoja
d84be39a5e
Minor tweaks and fixes
2022-09-07 22:57:40 -04:00
Eric Myllyoja
e3857d789f
Merge branch 'master' into feature/week-4-gameplay
2022-09-07 19:12:18 -04:00
Eric Myllyoja
eb3ad49a30
Work in progress on HaxeUI chart editor
2022-09-07 19:07:08 -04:00
Eric Myllyoja
f790cd8fd6
WIP
2022-09-06 00:59:54 -04:00
Eric Myllyoja
7c88032551
More code for Blazin, additional shaders
2022-09-03 22:21:54 -04:00
Eric Myllyoja
c26b3a828d
First work in progress for Blazin
2022-08-31 02:24:09 -04:00
Eric Myllyoja
31487c0a32
Logic for double cans, partial implementation of cans into 2hot
2022-08-27 02:02:29 -04:00
Cameron Taylor
36e6d6bd91
fft...
2022-08-26 16:46:58 -04:00
Cameron Taylor
07fb4039dc
dipshit FFT fixing in progress...
2022-08-26 16:46:48 -04:00
Cameron Taylor
eaab159c73
lit-up on street stage
2022-08-25 20:15:50 -04:00
Cameron Taylor
aaf1376b53
stage editor Y key fix (and streets repositioning)
2022-08-25 05:18:09 -04:00
Cameron Taylor
59aae9c3d9
storymenu stuff for now 🤝
2022-08-25 01:40:39 -04:00
Cameron Taylor
831626a156
stuff for storymenu
2022-08-25 01:35:47 -04:00
Cameron Taylor
8f4855852e
BASE PROTOTYPE WORKING W/ HaxeUI
2022-08-24 05:44:22 -04:00
Eric Myllyoja
2bef1cb88a
Adjusted firing streak and angle.
2022-08-22 21:55:30 -04:00
Cameron Taylor
3be4530fa5
code in place for story week
2022-08-22 20:18:54 -04:00
Eric Myllyoja
fe9a319814
Latest WIP on Weekend 1 appearance stuff
2022-08-16 20:26:34 -04:00
Eric Myllyoja
2760a9ae9a
Polished Week 4 light post code.
2022-07-24 14:44:17 -04:00
Eric Myllyoja
600c7e5441
F3 to toggle debug markers, various visual tweaks
2022-07-24 00:49:54 -04:00
Eric Myllyoja
aa0962fe62
Cleanup of GameOverSubstate, fix GF duck animation duration
2022-07-22 22:25:19 -04:00
Eric Myllyoja
c456355366
Scripted states and shaders.
2022-07-22 16:11:18 -04:00
Cameron Taylor
a731ccf0ad
dipshit latency stuff WIP still
2022-07-19 14:19:03 -04:00
Eric Myllyoja
4172fd861d
First prototype of can logic
2022-07-14 19:03:42 -04:00
Cameron Taylor
f3e0b0ec5b
input accuracy testing
2022-07-12 19:02:38 -04:00
Cameron Taylor
5778e979d9
lil fix for end number hehe
2022-07-11 15:14:59 -04:00
Cameron Taylor
05858a4f6c
crash fix when pressing before loop
2022-07-11 15:04:41 -04:00
Eric Myllyoja
ee3e1750df
Work in progress on Week 8 stuff (animation offsets, death animation)
2022-07-06 21:49:42 -04:00
Cameron Taylor
4d3766b65b
better traces hehe
2022-07-06 20:58:13 -04:00
Cameron Taylor
c3995ef557
different timestamping
2022-07-06 20:54:07 -04:00
Cameron Taylor
5e630dc214
latency debugging stuff in progress
2022-07-06 20:37:35 -04:00
Cameron Taylor
1c1974bae5
better beat visualizations
2022-07-06 18:45:27 -04:00
Cameron Taylor
f797f6a7b1
music debug stuff in progress
2022-07-06 15:27:45 -04:00
Cameron Taylor
53d703cfcd
spectogram tweakin hehe
2022-07-05 14:36:01 -04:00
Cameron Taylor
9cf2598951
spectogram placeholder
2022-07-05 14:34:08 -04:00
Cameron Taylor
b5d85c3fd6
latency stuff in progress maybe?
2022-07-05 14:24:02 -04:00
Eric Myllyoja
05148ee4f0
GF now ducks (a little glitchy tho)
2022-06-12 00:53:39 -04:00
Eric Myllyoja
705d0ed5b9
Updated hmm deps, no more forks!
2022-06-12 00:02:49 -04:00
Eric Myllyoja
05db82c828
Added blood to henches, added moving limo, added dynamic GF combo/drop animations
2022-06-09 22:28:58 -04:00
Cameron Taylor
3f84a5514f
POV i learning how macros work
2022-06-09 02:27:20 -04:00
Eric Myllyoja
1c62dc1274
First revision of henchmen killing.
2022-06-01 22:07:42 -04:00
Cameron Taylor
853820c56b
animation timing fixes
2022-05-30 23:59:12 -04:00
Eric Myllyoja
9dfbfad926
First test of Week 4 Gameplay, plus fixes for MultiSparrow
2022-05-29 21:40:13 -04:00
Cameron Taylor
64b40ce7b8
bf default cam position fix
2022-05-29 19:33:04 -04:00
Cameron Taylor
e844b93641
spookeez scared animation lightning fix
2022-05-29 19:13:21 -04:00
MtH
02255a61d9
oopy forgot the comment
2022-05-07 22:33:18 +02:00
MtH
8bd876ed1c
flipx
2022-05-07 22:07:09 +02:00
MtH
8e2eefb605
0.2.8 character positions, dont multiply zoom, chara scaling fix
2022-05-07 18:45:49 +02:00
Cameron Taylor
bfce579cd5
Merge remote-tracking branch 'origin/master' into feature/scripted-characters
2022-05-04 12:27:18 -04:00
Cameron Taylor
f37c2cbbf6
cameraOffset stuff defaulted properly
2022-05-03 14:07:18 -04:00
Cameron Taylor
d835bed813
senpai stage tweaks
2022-05-03 13:27:14 -04:00
Cameron Taylor
f9f711a179
charting editor head fix
2022-05-03 13:09:02 -04:00
Cameron Taylor
be995f0702
note styles in Note.hx that use StrumlineStyle
2022-05-03 13:02:37 -04:00
Cameron Taylor
4245bd4777
spooky mansion, and also fix for introText # thing
2022-05-03 11:01:29 -04:00
Cameron Taylor
3a327f5c5d
pico fixes teehee
2022-05-02 23:00:00 -04:00
Cameron Taylor
79ce2237fc
small cam fix anotha hehe
2022-05-01 15:23:09 -04:00
Cameron Taylor
769969898b
camera positioning fixes
2022-05-01 15:20:15 -04:00
Cameron Taylor
992ff442c0
evil senpai hehe
2022-05-01 15:02:51 -04:00
Cameron Taylor
d12f0dc7b9
rough senpai repositioning
2022-05-01 14:59:18 -04:00
Cameron Taylor
8231f432ff
can move the characters around, and some pos fixes
2022-05-01 14:52:58 -04:00
Cameron Taylor
a5857313c5
prototype character mover thing lol
2022-04-30 00:37:05 -04:00
Eric Myllyoja
5bb1376459
Added cornerPosition and feetPosition properties for easy reference
2022-04-29 23:51:52 -04:00
Cameron Taylor
282e93e1ff
character repositioning proof of concept stuf
2022-04-29 23:46:41 -04:00
Cameron Taylor
231f76c893
pixel icon placement fix
2022-04-29 21:45:56 -04:00
Cameron Taylor
31b393b014
character animation dance force is OFF
2022-04-29 11:56:08 -04:00
Cameron Taylor
112a9ee329
main menu storymode anim fix
2022-04-29 11:10:43 -04:00
Cameron Taylor
60e0668e74
icon fixes (week 4 + positions)
2022-04-29 00:22:42 -04:00
Cameron Taylor
a8218d2542
main menu fix, and it BUILDS
2022-04-28 23:52:19 -04:00
Cameron Taylor
e24de498a1
import fix + weird git merge thing lol (doesnt build)
2022-04-28 23:46:37 -04:00
Eric Myllyoja
43dbce2be1
Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters
2022-04-18 20:39:41 -04:00
Cameron Taylor
061b16bde7
Merge branch 'feature/scripted-modules' of https://github.com/ninjamuffin99/Funkin-secret into feature/scripted-modules
2022-04-18 20:24:03 -04:00
Cameron Taylor
22de93705c
quick thing to put back my ez debug skip thing lol
2022-04-18 20:24:01 -04:00
Eric Myllyoja
e4e516dd30
Crash fix for Stress
2022-04-18 20:09:02 -04:00
Cameron Taylor
4fedb9e34a
derp XD
2022-04-18 19:51:18 -04:00
Eric Myllyoja
0b17f74f48
Merge remote-tracking branch 'origin/master' into feature/scripted-modules
2022-04-18 19:46:39 -04:00
Eric Myllyoja
d5d1c0ae95
Merge branch 'feature/scripted-modules' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-modules
2022-04-18 19:36:18 -04:00
Eric Myllyoja
b6da0b5e20
Fixed Week 4 boppers and car.
2022-04-18 19:36:09 -04:00
Cameron Taylor
b145e7629f
html5 fixes... again lol
2022-04-18 15:00:12 -04:00
Cameron Taylor
1485d27b07
debug thing to hide pause menu
2022-04-18 13:53:48 -04:00
Cameron Taylor
967f847800
nicer pausemenu exit, and force loading for ez tests
2022-04-15 17:11:01 -04:00
Eric Myllyoja
25dc011df2
Many bug fixes; combo meter now works; main menu graphics split up
2022-03-29 21:56:04 -04:00
Eric Myllyoja
4b7744f4e3
Additional fixes for health icons and camera positioning.
2022-03-26 22:18:26 -04:00
Eric Myllyoja
3634346072
Stable, only position adjustments needed.
2022-03-25 22:30:37 -04:00
Cameron Taylor
3f634a6657
-DANIMDEBUG initstate fix
2022-03-25 17:56:47 -04:00
Cameron Taylor
8302b2d2ba
quick and dirty freeplay exit transition fix
2022-03-23 23:27:48 -04:00
MtH
9cb269a19c
pixel pause & misc
2022-03-23 19:29:02 +01:00
Eric Myllyoja
386e8db830
Ported all base game characters
2022-03-23 01:18:23 -04:00
Eric Myllyoja
a7d338becb
First iteration of stable custom characters, plus some other neat changes.
2022-03-21 00:19:05 -04:00
Cameron Taylor
10bafff63e
Merge branch 'master' into feature/scripted-stages
2022-03-18 21:54:16 -04:00
Cameron Taylor
5f98aa7fb5
busted input fix (breaks pyro test probably)
2022-03-18 21:47:30 -04:00
Cameron Taylor
a40a4663d8
parse animate removed an import lol!
2022-03-18 12:28:25 -04:00
Eric Myllyoja
1a85b4a1ce
First WIP of scripted characters (NOT WORKING)
2022-03-17 01:40:08 -04:00
Eric Myllyoja
7c0cb9c69c
Archiving hookablemacro
2022-03-14 22:02:44 -04:00
Eric Myllyoja
60c6e5ee29
Various bug fixes for strumlines
2022-03-14 20:48:45 -04:00
Eric Myllyoja
1935373963
Hide song name in play state
2022-03-13 14:47:59 -04:00
Eric Myllyoja
0cc4f8a982
Scripted modules are stable but missing some features.
2022-03-13 14:36:03 -04:00
Eric Myllyoja
49b2907a30
Scripted module and script event systems, reworked strumlines.
2022-03-11 01:30:01 -05:00
MtH
449af0ea18
rise from your grave
2022-03-10 01:33:05 +01:00
MtH
151c96afc8
voicesgroup resync
2022-03-10 01:07:39 +01:00
Cameron Taylor
d477320894
xmas mall positioning fix (plus score reset, lol!)
2022-03-09 18:57:36 -05:00
Cameron Taylor
ef665df9d0
hold note balance shit lol! unrelated to polymod!!
2022-03-09 15:04:35 -05:00
Cameron Taylor
9dcffaa3fa
spirit layering fix
2022-03-09 14:06:10 -05:00
Eric Myllyoja
fe109f878f
Merge remote-tracking branch 'origin/master' into feature/scripted-stages
2022-03-09 10:37:21 -05:00
Eric Myllyoja
19cda4ed15
Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages
2022-03-09 10:36:39 -05:00
Eric Myllyoja
57fcb74657
Spirit trail is now behind
2022-03-09 10:36:13 -05:00
Cameron Taylor
45b9d725f2
tankman cloud reset?
2022-03-09 10:29:03 -05:00
Eric Myllyoja
404b2b648e
Modified every file in the codebase to solve a single bug.
2022-03-08 03:13:53 -05:00
Cameron Taylor
7f9cd6824c
fixed wiggle, just made effect
non required param lol
2022-03-07 20:25:00 -05:00
Cameron Taylor
8ff1a3cb85
no traces? *funny megamind picture*
2022-03-07 18:36:29 -05:00
Eric Myllyoja
6475a49bf4
Final cleanup before PR.
2022-03-06 03:33:12 -05:00
Eric Myllyoja
b19478cd1e
Scripted stages are done (weeks 1-7)
2022-03-06 02:37:38 -05:00
Eric Myllyoja
d50a82cdf6
Work-in-progress for Week 7
2022-03-02 01:20:27 -05:00
Eric Myllyoja
ef53acb3a3
Week 5 changes
2022-03-01 22:07:33 -05:00
Eric Myllyoja
8eef111021
Fixed shaders on schoolEvil
2022-03-01 20:57:05 -05:00
Eric Myllyoja
f74962f8e8
WIP on Week 6
2022-03-01 11:29:01 -05:00
Eric Myllyoja
00497ee729
Added spacebar to attack
2022-02-28 23:23:42 -05:00
Eric Myllyoja
f2b4dbe751
Pyro test
2022-02-28 23:04:55 -05:00
Eric Myllyoja
c995870bac
Cleaned up Week 4, Week 5 Nice done, Week 8 Placeholder
2022-02-27 01:12:08 -05:00
Eric Myllyoja
591ec3bdec
Goodbye, BackgroundDancer...
2022-02-26 23:35:15 -05:00
Eric Myllyoja
c1cea068d4
Added boppers, started work on Week 4.
2022-02-26 23:26:30 -05:00
Eric Myllyoja
d795f4fa5c
Week 3 complete.
2022-02-26 13:02:28 -05:00
Eric Myllyoja
301399200d
Ported Weeks 1 and 2, WIP Week 3
2022-02-26 09:06:49 -05:00
Eric Myllyoja
2cfeffb791
Merge remote-tracking branch 'origin/master' into feature/scripted-stages
2022-02-25 02:22:45 -05:00
Eric Myllyoja
a0f285e319
Script-driven stages are done!
2022-02-25 02:02:06 -05:00
Eric Myllyoja
c0c1fb482f
Add stage data files
2022-02-23 16:58:23 -05:00
Eric Myllyoja
af21a56dc0
Move songs to their own folder
2022-02-23 16:51:24 -05:00
Eric Myllyoja
7b8883d3dd
Work in progress, basic stage done
2022-02-23 16:49:54 -05:00
George Kurelic
37517e1e16
use type inference instead of conditional type
2022-02-22 13:03:01 -06:00
George Kurelic
b50364edcf
check #if polymod instead of cpp
2022-02-22 12:57:29 -06:00
Cameron Taylor
f158a3929c
weekend fighting in progress + del superlinter
2022-02-18 16:29:29 -05:00
Cameron Taylor
f5c3b7db02
dumb useless lol
2022-02-16 16:57:08 -05:00
Cameron Taylor
d6db576585
some combo popup / playstate lil cleanup
2022-02-16 16:31:20 -05:00
Cameron Taylor
5c09417329
revert to shitty spectogram back...
2022-02-11 21:39:43 -05:00
Cameron Taylor
804e084668
polygon spectogram stuff redo
2022-02-11 14:21:42 -05:00
Cameron Taylor
ef67aacf86
polygon spectogram fix
2022-02-11 12:03:54 -05:00
Cameron Taylor
75938a5daf
Merge pull request #9 from ninjamuffin99/george_helpers
...
George helpers
2022-02-11 10:24:33 -05:00
Cameron Taylor
5c45f7a092
new spectro vis in progress + sustain note charting ed vis
2022-02-10 14:23:45 -05:00
Cameron Taylor
c73e8e1a4d
audiovis reorganize + MeshRender obj in progres
2022-02-10 13:17:46 -05:00
George FunBook
2aee6bcab8
dir/color note helpers
2022-02-09 19:31:36 -06:00
George FunBook
fc2a20a1fd
add song/week/dif compile directives
2022-02-09 19:24:33 -06:00
Cameron Taylor
96540fc09e
more spectogram optimiz in progress
2022-02-09 14:00:04 -05:00
Cameron Taylor
0b9c9d7533
stinky dipshit specto viz optimization
2022-02-09 13:37:57 -05:00
Cameron Taylor
44e720ee28
click and drag sustain
2022-02-06 13:56:18 -05:00
Cameron Taylor
36b5466057
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2022-02-05 11:12:03 -05:00
Cameron Taylor
2c91016e76
diffifulcty adder in progress while i go to library loL!
2022-02-04 12:04:59 -05:00
George FunBook
53cb4fa78d
fix crash on week 1
2022-02-04 10:58:24 -06:00
Cameron Taylor
db1d9c1824
saving files for notemap
2022-02-04 09:25:29 -05:00
Cameron Taylor
b263c553ad
optimized lol
2022-02-03 19:54:32 -05:00
Cameron Taylor
f710ad78bc
side preview (needs optimization)
2022-02-03 19:51:16 -05:00
Cameron Taylor
42d89426a4
sidebar preview
2022-02-03 19:13:39 -05:00
Cameron Taylor
d0134a3701
song difficulty swapper
2022-02-03 10:39:07 -05:00
Cameron Taylor
7958c49007
charting editor diff selector in progress
2022-02-03 10:32:29 -05:00
Cameron Taylor
bec17ca5f4
notes to map in progress
2022-01-31 14:45:38 -05:00
Cameron Taylor
1aef44b905
quik thing lol!
2022-01-31 14:17:37 -05:00
Cameron Taylor
9f3a11a01a
dynamic chart difficulties in progress
2022-01-31 14:16:28 -05:00
Cameron Taylor
fc209188f2
lerp polish chart editor lol!
2022-01-28 20:03:38 -05:00
Cameron Taylor
d8b6be43ed
few comments so I dont forget why my brain busted
2022-01-28 12:24:50 -05:00
Cameron Taylor
1b61a535d4
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2022-01-28 12:20:16 -05:00
Cameron Taylor
b46a276671
song load fix lol woops!
2022-01-28 12:20:03 -05:00
Eric Myllyoja
8479b0b671
A memory usage counter ingame to complement the FPS counter
2022-01-27 22:20:38 -05:00
Eric Myllyoja
71ca1f8d3a
Added zIndex via macro.
2022-01-26 14:19:57 -05:00
Eric Myllyoja
eda3a2b809
Added translation via FireTongue. Fixed symbols in AtlasText.
2022-01-26 00:41:14 -05:00
Eric Myllyoja
9d5841a7bb
Merge remote-tracking branch 'origin/master' into feature/polymod
2022-01-26 00:38:59 -05:00
Cameron Taylor
6fd71599eb
dumbass sound shit that dont work lol
2022-01-25 23:11:43 -05:00
Cameron Taylor
a0271a3e92
null check if difficulties dont exist
2022-01-25 21:14:31 -05:00
Cameron Taylor
21726ee56a
super quick and cute comments hehe
2022-01-25 20:34:21 -05:00
Cameron Taylor
5e55a397fe
crackhead save/loading chart shit
2022-01-25 20:30:29 -05:00
Cameron Taylor
4f1a413430
JSON load fixins
2022-01-25 13:30:08 -05:00
Eric Myllyoja
023ab8bded
Merge remote-tracking branch 'origin/master' into feature/polymod
2022-01-22 20:40:04 -05:00
Cameron Taylor
649fa99999
autosave fix
2022-01-22 17:06:40 -05:00
Cameron Taylor
2b51038be1
alt note fuk
2022-01-22 16:58:59 -05:00
Cameron Taylor
6fec9e2c7e
note format stuff in progress - noteData
2022-01-22 16:57:49 -05:00
Cameron Taylor
df53254945
note data shit in progress - strumTime
2022-01-22 16:53:38 -05:00
Cameron Taylor
2a2d6fdf41
changing note array stuff for songload
2022-01-21 17:23:12 -05:00
Cameron Taylor
10da0ea80f
lol holy fuk why was that shit so long and gross
2022-01-20 23:36:57 -05:00
Cameron Taylor
7fec1f1805
charting editor controls polish
2022-01-20 23:33:51 -05:00
Cameron Taylor
8df7eb4044
charting editor init fix
2022-01-20 22:55:19 -05:00
Cameron Taylor
7e1ea55ca9
darnell spray paint and also 300fps lol
2022-01-20 22:15:32 -05:00
Eric Myllyoja
bfad5b3352
Properly implemented Polymod for mod loading.
2022-01-20 17:47:42 -05:00
Cameron Taylor
56d59774e3
charting editor / notespeed stuff and senpai voice
2021-12-30 00:09:16 -05:00
Cameron Taylor
df4788dcf4
PureColor shader
2021-12-07 22:34:01 -05:00
Cameron Taylor
c58ee24579
difficulty selector stuff
2021-12-07 19:29:26 -05:00
Cameron Taylor
d51fffd6d1
difficulty stuff lol!
2021-12-07 17:41:18 -05:00
Cameron Taylor
c5196e715c
number tweak lol
2021-12-06 22:39:03 -05:00
Cameron Taylor
1e70829799
funny note tween on restart!
2021-12-06 22:35:14 -05:00
Cameron Taylor
652a2c0ead
funny optimize
2021-12-06 21:36:44 -05:00
Cameron Taylor
ef0db547b7
mid song difficulty selector fix
2021-12-06 21:33:55 -05:00
Cameron Taylor
bbc22483f1
easy / hard fixed i think for freeplay
2021-12-06 20:35:15 -05:00
Cameron Taylor
f4a02cb5f1
FUCKED CHART STUFF RIGHT NOW BUT COMPILES / RUNS
2021-12-06 17:49:05 -05:00
Cameron Taylor
77f45962d8
lil lerp tweak
2021-12-06 15:28:14 -05:00
Cameron Taylor
aee759d05b
rip my hair out wit these numbers dawg
2021-12-06 01:45:45 -05:00
Cameron Taylor
3c1ed09994
freeplay menu teehee
2021-12-06 00:50:50 -05:00
Cameron Taylor
5c14a5e5e3
cool funny light
2021-12-06 00:41:10 -05:00
Cameron Taylor
0b1bac9db4
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret
2021-12-06 00:13:14 -05:00
Cameron Taylor
87727942b1
scrolling text framerate type beat
2021-12-06 00:13:11 -05:00
MtH
c143bbae23
make sustain release less tight
2021-12-06 00:51:31 +01:00
Cameron Taylor
06da64ac20
some timing polish
2021-12-04 22:52:21 -05:00
Cameron Taylor
80892bd3a2
removed shitty freeplay bold art
2021-12-04 22:40:15 -05:00
Cameron Taylor
181e950216
stroke shader replacement freeplay text
2021-12-04 22:38:33 -05:00
Cameron Taylor
8795514361
freeplay as a substate instead
2021-12-04 20:24:53 -05:00
Cameron Taylor
e4aed63740
potential polish?
2021-12-04 09:54:21 -05:00
Cameron Taylor
4d11007f66
freeplay text prototype
2021-12-04 01:34:58 -05:00
Cameron Taylor
2b144fa0ab
more freeplay polish shit
2021-12-04 01:19:25 -05:00
Cameron Taylor
83ddb13f71
freeplay menu shit in progres animation
2021-12-04 00:38:45 -05:00
Cameron Taylor
7e1dfd67d3
accomodate for map stuff IN PROGREESSSS
2021-12-03 07:29:47 -05:00
Cameron Taylor
5d37413c35
map bullshit in progress songconverter
2021-11-30 13:22:42 -05:00
Cameron Taylor
34dc1826ef
MAIN BIG FORMAT??
2021-11-29 22:12:18 -05:00
Cameron Taylor
06c1b79761
rename Song.hx class to SongLoad, and removed unneeded shit
2021-11-29 21:43:38 -05:00
Cameron Taylor
47703418bf
IN PROGRESS AND WORKING WITH NEW CHART STUFF
2021-11-29 15:26:45 -05:00
Cameron Taylor
8df91344f2
chart formatter/converter interp path fix
2021-11-29 13:13:48 -05:00
Cameron Taylor
2d3fb5c29a
small shit dont worry bout it
2021-11-28 20:26:47 -05:00
Cameron Taylor
a24f6c533a
playstate cleanup in progress, create() cleanup lil
2021-11-23 15:00:10 -05:00
Cameron Taylor
7c3916cdaf
small fix for song instrumental
2021-11-02 10:28:26 -04:00
Cameron Taylor
c0660bd0c2
cool shit
2021-10-21 23:08:48 -04:00
Cameron Taylor
b54c459539
more freeplay stuff in progress
2021-10-21 17:40:53 -04:00
Cameron Taylor
2dd270f83e
freeplay stuff in progress teehee
2021-10-21 15:05:32 -04:00
Cameron Taylor
ec959f5d83
freq balancing, and also sum math shit lol!
2021-10-08 20:44:32 -04:00
Cameron Taylor
33ed47bbf5
made fft stuff less copypastiues
2021-10-07 21:06:45 -04:00
Cameron Taylor
09bb68f7ad
a bot FFT stuf fin progress MESSY LOL
2021-10-07 21:01:46 -04:00
Cameron Taylor
478818a4c1
almost sorta properly exponent bullshit for frequencies
2021-10-06 19:27:45 -04:00
Cameron Taylor
3a3d68424d
sorta seperated out some vis / audio data stuff
2021-10-06 18:46:14 -04:00
Cameron Taylor
02973078df
wacky zany shit idk lol!
2021-09-28 18:12:32 -04:00
Cameron Taylor
e8a3b901c2
FFT IN PROGRESS LOL
2021-09-27 22:30:38 -04:00
Cameron Taylor
c5bca599ad
song reset redo to make shit reload faster
2021-09-24 11:51:15 -04:00
Cameron Taylor
707c7b6f0a
lil healthbar polsih hehe
2021-09-24 11:21:34 -04:00
Cameron Taylor
f060e6689c
removed unused gameoverstate
2021-09-24 11:09:49 -04:00
Cameron Taylor
65bbee0e36
easy quick reset stuff in progres
2021-09-24 10:56:05 -04:00
Cameron Taylor
dc74a434c0
lil HTML5 multivoice fixins
2021-09-22 21:09:28 -04:00
Cameron Taylor
43f43f6f6f
evil mf shit
2021-09-22 16:04:34 -04:00
Cameron Taylor
91f1c816b9
TWEAKIN, and pico game over music
2021-09-22 15:33:30 -04:00
Cameron Taylor
52f9155ef9
2Hot in progress
2021-09-22 15:09:32 -04:00
Cameron Taylor
db561adbc7
lit up charted, and lil cleanups
2021-09-21 15:39:30 -04:00
Cameron Taylor
4fb8342103
head muting lol!
2021-09-20 22:08:24 -04:00
Cameron Taylor
dc050f2040
chart editor imporvements and whatnot
2021-09-20 13:21:25 -04:00
Cameron Taylor
ac2d0d2a38
more voice group stuff in progress
2021-09-20 11:50:52 -04:00
Cameron Taylor
466181bbbd
sound grouping in progress
2021-09-20 11:32:35 -04:00
Cameron Taylor
b8cc6d5df6
less noisy spectogram
2021-09-17 14:56:57 -04:00
Cameron Taylor
38e8b80ed9
charting section visulizer stuff
2021-09-17 14:12:36 -04:00
Cameron Taylor
2eedd1a20f
more cool spectogram shit
2021-09-16 15:28:29 -04:00
Cameron Taylor
4212e59937
slightly diff spectogram / optimize
2021-09-16 14:50:02 -04:00
Cameron Taylor
a2eeaf5c3c
more bro charting in progres
2021-09-16 14:21:11 -04:00
Cameron Taylor
d00f2268f9
spectogram visulizer in progress
2021-09-16 12:04:46 -04:00
Cameron Taylor
39404d35c7
more charting editor noises
2021-09-16 00:56:49 -04:00
Cameron Taylor
cfc3febccf
charting UI sounds in progress
2021-09-16 00:34:51 -04:00
Cameron Taylor
39dac70c01
chart push / bro song update
2021-09-15 15:33:05 -04:00
Cameron Taylor
d2f638302e
nene before u get a whoopin
2021-09-14 17:12:11 -04:00
Cameron Taylor
60e0076642
moved shader camera stuff to CoolUtil, for use later?
2021-09-14 16:40:20 -04:00
Cameron Taylor
f3bf578d4e
screen wipe shader stuff testing
2021-09-11 14:08:34 -04:00
Cameron Taylor
d13aa24fc8
even more cleanup
2021-09-11 11:55:31 -04:00
Cameron Taylor
b1a4bc29de
FlxSymbol cleanup, and other shit in PROGRESS
2021-09-11 11:54:38 -04:00
Cameron Taylor
7ed4405ec3
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-09-11 09:38:28 -04:00
Cameron Taylor
a6a4ed2c44
new wacky matrix stuff lil messy teehee
2021-09-11 09:37:04 -04:00
George FunBook
696835c90b
polymod compiler checks instead of cpp
2021-09-11 00:33:50 -05:00
George FunBook
20c32acda1
remove import
2021-09-11 00:32:44 -05:00
Cameron Taylor
2bd4a91e7e
odds and ends
2021-09-10 10:07:55 -04:00
Cameron Taylor
3c03e06a39
shader tweeak
2021-09-08 20:09:30 -04:00
Cameron Taylor
713a3dd623
SHADER SHIT FOR EVIL SCHOOL LOL!
2021-09-08 20:01:55 -04:00
Cameron Taylor
144a526f1c
lol stream stuff lol
2021-09-08 18:10:06 -04:00
Cameron Taylor
8e8b121663
Merge pull request #6 from ninjamuffin99/nitpix
...
aight yolo merge
2021-09-08 17:21:55 -04:00
MtH
908372d296
lil oopsies and random cleanup of old shit
2021-09-08 22:28:30 +02:00
MtH
187706c71c
note hit, scoring windows & stricter sustain note holding
...
this is some big impact shit so feel it out first
2021-09-08 19:28:11 +02:00
Cameron Taylor
c1f000644e
pico player offset stuff
2021-09-08 12:40:51 -04:00
Cameron Taylor
40233679c7
DARNELL MOSTLY CHARTED
2021-09-08 11:53:20 -04:00
MtH
63341f0bc9
fix imports for stagebuild in init/title, also GPG test like cam?
2021-09-08 17:16:16 +02:00
Cameron Taylor
b470fee1b0
GPG test / lil cleanup
2021-09-08 00:06:49 -04:00
MtH
ba4793cef4
allow shared lib to be used without needing to have a level selected
2021-09-07 23:10:43 +02:00
MtH
d0800fcd39
titlestate spring cleaning, move shit into new initstate
...
this is a huge ass commit so cam pls dont merge until u thoroughly check it and know what changed and moved and whatever. got rid of a lot of ludum dare era commented out shit as well. feel free to ask for clarification or add shit back if it's better suited here
2021-09-07 23:09:34 +02:00
MtH
1033754ad3
notesplash framerate & use finishCallback instead of checking every frame
2021-09-07 22:14:14 +02:00
Cameron Taylor
624cc4b3fa
matrix group recycle fix
2021-09-06 15:44:11 -04:00
Cameron Taylor
f94f1d1d98
FlxAnimate drawing optimizations
2021-09-06 15:30:19 -04:00
Cameron Taylor
a5ed25fc31
darnell and other stuf in progress lol
2021-09-06 14:50:04 -04:00
Cameron Taylor
1480335bcb
lil code comments for FlxAnimate and ParseAnimate
2021-09-02 19:00:01 -04:00
Cameron Taylor
49a5c30b90
chart editor save improvements
2021-09-02 18:51:08 -04:00
Cameron Taylor
237114c877
darnell in progress
2021-09-02 18:39:40 -04:00
Cameron Taylor
2705ae3e16
darnell looping and sustain note holding anim stuf
2021-09-02 17:32:50 -04:00
Cameron Taylor
ab501cc533
no icon warning
2021-09-02 17:07:32 -04:00
Cameron Taylor
380241bc6a
darnell character
2021-09-02 16:56:46 -04:00
Cameron Taylor
d108f7c39d
seperated / cleaned up?
2021-09-01 23:39:37 -04:00
Cameron Taylor
fdd28336c1
LIP SYNC
2021-09-01 20:37:37 -04:00
Cameron Taylor
84c2185027
slowly fixing it up
2021-09-01 20:04:07 -04:00
Cameron Taylor
720b428bcf
animate atlas overhaul stuff
2021-09-01 15:34:20 -04:00
Cameron Taylor
fad3af327f
no more body thingie
2021-08-29 15:56:46 -04:00
Cameron Taylor
9694defa8d
volume save data finally fixed lol
2021-08-28 18:10:32 -04:00
Cameron Taylor
9a801b43ad
removed unused imports in playstate
2021-08-28 13:22:31 -04:00
Cameron Taylor
de052ddbee
evilschool "ported"
2021-08-28 13:01:17 -04:00
Cameron Taylor
2747de79cb
anim shit for stages
2021-08-28 12:41:15 -04:00
Cameron Taylor
7ef82bd1d3
stage stuff in progress, seeing whats needed
2021-08-27 21:56:23 -04:00
Cameron Taylor
a032109efd
stage loading rework
2021-08-27 18:08:01 -04:00
Cameron Taylor
d1871761d9
blend lol
2021-08-27 13:55:18 -04:00
Cameron Taylor
5baae3ad58
overlay wit sunset background
2021-08-27 13:16:31 -04:00
Cameron Taylor
f6729592bf
multiply shader in progres
2021-08-27 02:42:23 -04:00
Cameron Taylor
0308de6110
haxedef for android
2021-08-25 20:11:31 -04:00
Cameron Taylor
c21961c156
swipe length default stuff
2021-08-25 20:03:58 -04:00
Cameron Taylor
5579d92f21
fix swipe on left side of screen thingie
2021-08-25 13:21:55 -04:00
Cameron Taylor
84a2b980a5
multi touch / swipe (very buggy)
2021-08-25 13:18:45 -04:00
Cameron Taylor
27da6fdba9
swipe cleanup
2021-08-25 12:18:12 -04:00
Cameron Taylor
e20814cefa
swipe prototype stuf pt 2 lol
2021-08-24 15:28:04 -04:00
Cameron Taylor
a50eeee259
swiping prototype stuff
2021-08-24 15:27:53 -04:00
Cameron Taylor
d77a983ff2
FlxActions/Controls.hx stuf for Android keys
2021-08-23 18:52:38 -04:00
Cameron Taylor
f40b3a8fe3
FlxAction/Controls.hx accomodations for Android keys
2021-08-23 18:52:07 -04:00
Cameron Taylor
4d97591e30
android pause and controls tweaks
2021-08-22 16:54:22 -04:00
Cameron Taylor
61ba71d3db
touch controls in progres
2021-08-22 10:37:06 -04:00
Cameron Taylor
1992d5363e
camera zoom fixes for mobile
2021-08-21 20:45:03 -04:00
Cameron Taylor
d25b81e1dc
touch in progres
2021-08-21 19:53:08 -04:00
Cameron Taylor
d4e955ce79
slowly chippin away
2021-08-21 13:19:56 -04:00
Cameron Taylor
0a0a1c4e2f
more timeline shit in progress
2021-08-20 11:01:37 -04:00
Cameron Taylor
b48685519a
timeline viewer in progress
2021-08-19 14:53:18 -04:00
Cameron Taylor
8b172ac99d
moving shader stuff in progress
2021-08-18 23:00:39 -04:00
Cameron Taylor
21e05b72c6
outline shader thing in progress
2021-08-16 23:20:00 -06:00
Cameron Taylor
0e15495796
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-08-10 02:40:50 -04:00
Cameron Taylor
3c211b4756
shit in progress that i dont know, lol dont worry bout it
2021-08-10 02:40:47 -04:00
MtH
3c538395fa
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret
2021-08-09 13:32:43 +02:00
MtH
ec139ce562
moving default RESET button on gamepad to right shoulder instead of Y bc Y is also UP
2021-08-09 13:30:55 +02:00
Cameron Taylor
3fe28602d3
chart shit cooler (hashlink saving workaround)
2021-08-02 14:11:43 -04:00
Cameron Taylor
122545405b
chart editor slight fixins in progress
2021-08-02 13:54:19 -04:00
MtH
00ec466c76
sustain note scaling FIXED (imo)
...
clipping is still wack. also i made it round instead of floor for the number of sus notes to place because that also just makes sense imo
thanks to @cuckydev again for good ideas
2021-08-02 03:40:40 +02:00
MtH
c9f31226e6
fix HealthIcon issues (expand for details)
...
explicitly enable antialiasing (for switching to & from bf-old)
consistently apply scaling (for ChartingState)
2021-07-16 04:30:19 +02:00
Cameron Taylor
471ffd7989
min timing shit in progres
2021-07-15 18:45:25 -04:00
Cameron Taylor
f314fe3a4b
wombo combo
2021-07-15 18:22:15 -04:00
Cameron Taylor
98a77811be
new combo stuf
2021-07-14 20:32:09 -04:00
Cameron Taylor
9cb1c6b0ea
combo stuf in progress, lil cleanups
2021-07-14 19:00:22 -04:00
Cameron Taylor
85bff686a4
WACKY HTML FILE LOADING TESTS??
2021-06-24 03:15:14 -04:00
Cameron Taylor
fcc7a91597
flxg import.hx thing lol
2021-06-23 04:15:44 -04:00
Cameron Taylor
39d93616d2
comment support for CoolUtil.cooltextFile()
2021-06-22 21:15:40 -04:00
Cameron Taylor
6add378535
pure pixel icon support done
2021-06-22 21:11:06 -04:00
Cameron Taylor
f4c3d826f2
lil antialiasing bullshit
2021-06-22 20:32:37 -04:00
Cameron Taylor
11b35adecd
pixel icon code in progress
2021-06-22 20:21:54 -04:00
Cameron Taylor
94d805136c
pixel icon shit in progress
2021-06-22 20:18:22 -04:00
Cameron Taylor
e2fbf5a300
Revert "in-engine shit for new chart format"
...
This reverts commit 4b5173f9b7
.
2021-06-22 16:06:40 -04:00
Cameron Taylor
4b5173f9b7
in-engine shit for new chart format
2021-06-22 15:54:53 -04:00
Cameron Taylor
e49a3c9b03
songFormmatting shit in progress
2021-06-22 15:41:15 -04:00
Cameron Taylor
819d6d570d
fix layering jitter
2021-06-18 14:18:56 -04:00
Cameron Taylor
1927be79f8
animation fixing for FlxSymbol in progress
2021-06-17 01:42:31 -04:00
Cameron Taylor
4137687f26
proper layering
2021-06-15 21:15:06 -04:00
Cameron Taylor
e120578642
ANIMATION SHIT MORE IN PROGRESS LOL
2021-06-15 17:43:46 -04:00
Cameron Taylor
6b595165be
lil files cleanup
2021-06-14 19:36:56 -04:00
Cameron Taylor
7ebc7e4ffb
quick title screen optimize
2021-06-08 23:05:38 -04:00
Cameron Taylor
2db47b1ba9
memory optimizations
2021-06-07 21:14:50 -04:00
Cameron Taylor
2323000381
nice lil control shti
2021-06-05 00:58:10 -04:00
Cameron Taylor
7e213cb5cb
different offset view shit
2021-06-05 00:46:03 -04:00
Cameron Taylor
44ba266b88
offset view thingie
2021-06-05 00:24:55 -04:00
Cameron Taylor
8aa50b9d47
remvoed animationdebug shit
2021-06-05 00:01:15 -04:00
Cameron Taylor
820ee969d0
AnimationDebug removed, replaced by DebugBoundingState
2021-06-05 00:00:30 -04:00
Cameron Taylor
4211bc7344
mouse movement for offset shit
2021-06-04 17:39:28 -04:00
Cameron Taylor
699a89198e
onion skinning when pressing F
2021-06-04 16:45:08 -04:00
Cameron Taylor
1301cf3ab6
WASD controls for animation
2021-06-04 12:53:53 -04:00
Cameron Taylor
2a2fd39d1c
new offset shit in progress
2021-06-04 03:06:15 -04:00
Cameron Taylor
78e205d60f
offset moving shit
2021-06-04 02:57:43 -04:00
Cameron Taylor
accbae3c80
anim swapping easier
2021-06-04 02:43:05 -04:00
Cameron Taylor
52b0f17ac7
animation playing dropdown menu
2021-06-04 02:31:27 -04:00
Cameron Taylor
ae37e98cdf
anim debug bullshit
2021-06-04 02:01:34 -04:00
Cameron Taylor
1fa00fab9b
lil keyboard control shit
2021-06-02 21:12:23 -04:00
Cameron Taylor
58cede8706
undo of movements
2021-06-02 21:04:43 -04:00
Cameron Taylor
1f91c3bdef
undo/redo selections
2021-06-02 20:41:06 -04:00
Cameron Taylor
65d187f511
cursor shit and tool shit i duno lol!
2021-06-01 02:39:30 -04:00
Cameron Taylor
6c47686ee8
the friday night funkin creepypasta
2021-05-27 22:45:23 -04:00
Cameron Taylor
bab7c0130d
drag n drop layer type beat
2021-05-27 19:56:56 -04:00
Cameron Taylor
3f53371f30
dragging shit
2021-05-27 19:15:03 -04:00
Cameron Taylor
be4b35938b
debug anim shit in progress
2021-05-26 19:22:15 -04:00
Cameron Taylor
a2360dde70
stage build drag and drop, and removed FAXE bullshiiiit
2021-05-23 23:20:57 -04:00
Cameron Taylor
20f627b98e
Merge branches 'master' and 'master' of https://github.com/ninjamuffin99/funkin-secret
2021-05-22 12:54:33 -04:00
Cameron Taylor
30a6db615b
middle click drag
2021-05-16 19:17:58 -04:00
MtH
123a7ae59b
boopin boppers.. head lerp
2021-05-15 23:39:13 +02:00
MtH
d49858217e
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-05-15 23:28:17 +02:00
Cameron Taylor
bd6936734a
polymooooood shoutouts laaarsssss
2021-05-15 12:00:21 -04:00
Cameron Taylor
dd41cc19e1
polymod IN PROGRESS
2021-05-15 10:30:09 -04:00
Cameron Taylor
47102b2431
cache shit idk lol
2021-05-14 18:21:34 -04:00
MtH
63cdbc84ee
easteregg crash fix
2021-05-15 00:02:29 +02:00
Cameron Taylor
72e6a47716
NG logo easter egg shit
2021-05-14 17:53:34 -04:00
Cameron Taylor
9df52f2982
Merge branch 'master' of https://github.com/ninjamuffin99/funkin
2021-05-14 17:33:00 -04:00
Cameron Taylor
592204bfa7
Merge branch 'swf'
2021-05-14 17:21:50 -04:00
Cameron Taylor
6f0b0fc6bb
cheat code bullshit oops im on swf branch LOL!
2021-05-14 17:20:01 -04:00
PurpleButNotALight
3d78fa2e7e
Delete BeatBattle.hx
...
this file was annoying me
2021-05-08 17:15:29 +02:00
MtH
5891bb7f16
custom camera for lerp fix
2021-05-06 14:08:51 +02:00
MtH
ba19234176
improve rating & combo visibility
2021-05-06 12:55:33 +02:00
MtH
2bce5151ba
test in freeplay if debug
2021-05-06 12:54:57 +02:00
MtH
a1b927175a
just pushin b4 i switch branch
2021-04-23 19:15:40 +02:00
MtH
356a9ad337
dope sprite bounds
2021-04-23 13:30:39 +02:00
MtH
41e66b5d69
Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret
2021-04-22 22:02:02 +02:00
MtH
c5d33192a4
fix crash when going back to title
2021-04-22 21:36:56 +02:00
MtH
fea40412ec
swf shit
2021-04-22 17:19:55 +02:00
MtH
5ee0ef8f4e
big cleanup
2021-04-22 04:17:00 +02:00
MtH
d882d6568d
move song end into debug block
2021-04-21 22:58:36 +02:00
MtH
adb41ce289
wocky slush
...
debug shit, gf in animdebug, changesection
2021-04-21 15:07:36 +02:00
MtH
b88ad022f2
fix susnotes after note miss changes oops
2021-04-20 22:25:38 +02:00
MtH
7c2cc40d7b
smol move
2021-04-20 21:50:26 +02:00
MtH
1431b19e57
combo counter fixes & tweaks
2021-04-20 21:48:16 +02:00
MtH
788c4e6f1b
combo counter fixes & tweaks
2021-04-20 20:38:07 +02:00
MtH
5aefe519e0
note miss stuff, clean up 'stunned' remnants
2021-04-20 17:55:42 +02:00
MtH
e6f115dbfe
cam lerp on gameover
2021-04-19 19:11:30 +02:00
MtH
5dddfd7160
bf old icon switch switches back to proper player1
2021-04-19 18:19:40 +02:00
MtH
e005ac382c
don't play game over music if already ending
2021-04-19 10:43:21 +02:00
MtH
ece27cd23a
load songs from reload json button
2021-04-19 10:35:39 +02:00
Cameron Taylor
fe4c61124e
they hate to see a girlboss winning
2021-04-19 02:46:02 -04:00
Cameron Taylor
56cbb276fa
touchups and shit
2021-04-18 17:28:10 -04:00
Cameron Taylor
c60bd8b12f
optimiiiizeeee
2021-04-18 16:54:21 -04:00
Cameron Taylor
157769b41a
that pussy be yankin
2021-04-18 13:23:09 -04:00
Cameron Taylor
08971e185d
wtf cutscene shit
2021-04-18 06:53:23 -04:00
Cameron Taylor
5bc6bebb67
Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret
2021-04-18 05:26:52 -04:00
Cameron Taylor
6f840a9b40
MOVING ANIMATIONS LOL
2021-04-18 05:25:44 -04:00
Cameron Taylor
75fa0dcada
number thing
2021-04-18 04:29:01 -04:00
Cameron Taylor
7c120efc66
loading screen interactivity
2021-04-18 04:28:50 -04:00
Cameron Taylor
e1a6325e02
cutscene shit in progress
2021-04-18 04:09:56 -04:00
Cameron Taylor
ac8a8aef42
seen video save data shit
2021-04-18 03:47:48 -04:00
Cameron Taylor
b501d620b8
tank rolling lol XD
2021-04-18 03:35:43 -04:00
Cameron Taylor
2f63837430
pico stage shader
2021-04-18 01:43:28 -04:00
Cameron Taylor
8f2b147d58
in-game animation cutscene type beat
2021-04-17 23:19:33 -04:00
Cameron Taylor
8db0a2cced
SKEW SHIT I THINK
2021-04-15 23:13:52 -04:00
Cameron Taylor
3b4129921c
guns and animation shit in progress
2021-04-15 11:57:59 -04:00
MtH
f7bb96c49c
menu back sounds on all menus
2021-04-15 16:19:02 +02:00
MtH
366b6242c0
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-04-15 15:29:08 +02:00
MtH
76dbe40e11
sus cliprect frameWidth / Height
2021-04-15 04:24:32 +02:00
MtH
86e1aed2fa
week6 cam center and move senpaiEvil
2021-04-15 03:56:42 +02:00
Cameron Taylor
75c1cbdbd3
animation playback wip
2021-04-14 21:52:43 -04:00
MtH
5cc9f5532b
eggnog > winter-horrorland transiton FIX
2021-04-15 02:18:59 +02:00
Cameron Taylor
8524f244c7
animation rotations
2021-04-14 11:31:52 -04:00
MtH
b2cff72608
Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix
2021-04-14 04:06:08 +02:00
MtH
84be474f15
framerate adjusted lerps for all menu shit that isnt cameras
2021-04-14 04:02:21 +02:00
Cameron Taylor
605c9066c1
Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret
2021-04-11 19:08:46 -04:00
Cameron Taylor
c61529d40f
sprite animation shit idk lol who cares loL!
2021-04-11 19:08:36 -04:00
MtH
b4274343c5
double gf on tutorial fix and inCutscene for week7
2021-04-12 00:53:37 +02:00
MtH
e4f21d9ba7
bf gf dead offsets
...
also lets you enter anim debug from game over screen, and with player1 if holding shift
2021-04-11 18:41:23 +02:00
Cameron Taylor
672e3d6970
ugh and stress animations
2021-04-10 18:23:56 -04:00
Cameron Taylor
8b1fa3fb31
colors wip
2021-04-10 11:21:04 -04:00
Cameron Taylor
0ed4f87bdb
weird polish bullshit
2021-04-10 02:53:23 -04:00
Cameron Taylor
3df90b6777
recycling and groups i guess
2021-04-10 01:49:57 -04:00
Cameron Taylor
26f690a264
quieter trailer and GF doin shit
2021-04-09 22:49:25 -04:00
Cameron Taylor
3f1552be6e
tankman shit maybe
2021-04-09 20:34:25 -04:00
Cameron Taylor
0e373a0d42
video, and load screenshit
2021-04-09 19:17:14 -04:00
Cameron Taylor
1f45a072c0
cutscenes, menu, story shit
2021-04-09 16:37:54 -04:00
Cameron Taylor
d9612ebb2b
Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret
2021-04-09 15:48:16 -04:00
Cameron Taylor
7fa9700664
jeff gameover censor
2021-04-09 11:38:09 -04:00
Cameron Taylor
80c6609ef9
load screen and censors
2021-04-09 03:03:27 -04:00