Merge branch 'unstable'

KelvinShadewing · Oct 28, 2022 · 8505770 · 8505770
2 parents 6e7a7cc + eb54ab4
commit 8505770
Show file tree

Hide file tree

Showing 482 changed files with 153,706 additions and 63,656 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,7 @@ game.json
 *.blame
 save/*.json
 mods/*
-mods/*.*
+mods/*.*
+contrib/secret
+contrib/secret/*
+contrib/secret/*.*
diff --git a/README.md b/README.md
@@ -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
 
@@ -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!
diff --git a/contrib/azzy/credits.txt b/contrib/azzy/credits.txt
@@ -0,0 +1 @@
+Tulip (me) - uhhhhhhhhhhhhhhhhhhh yes
diff --git a/contrib/azzy/cybergrind.json b/contrib/azzy/cybergrind.json
diff --git a/contrib/azzy/features_needed.md b/contrib/azzy/features_needed.md
@@ -0,0 +1,5 @@
+# Todo
+- [X] Time Attack support
+- [ ] snow world
+- [X] 1 town (wip)
+- [X] Yeti Ambush- I mean what
diff --git a/contrib/azzy/gfx/GFX_README b/contrib/azzy/gfx/GFX_README
@@ -0,0 +1,3 @@
+---- FILE TYPES ----
+PNG - image, obvious
+PXO - Pixelorama file
diff --git a/contrib/azzy/gfx/cybergrind_tiles.png b/contrib/azzy/gfx/cybergrind_tiles.png
diff --git a/contrib/azzy/gfx/cybergrind_tiles.pxo b/contrib/azzy/gfx/cybergrind_tiles.pxo
diff --git a/contrib/azzy/info.json b/contrib/azzy/info.json
@@ -0,0 +1,4 @@
+{
+	"name" : "Az-reign of terror or smthn",
+	"worldmap" : "ow-0.json"
+}
diff --git a/contrib/azzy/init.nut b/contrib/azzy/init.nut
@@ -0,0 +1 @@
+addTimeAttackWorld("Misbegotten Island", "azzy", "sn-l0")
diff --git a/contrib/azzy/notes.md b/contrib/azzy/notes.md
@@ -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.
diff --git a/contrib/azzy/ow-0.json b/contrib/azzy/ow-0.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addTimeAttackWorld("Misbegotten Island", "azzy", "sn-l0")