Skip to content
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.

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

Update Org Name & Links in README #199

Merged
merged 1 commit into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
contact_links:
- name: Question
url: https://github.com/fishfight/punchy/discussions
url: https://github.com/fishfolk/punchy/discussions
about: If you have a question, feel free to open a discussion!
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "punchy"
version = "0.1.0"
description = "A 2.5D side-scroller beatemup"
authors = ["The Fish Fight Game & Spicy Lobster Developers"]
authors = ["The Fish Folk Game & Spicy Lobster Developers"]
license = "MIT OR Apache-2.0"
edition = "2021"

Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'Fish Fight: Punchy' source code is dual-licensed under either
'Fish Folk: Punchy' source code is dual-licensed under either

* MIT License (licenses/LICENSE-MIT or http://opensource.org/licenses/MIT)
* Apache License, Version 2.0 (licenses/LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)

at your option.

Fish Fight media assets are Copyright (c) 2020-2022 The Fish Fight Game & Spicy Lobster Developers and licensed as [CC BY-NC](https://creativecommons.org/licenses/by-nc/4.0/).
Fish Folk media assets are Copyright (c) 2020-2022 The Fish Folk Game & Spicy Lobster Developers and licensed as [CC BY-NC](https://creativecommons.org/licenses/by-nc/4.0/).
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fish Fight: Punchy
# Fish Folk: Punchy

[![Build Status](https://img.shields.io/github/workflow/status/fishfight/punchy/CI?logo=github&labelColor=1e1c24&color=216e9b)](https://github.com/fishfight/punchy/actions)
[![Build Status](https://img.shields.io/github/workflow/status/fishfolks/punchy/CI?logo=github&labelColor=1e1c24&color=216e9b)](https://github.com/fishfolks/punchy/actions)
[![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg?label=license&labelColor=1e1c24&color=34925e)](./LICENSE.md)
[![Discord](https://img.shields.io/badge/chat-on%20discord-green.svg?logo=discord&logoColor=fff&labelColor=1e1c24&color=8d5b3f)](https://discord.gg/4smxjcheE5)
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/46829)
Expand All @@ -12,24 +12,24 @@ A 2.5D side-scroller beat-’em-up, made in Bevy. Inspired by games like Little
https://user-images.githubusercontent.com/1379590/181386240-a1cac84f-fb12-4195-9664-7e673414abf0.mp4

## Web Build
We keep our web build current with our [latest relese](https://github.com/fishfight/punchy/releases/latest).
We keep our web build current with our [latest relese](https://github.com/fishfolks/punchy/releases/latest).

https://fishfight.github.io/punchy/player/latest/
https://fishfolks.github.io/punchy/player/latest/

Previous versions of the web build can also be found linked on their [respective release pages](https://github.com/fishfight/punchy/releases/).
Previous versions of the web build can also be found linked on their [respective release pages](https://github.com/fishfolks/punchy/releases/).

## Building current development version
If you wish to check out changes not yet made it into a release, you can build the game for yourself.
1. If you dont have it installed already, Install rust and the latest stable toolchain with [rustup.rs](https://rustup.rs/).
2. If you are running Linux, ensure you have [Bevy's dependancies](https://github.com/bevyengine/bevy/blob/main/docs/linux_dependencies.md) installed.
3. Clone this repository: `git clone git@github.com:fishfight/punchy.git`
3. Clone this repository: `git clone git@github.com:fishfolks/punchy.git`
4. In the repository base, `cargo run` to compile and run the project.

## Contributing

Anyone involved in the Fish Fight community must follow our [code of conduct](https://github.com/fishfight/FishFight/blob/main/CODE_OF_CONDUCT.md).
Anyone involved in the Fish Folk community must follow our [code of conduct](https://github.com/fishfolks/jumpy/blob/main/CODE_OF_CONDUCT.md).

Punchy is currently at an early stage of development, if you want to contribute the best way to get started is to join us at the [Spicy Lobster Discord](https://discord.gg/4smxjcheE5) and check out our [help-wanted](https://github.com/fishfight/punchy/labels/help%20wanted) issues.
Punchy is currently at an early stage of development, if you want to contribute the best way to get started is to join us at the [Spicy Lobster Discord](https://discord.gg/4smxjcheE5) and check out our [help-wanted](https://github.com/fishfolks/punchy/labels/help%20wanted) issues.

Before committing and opening a PR, please run the following commands and follow their instructions:

Expand Down
2 changes: 1 addition & 1 deletion assets/locales/en-US/main.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Main Menu
title =
Fish Fight
Fish Folk
Punchy
start-game = Start Game
settings = Settings
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fn main() {

let mut app = App::new();
app.insert_resource(WindowDescriptor {
title: "Fish Fight Punchy".to_string(),
title: "Fish Folk Punchy".to_string(),
scale_factor_override: Some(1.0),
..default()
})
Expand Down
2 changes: 1 addition & 1 deletion src/platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ mod native {
let (sender, receiver) = async_channel::unbounded();

// Identify project storage file path
let project_dirs = directories::ProjectDirs::from("org", "FishFight", "Punchy")
let project_dirs = directories::ProjectDirs::from("org", "FishFolk", "Punchy")
.expect("Identify system data dir path");
let file_path = project_dirs.data_dir().join("storage.yml");

Expand Down