Commit Graph
51 Commits
Author SHA1 Message Date
⍚~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
⍚~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 217dc34bc3 Smol optimization 2025-01-10 19:10:21 +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
⍚~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
⍚~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
⍚~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 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 f3bb4e2f50 Fixed macro issue 2024-04-12 02:36:46 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +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
⍚~Nex c4dc5b71d1 dialogues stuff & porting WIP 3
couldn't do too much for tonight
2024-02-18 03:51:38 +01:00
⍚~Nex 6917828cf9 dialogues stuff & porting WIP 2
kinda rushed today sorryyy
2024-02-17 19:08:18 +01:00
⍚~Nex 778de6bbc6 dialogues rewrites & more week 6 porting WIP 2024-02-17 04:03:11 +01:00
6e23da8e86 Add more stuff from the OG game and more PART 1 (#228)
* senpai fucking dies

* final flash fadeout

* made cutscene not play on restart

* winter horrorland + fixes

* fix for pixel perfect shader

* trail + fixes

* better + shaking

last update about it, i swear

* never fucking mind + repacks + accuracy

* more fixes + chromatic aberration

* i hate how pixel shader fucks everything up

* aberration in the cutscene & its cool twitch

* camera beats when twitching

* tank stuff pt1

now the cutscenes look 99% like og (still gotta freeze the stage animated sprites n stuff)
PS: Deleting the lipSycn function in ugh and guns cutscenes cause its not needed + sometimes breaks the animations so lets just leave it in stress only like it was in og

* week 5 completed + retrocompatibility with altanim

now chrima parents work

* philly train

* gameplay shaders option

better adding it now

* tank stuff pt2

* blue balled text (death counter)

* winter horrorland better rework WIP

colored vignette usable by everyone (you can change its color, amount and strength)
wip cuz i wanna edit the amount/strength based on the zoom, i'll do later, now i dont have time gotta do christmas irl stuff yay

* winter horrorland better rework completed

* seen cutscene variable

finally

* even better cutscenes

* oops

* tank stuff pt3

* tank stuff pt4

WIP running tanks

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>

* tankstuff pt4.5

imma check tmr why do some tankmen spawn too much up

* tank stuff pt4.75

* dumb

* tank stuff pt 4.9

* type on xml sprite type fix and more

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>

---------

Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com>
Co-authored-by: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
2024-02-04 00:54:00 -07:00
f91ee82b73 Use haxelib release of hxvlc. (#231)
* Update libs.xml

* Update VideoCutscene.hx

* Fixed bug with videos

---------

Co-authored-by: NeeEoo <NeeEoo@users.noreply.github.com>
2024-01-01 19:44:51 +01:00
MAZ12211andGitHub db153070fd Fix startDialogue for scripted cutscenes (#209) 2023-10-13 17:55:01 +02:00
Mihai AlexandruandGitHub 96216d4258 Implement hxvlc. (#207)
* Implement hxvlc.

* Better define for `VIDEO_CUTSCENES`.

* Update linux.yml

* Removed the libraries that aren't required

* Ok?
2023-09-23 10:38:10 +02:00
NeeEoo 039353befc Small fixes 2023-07-06 11:59:33 +02:00
Mihai AlexandruandGitHub 13c045da56 Reorder 2023-06-26 15:26:49 +03:00
Mihai AlexandruandGitHub ff2bbcaa90 Update VideoCutscene.hx 2023-06-26 07:38:21 +03:00
lunarcleint 32c8eab86e new hxCodec 2023-06-25 17:53:27 -07:00
Yoshman29 06828cade7 time to break your mods again for ease of use 2023-04-18 02:13:04 +02:00