Skip to content

userfriendly shit idkidk #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
windows10win7posreadywoeskio wants to merge 8 commits into
base: main
Choose a base branch
from
Open

userfriendly shit idkidk #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a60573
credit shit in Project.xml
windows10win7posreadywoeskio Jun 3, 2021
d16c9f6
adding shit
windows10win7posreadywoeskio Jun 3, 2021
cf3c319
AYO AYO AYO
windows10win7posreadywoeskio Jun 3, 2021
706f4c6
Update README.md
windows10win7posreadywoeskio Jun 3, 2021
649a02a
a
windows10win7posreadywoeskio Jun 3, 2021
f4f5dfb
a
windows10win7posreadywoeskio Jun 3, 2021
6cb7965
Update README.md
windows10win7posreadywoeskio Jun 3, 2021
0176b03
Update OnlineNickState.hx
windows10win7posreadywoeskio Jun 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ This game was made with love to Newgrounds and its community. Extra love to Tom
# Other pages

- [Server info](server/README.md) - More info on how to host a server.
- [BUILDING.md](https://github.com/KadeDev/Kade-Engine/blob/master/BUILDING.md) - How to compile/build the game. This points to the BUILDING.md inside the Kade Engine repository.
- [Building](https://kadedev.github.io/Kade-Engine/building) - How to compile/build the game. This points to the Building section inside the Kade Engine website.
2 changes: 1 addition & 1 deletion client/Project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin' Battle Royale" file="FNF Battle Royale" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
<app title="Friday Night Funkin' Battle Royale" file="BattleRoyale" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="BR 1.0.1 || FNF 0.2.7.1" company="ninjamuffin99" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down
4 changes: 2 additions & 2 deletions client/source/onlinemod/Chat.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ class Chat

public static inline function PLAYER_JOIN(nickname:String)
{
Chat.OutputChatMessage('$nickname joined the game', systemColor);
Chat.OutputChatMessage('$nickname joined the game, say welcome.', systemColor);
}

public static inline function PLAYER_LEAVE(nickname:String)
{
Chat.OutputChatMessage('$nickname left the game', systemColor);
Chat.OutputChatMessage('$nickname left the game, Awww.', systemColor);
}

public static inline function SERVER_MESSAGE(message:String)
Expand Down
12 changes: 6 additions & 6 deletions client/source/onlinemod/OnlineNickState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class OnlineNickState extends MusicBeatState
add(bg);


var topText = new FlxText(0, FlxG.height * 0.25, "Insert nickname");
var topText = new FlxText(0, FlxG.height * 0.25, "Insert nickname.");
topText.setFormat(Paths.font("vcr.ttf"), 64, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
topText.screenCenter(FlxAxes.X);
add(topText);
Expand Down Expand Up @@ -76,16 +76,16 @@ class OnlineNickState extends MusicBeatState
switch (data[0])
{
case 0:
SetErrorText("Nickname accepted", FlxColor.LIME);
SetErrorText("Nickname accepted!", FlxColor.LIME);
FlxG.switchState(new OnlineLobbyState());
case 1:
SetErrorText("Nickname already claimed");
SetErrorText("Nickname already claimed, Choose another one");
case 2:
SetErrorText("Game already in progress");
SetErrorText("Game already in progress. Please wait");
case 3:
SetErrorText("Invalid nickname");
SetErrorText("Invalid nickname! Please choose another one.");
case 4:
FlxG.switchState(new OnlinePlayMenuState("Game is already full"));
FlxG.switchState(new OnlinePlayMenuState("Game is already full, cannot join."));
}
}
}
Expand Down