Commit Graph
63 Commits
Author SHA1 Message Date
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02:00
⍚~Nex 86157be887 some cutscene stuff 2025-07-06 17:50:15 +02:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
⍚~Nex 137af7fdb6 lil dialogue fix
if u had another dialogue starting in the callback, in the new script Dialogue.cutscene would be always null
2025-05-12 02:23:44 +02:00
Ne_Eo 13033b2675 Merge remote-tracking branch 'upstream/main' 2025-04-10 02:24:58 +02:00
BetopiaandGitHub 42a650d5dd musicVolume is not speed.... wtf (#586)
fixes funkin.game.cutscenes.DialogueCutscene
if "musicVolume" was present in the current line, it would grab the value of "speed" instead of "musicVolume"
and if "speed" wasn't present, it would crash the game

lmao
2025-03-22 20:20:05 +01:00
Ne_Eo 1815c9d0c0 Merge branch 'main' into translations-system 2025-02-28 16:49:28 +01:00
⍚~Nex 5d5e426852 actually 2025-01-23 00:53:04 +01:00
⍚~Nex 97a3a30aa9 more cutscene fixes 2025-01-23 00:43:49 +01:00
⍚~Nex 4ae7e045b1 video cutscene fixes 2025-01-20 19:21:29 +01:00
Ne_Eo fd2d44dc80 Merge branch 'main' into translations-system 2025-01-17 15:32:42 +01:00
Ne_Eo 217dc34bc3 Smol optimization 2025-01-10 19:10:21 +01:00
Ne_Eo fe0542a32c Merge branch 'main' into translations-system 2025-01-09 20:26:29 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +01:00
Ne_Eo 85b50c7cce Bug Fixes + Cleanup 2024-11-30 00:44:52 +01:00
Ne_Eo 5f16024b3e Merge branch 'main' into translations-system 2024-11-15 18:13:04 +01:00
⍚~Nex 77b7eebed1 better events and funkinSave categorization 2024-11-15 17:52:19 +01:00
Ne_Eo 1713e8700d Import Redirects + fix videos not able to be longer than 25 days 2024-11-15 15:26:12 +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 f0eea9eb8e Merge remote-tracking branch 'upstream/main' 2024-11-15 11:48:50 +01:00
b1b1663f5c Event based dialogue handling (#443)
* Event based dialogue handling

* better imo

* typo

* Small script example

new script by NexIsDumb

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-11-14 01:29:12 +01:00
Ne_Eo 82178e37a4 Merge branch 'main' into translations-system 2024-11-03 22:46:36 +01:00
⍚~Nex 4a1bc2c147 Merge branch 'main' into base-fnf-port-remake 2024-11-03 21:39:23 +01:00
Ne_Eo fd8b38930c Merge remote-tracking branch 'upstream/main' 2024-11-03 20:01:10 +01:00
Jikkenthe10thandGitHub cb54e5e1c5 Fix dialogueLine next sound not getting from assets/sounds (#418) 2024-10-30 19:55:42 +01:00
⍚~Nex d31454c7dd substate auto custom transitions!! 2024-10-21 17:57:47 +02:00
Ne_Eo 2570d68f68 Optimizations 2024-10-14 14:41:39 +02:00
Ne_Eo 8ce4c8ab25 Merge branch 'main' into translations-system 2024-09-22 15:21:17 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
Ne_Eo 6985590a5d Merge remote-tracking branch 'upstream/main' 2024-09-10 00:05:18 +02:00
⍚~Nex ae5fc555a8 "forced" anim attribute finally working
big changes here maybe
2024-09-08 16:30:27 +02:00
⍚~Nex 8e81d17fb0 continuinggg (very cool improvements)
asynced video loadings, classes rewrites, bugfixes and a lot more
2024-08-31 04:37:00 +02:00
⍚~NexandNe_Eo 562f1d8fc6 constants macros: reset(), init() and @:lazy
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-08-31 03:08:13 +02:00
⍚~Nex 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
Ne_Eo 2feb34d4ac Merge branch 'main' into translations-system 2024-08-25 02:34:46 +02:00
Ne_Eo 1a57f09fd8 Merge remote-tracking branch 'upstream/main' 2024-08-20 21:50:42 +02:00
TheZoroForce240andGitHub c294c70817 fix video cutscenes (#372) 2024-08-20 21:50:12 +02:00
NeeEoo 2164131271 Merge branch 'main' into translations-system 2024-04-12 12:18:51 +02:00
NeeEoo f3bb4e2f50 Fixed macro issue 2024-04-12 02:36:46 +02:00
NeeEoo 070db1c2bd Merge branch 'main' into translations-system 2024-04-11 14:30:58 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo d955e00ece Cleaned up Warning And Error Code 2024-04-10 16:37:19 +02:00
NeeEoo f8b20774e3 Remove useless indentation 2024-03-16 21:15:18 +01:00
⍚~NexandNe_Eo 9ca7f01866 finalizing the dialogue system 11
more stuff and text formats!

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-02-27 01:50:21 +01:00
⍚~Nex abb953647e FINISHED PORTING 10 gotta still finalize dialogues
98% completed dialogue system!
BUT ALL THE PORTING COMPLEDD
2024-02-26 00:34:25 +01:00
⍚~Nex 038116f005 dialogues stuff & porting WIP 8 2024-02-25 04:37:06 +01:00
⍚~Nex 7cc4148742 dialogues stuff & porting WIP 7 2024-02-24 01:56:04 +01:00
⍚~Nex 631814495a dialogues stuff & porting WIP 6
I WILL reduce those events and make some code parts better
oh and also gotta still add the actual dialogue cutscene class' scripts
2024-02-22 02:03:26 +01:00
⍚~Nex 541e371b7e dialogues stuff & porting WIP 4 2024-02-19 02:34:58 +01:00