Skip to content

Commit

Permalink
Revert "aaaaa"
Browse files Browse the repository at this point in the history
This reverts commit 9e61ca8.
  • Loading branch information
piplup55 committed Sep 28, 2023
1 parent 9e61ca8 commit 7c7ba45
Show file tree
Hide file tree
Showing 25 changed files with 1,514 additions and 256 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/Server/bin/
/Server/obj/
/Shared/bin/
/Shared/obj/
9 changes: 9 additions & 0 deletions .github/pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: "1"
rules:
- base: upstream
upstream: Sanae6:master
mergeMethod: merge
conflictReviewers:
- piplup55
conflictLabel: "conflict"
label: "Pull"
32 changes: 32 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,35 @@ jobs:
platforms : linux/amd64,linux/arm/v7,linux/arm64/v8
cache-from : type=gha,scope=${{ github.workflow }}
cache-to : type=gha,scope=${{ github.workflow }},mode=max
-
name: Build binary files
run: |
./docker-build.sh all
-
name : Upload Server
uses : actions/upload-artifact@v3
with:
name : Server
path : ./bin/Server
if-no-files-found : error
-
name : Upload Server.arm
uses : actions/upload-artifact@v3
with:
name : Server.arm
path : ./bin/Server.arm
if-no-files-found : error
-
name : Upload Server.arm64
uses : actions/upload-artifact@v3
with:
name : Server.arm64
path : ./bin/Server.arm64
if-no-files-found : error
-
name : Upload Server.exe
uses : actions/upload-artifact@v3
with:
name : Server.exe
path : ./bin/Server.exe
if-no-files-found : error
60 changes: 0 additions & 60 deletions .github/workflows/release.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ riderModule.iml
.idea/
settings.json
.vs/

/cache/
/data/
32 changes: 6 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Super Mario Odyssey: Online Server

The official server for the [Super Mario Odyssey: Online](https://github.com/CraftyBoss/SuperMarioOdysseyOnline) mod.
[Are you looking for the Offical Super Mario Odyssey Online Server?](https://github.com/Sanae6/SmoOnlineServer)

## Branches
- [Releases](https://github.com/TeamPiplup/SmoOnlineServer/releases)
- [upstream](https://github.com/TeamPiplup/SmoOnlineServer/tree/upstream) - upstream is the master branch
- [packet-fixes](https://github.com/TeamPiplup/SmoOnlineServer/tree/packet-fixes) - packet-fixes contains the fixes for ryujinx
- any other branch will be a testing branch you can build(although i don't recommand it)

## Windows Setup

Expand Down Expand Up @@ -61,28 +66,3 @@ docker-compose logs --tail=20 --follow
# stop server
docker-compose stop
```

## Commands

Run `help` to get what commands are available in the server console.
Run the `loadsettings` command in the console to update the settings without restarting.
Server address and port will require a server restart, but everything else should update when you run `loadsettings`.

[//]: # (TODO: Document all commands, possibly rename them too.)

## Settings

### Server
Address: the ip address of the server, default: 0.0.0.0 # this shouldn't be changed
Port: the port of the server, default 1027
Maxplayers: the max amount of players that can join, default: 8
Flip: flips the player upside down, defaults: enabled: true, pov: both
Scenario: sync's scenario's for all players on the server, default: false
Banlist: banned people are unable to join the server, default: false
PersistShines/Moons: Allows the server to remember moon progress across crashes/restarts

### Discord
Note: Token and LogChannel needs to a string puts "" around it
Token: the token of the bot you want to load into, default: null
Prefix: the bot prefix to be used, default: $
LogChannel: logs the server console to that channel, default: null
Loading

0 comments on commit 7c7ba45

Please sign in to comment.