Skip to content

Commit

Permalink
Merge branch 'unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
KelvinShadewing committed Oct 28, 2022
2 parents 6e7a7cc + eb54ab4 commit 8505770
Show file tree
Hide file tree
Showing 482 changed files with 153,706 additions and 63,656 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ game.json
*.blame
save/*.json
mods/*
mods/*.*
mods/*.*
contrib/secret
contrib/secret/*
contrib/secret/*.*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ After being humiliated by Tux on the tracks, Nolok decides to get his revenge by

## Installation Destructions

Follow the install instructions for [Brux GDK](https://github.com/kelvinshadewing/brux-gdk), then run `tux.brx` with Brux.
Follow the install instructions for [Brux GDK](https://github.com/kelvinshadewing/brux-gdk), then run `game.brx` with Brux.

## Controls

Expand Down Expand Up @@ -70,4 +70,4 @@ You can rebind the controls from the Options menu found on the title screen.

*Q:* Who is Midi?

**A:** Midi Waffle is the main character of another game I'm working on, Kyrodian Legends. He's also the mascot for Brux GDK!
**A:** Midi Waffle is the main character of another game I'm working on, Kyrodian Legends. He's also the mascot for Brux GDK!
1 change: 1 addition & 0 deletions contrib/azzy/credits.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tulip (me) - uhhhhhhhhhhhhhhhhhhh yes
1,135 changes: 1,135 additions & 0 deletions contrib/azzy/cybergrind.json

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions contrib/azzy/features_needed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Todo
- [X] Time Attack support
- [ ] snow world
- [X] 1 town (wip)
- [X] Yeti Ambush- I mean what
3 changes: 3 additions & 0 deletions contrib/azzy/gfx/GFX_README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---- FILE TYPES ----
PNG - image, obvious
PXO - Pixelorama file
Binary file added contrib/azzy/gfx/cybergrind_tiles.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added contrib/azzy/gfx/cybergrind_tiles.pxo
Binary file not shown.
4 changes: 4 additions & 0 deletions contrib/azzy/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name" : "Az-reign of terror or smthn",
"worldmap" : "ow-0.json"
}
1 change: 1 addition & 0 deletions contrib/azzy/init.nut
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addTimeAttackWorld("Misbegotten Island", "azzy", "sn-l0")
3 changes: 3 additions & 0 deletions contrib/azzy/notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Level Notes
## Ocean De Clair De Lune
The e in ocean should be a special char but STA's font doesn't support it.
1,182 changes: 1,182 additions & 0 deletions contrib/azzy/ow-0.json

Large diffs are not rendered by default.

0 comments on commit 8505770

Please sign in to comment.