Skip to content

Commit 51709e8

Browse files
crowplexuscrowplexus
authored
Merge branch 'ShadowMario:main' into patch-3
2 parents 42b08a6 + ed1899b commit 51709e8

File tree

83 files changed

+1711
-1257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1711
-1257
lines changed

‎Project.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110

111111
<!--Psych stuff needed-->
112112
<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
113-
<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.0.2"/>
114-
<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
115-
<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
113+
<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.1.0"/>
114+
<haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="1.9.2"/>
115+
<haxelib name="hxdiscord_rpc" version="1.2.4" if="DISCORD_ALLOWED"/>
116116
<haxelib name="flxanimate"/>
117117

118118
<!-- Disable Discord IO Thread -->
@@ -122,6 +122,8 @@
122122
<!-- Enables a terminal log prompt on debug builds -->
123123
<haxelib name="hxcpp-debug-server" if="debug"/>
124124
<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
125+
<haxedef name="HXVLC_NO_SHARE_DIRECTORY" if="VIDEOS_ALLOWED" />
126+
<define name="x86_BUILD" if="32bits" />
125127

126128
<!-- ______________________________ Haxedefines _____________________________ -->
127129

‎README.md

+17-11
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,25 @@ to start you off, disabling Videos should be simple, simply Delete the line `"VI
1616
same goes for *Lua Scripts*, comment out or delete the line with `LUA_ALLOWED`, this and other customization options are all available within the `Project.xml` file
1717

1818
## Credits:
19-
* Shadow Mario - Programmer
20-
* Riveren - Artist
19+
* Shadow Mario - Head Developer, Programmer.
20+
* Riveren - Main Artist.
2121

2222
### Special Thanks
23-
* bbpanzu - Ex-Programmer
24-
* SqirraRNG - Crash Handler and Base code for Chart Editor's Waveform
25-
* KadeDev - Fixed some cool stuff on Chart Editor and other PRs
26-
* iFlicky - Composer of Psync and Tea Time, also made the Dialogue Sounds
27-
* PolybiusProxy - .MP4 Video Loader Library (hxCodec)
28-
* Keoiki - Note Splash Animations
29-
* Smokey - Sprite Atlas Support
30-
* Nebula the Zorua - some Lua reworks
31-
* superpowers04 - LUA JIT Fork
23+
* bbpanzu - Ex-Team Member (Programmer).
24+
* crowplexus - HScript Iris, Input System v3, and Other PRs.
25+
* Kamizeta - Creator of Pessy, Psych Engine's mascot.
26+
* MaxNeton - Loading Screen Easter Egg Artist/Animator.
27+
* Keoiki - Note Splash Animations and Latin Alphabet.
28+
* SqirraRNG - Crash Handler and Base code for Chart Editor's Waveform.
29+
* EliteMasterEric - Runtime Shaders support and Other PRs.
30+
* MAJigsaw77 - .MP4 Video Loader Library (hxvlc).
31+
* Tahir Toprak Karabekiroglu - Note Splash Editor and Other PRs.
32+
* iFlicky - Composer of Psync, Tea Time and some sound effects.
33+
* KadeDev - Fixed some issues on Chart Editor and Other PRs.
34+
* superpowers04 - LUA JIT Fork.
35+
* CheemsAndFriends - Creator of FlxAnimate.
36+
* Ezhalt - Pessy's Easter Egg Jingle.
37+
* MaliciousBunny - Video for the Final Update.
3238
_____________________________________
3339

3440
# Features

‎art/flashFiles/FNF_main_menu_assets_pt-BR.fla

1.88 MB
Binary file not shown.

‎art/flashFiles/PsychGF.fla

25.8 MB
Binary file not shown.

‎art/flashFiles/PsychGF2.fla

-9.81 MB
Binary file not shown.

‎assets/secrets/images/PessyBump.png

1.47 MB
Loading

‎assets/secrets/images/PessyBump.xml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="PessyBump.png">
3+
<!-- Created with Adobe Animate version 23.0.2.103 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="Pessy Title Bump0000" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
6+
<SubTexture name="Pessy Title Bump0001" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
7+
<SubTexture name="Pessy Title Bump0002" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
8+
<SubTexture name="Pessy Title Bump0003" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
9+
<SubTexture name="Pessy Title Bump0004" x="2691" y="562" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
10+
<SubTexture name="Pessy Title Bump0005" x="2691" y="1120" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
11+
<SubTexture name="Pessy Title Bump0006" x="2154" y="1122" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
12+
<SubTexture name="Pessy Title Bump0007" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
13+
<SubTexture name="Pessy Title Bump0008" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
14+
<SubTexture name="Pessy Title Bump0009" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
15+
<SubTexture name="Pessy Title Bump0010" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
16+
<SubTexture name="Pessy Title Bump0011" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
17+
<SubTexture name="Pessy Title Bump0012" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
18+
<SubTexture name="Pessy Title Bump0013" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
19+
<SubTexture name="Pessy Title Bump0014" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
20+
<SubTexture name="Pessy Title Bump0015" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
21+
<SubTexture name="Pessy Title Bump0016" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
22+
<SubTexture name="Pessy Title Bump0017" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
23+
<SubTexture name="Pessy Title Bump0018" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
24+
<SubTexture name="Pessy Title Bump0019" x="2158" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
25+
<SubTexture name="Pessy Title Bump0020" x="2695" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
26+
<SubTexture name="Pessy Title Bump0021" x="2154" y="562" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
27+
<SubTexture name="Pessy Title Bump0022" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
28+
<SubTexture name="Pessy Title Bump0023" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
29+
<SubTexture name="Pessy Title Bump0024" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
30+
<SubTexture name="Pessy Title Bump0025" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
31+
<SubTexture name="Pessy Title Bump0026" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
32+
<SubTexture name="Pessy Title Bump0027" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
33+
<SubTexture name="Pessy Title Bump0028" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
34+
<SubTexture name="Pessy Title Bump0029" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
35+
</TextureAtlas>

‎assets/secrets/images/RiverBump.png

-1.76 MB
Binary file not shown.

‎assets/secrets/images/RiverBump.xml

-35
This file was deleted.

‎assets/secrets/images/ShadowBump.xml

+19
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,23 @@
88
<SubTexture name="Shadow Title Bump0003" x="393" y="4" width="385" height="582"/>
99
<SubTexture name="Shadow Title Bump0004" x="782" y="4" width="385" height="582"/>
1010
<SubTexture name="Shadow Title Bump0005" x="782" y="4" width="385" height="582"/>
11+
<SubTexture name="Shadow Title Bump0006" x="782" y="4" width="385" height="582"/>
12+
<SubTexture name="Shadow Title Bump0007" x="782" y="4" width="385" height="582"/>
13+
<SubTexture name="Shadow Title Bump0008" x="782" y="4" width="385" height="582"/>
14+
<SubTexture name="Shadow Title Bump0009" x="782" y="4" width="385" height="582"/>
15+
<SubTexture name="Shadow Title Bump0010" x="782" y="4" width="385" height="582"/>
16+
<SubTexture name="Shadow Title Bump0011" x="782" y="4" width="385" height="582"/>
17+
<SubTexture name="Shadow Title Bump0012" x="782" y="4" width="385" height="582"/>
18+
<SubTexture name="Shadow Title Bump0013" x="782" y="4" width="385" height="582"/>
19+
<SubTexture name="Shadow Title Bump0014" x="782" y="4" width="385" height="582"/>
20+
<SubTexture name="Shadow Title Bump0015" x="782" y="4" width="385" height="582"/>
21+
<SubTexture name="Shadow Title Bump0016" x="782" y="4" width="385" height="582"/>
22+
<SubTexture name="Shadow Title Bump0017" x="782" y="4" width="385" height="582"/>
23+
<SubTexture name="Shadow Title Bump0018" x="782" y="4" width="385" height="582"/>
24+
<SubTexture name="Shadow Title Bump0019" x="782" y="4" width="385" height="582"/>
25+
<SubTexture name="Shadow Title Bump0020" x="782" y="4" width="385" height="582"/>
26+
<SubTexture name="Shadow Title Bump0021" x="782" y="4" width="385" height="582"/>
27+
<SubTexture name="Shadow Title Bump0022" x="782" y="4" width="385" height="582"/>
28+
<SubTexture name="Shadow Title Bump0023" x="782" y="4" width="385" height="582"/>
29+
<SubTexture name="Shadow Title Bump0024" x="782" y="4" width="385" height="582"/>
1130
</TextureAtlas>

‎assets/secrets/images/ZRiverBump.png

1.12 MB
Loading

‎assets/secrets/images/ZRiverBump.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="ZRiverBump.png">
3+
<!-- Created with Adobe Animate version 22.0.7.214 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="River Title Bump0000" x="438" y="667" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
6+
<SubTexture name="River Title Bump0001" x="438" y="1322" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
7+
<SubTexture name="River Title Bump0002" x="876" y="1321" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
8+
<SubTexture name="River Title Bump0003" x="1312" y="1330" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
9+
<SubTexture name="River Title Bump0004" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
10+
<SubTexture name="River Title Bump0005" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
11+
<SubTexture name="River Title Bump0006" x="2" y="667" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
12+
<SubTexture name="River Title Bump0007" x="2" y="1327" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
13+
<SubTexture name="River Title Bump0008" x="1746" y="2" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
14+
<SubTexture name="River Title Bump0009" x="1746" y="666" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
15+
<SubTexture name="River Title Bump0010" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
16+
<SubTexture name="River Title Bump0011" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
17+
<SubTexture name="River Title Bump0012" x="438" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
18+
<SubTexture name="River Title Bump0013" x="874" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
19+
<SubTexture name="River Title Bump0014" x="1310" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
20+
</TextureAtlas>

‎assets/secrets/sounds/JinglePessy.mp3

244 KB
Binary file not shown.

‎assets/secrets/sounds/JinglePessy.ogg

363 KB
Binary file not shown.

‎assets/secrets/sounds/JingleRiver.mp3

56.1 KB
Binary file not shown.

‎assets/secrets/sounds/JingleRiver.ogg

9.83 KB
Binary file not shown.

‎assets/shared/images/achievements/pessy_easter_egg.png

16.9 KB
Loading

‎assets/shared/images/achievements/weekend1_nomiss.png

14 KB
Loading

‎assets/shared/images/credits/majigsaw.png

7.71 KB
Loading

‎assets/shared/images/gfDanceTitle.json

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
2-
"titlex":-150,
3-
"titley":-100,
4-
"startx":100,
5-
"starty":576,
6-
"gfx":512,
7-
"gfy":40,
8-
"backgroundSprite":"",
9-
"bpm":102
2+
"titlex": -150,
3+
"titley": -100,
4+
"startx": 100,
5+
"starty": 576,
6+
"gfx": 512,
7+
"gfy": 40,
8+
"backgroundSprite": "",
9+
"bpm": 102,
10+
11+
"animation": "gfDance",
12+
"dance_left": [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
13+
"dance_right": [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29],
14+
"idle": false
1015
}

‎assets/translations/shared/data/pt-BR.lang

+10-7
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ charting_mode: "Modo Charter"
3636
blueballed: "Broxadas: {1}"
3737

3838
// Main Menu
39-
images/mainmenu/menu_story_mode: "images/mainmenu/menu_story_mode"
40-
images/mainmenu/menu_freeplay: "images/mainmenu/menu_freeplay"
41-
images/mainmenu/menu_credits: "images/mainmenu/menu_credits"
39+
images/mainmenu/menu_story_mode: "images/pt-BR/mainmenu/menu_story_mode"
40+
images/mainmenu/menu_credits: "images/pt-BR/mainmenu/menu_credits"
4241

4342
// Story Mode
4443
images/Menu_Tracks: "images/pt-BR/Menu_Tracks"
@@ -87,6 +86,8 @@ achievement_week6_nomiss: "Novo Recorde!!"
8786
description_week6_nomiss: "Complete a Week 6 no Modo Difícil e sem errar."
8887
achievement_week7_nomiss: "Filho da P..."
8988
description_week7_nomiss: "Complete a Week 7 no Modo Difícil e sem errar."
89+
achievement_weekend1_nomiss: "Briga sem Perder Amizade"
90+
description_weekend1_nomiss: "Complete a Weekend 1 no Modo Difícil e sem errar."
9091
achievement_ur_bad: "Pontuação Desastrosa!"
9192
description_ur_bad: "Complete uma Música com uma precisão menor que 20%."
9293
achievement_ur_good: "Perfeccionista"
@@ -103,6 +104,8 @@ achievement_toastie: "PC de Torradeira"
103104
description_toastie: "Jogando num belo de um PC da Xuxa, hein?"
104105
achievement_debugger: "Modo Debug"
105106
description_debugger: "Complete a Música "Test" através do Chart Editor."
107+
achievement_pessy_easter_egg: "Garota de Programação"
108+
description_pessy_easter_egg: "Hihi, você me encontrou~!"
106109

107110
// Options
108111
options_note_colors: "Coloração das Notas"
@@ -139,14 +142,14 @@ keygroup_ui: "MENUS"
139142
keygroup_volume: "VOLUME"
140143
keygroup_debug: "DEBUG"
141144

142-
key_note_left: "Esq."
145+
key_note_left: "Esquerda"
143146
key_note_down: "Baixo"
144147
key_note_up: "Cima"
145-
key_note_right: "Dir."
146-
key_ui_left: "Esq."
148+
key_note_right: "Direita"
149+
key_ui_left: "Esquerda"
147150
key_ui_down: "Baixo"
148151
key_ui_up: "Cima"
149-
key_ui_right: "Dir."
152+
key_ui_right: "Direita"
150153
key_reset: "Reset"
151154
key_accept: "Accept"
152155
key_back: "Back"

‎assets/translations/shared/images/pt-BR/mainmenu/menu_credits.png

74.2 KB
Loading

‎assets/translations/shared/images/pt-BR/mainmenu/menu_credits.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TextureAtlas imagePath="FNF_main_menu_assets_pt-BR.png">
3+
<!-- Created with Adobe Animate version 23.0.2.103 -->
4+
<!-- http://www.adobe.com/products/animate.html -->
5+
<SubTexture name="credits idle0000" x="2" y="542" width="502" height="124"/>
6+
<SubTexture name="credits idle0001" x="2" y="542" width="502" height="124"/>
7+
<SubTexture name="credits idle0002" x="2" y="542" width="502" height="124"/>
8+
<SubTexture name="credits idle0003" x="2" y="668" width="502" height="124"/>
9+
<SubTexture name="credits idle0004" x="2" y="668" width="502" height="124"/>
10+
<SubTexture name="credits idle0005" x="2" y="668" width="502" height="124"/>
11+
<SubTexture name="credits idle0006" x="2" y="794" width="502" height="124"/>
12+
<SubTexture name="credits idle0007" x="2" y="794" width="502" height="124"/>
13+
<SubTexture name="credits idle0008" x="2" y="794" width="502" height="124"/>
14+
<SubTexture name="credits selected0000" x="2" y="2" width="630" height="179" frameX="0" frameY="-1" frameWidth="631" frameHeight="180"/>
15+
<SubTexture name="credits selected0001" x="2" y="183" width="631" height="178" frameX="0" frameY="-2" frameWidth="631" frameHeight="180"/>
16+
<SubTexture name="credits selected0002" x="2" y="363" width="630" height="177" frameX="0" frameY="0" frameWidth="631" frameHeight="180"/>
17+
</TextureAtlas>

‎assets/translations/shared/images/pt-BR/mainmenu/menu_story_mode.png

102 KB
Loading

0 commit comments

Comments
 (0)