aboutsummaryrefslogtreecommitdiffstats
path: root/assets
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-06-15 07:49:35 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-06-15 07:49:35 -0400
commit1b49be1c9c8e8887564dbb0aa69519bc538d81e7 (patch)
tree77555d2c82ccdc70f5b4c11f6aae38bab9e3d588 /assets
parent8f385ec7ac5a78bc3bf70170f4ab39ebcac8e32a (diff)
parent0b38e943e1cd2ccd752f35358affd3fec08e23ca (diff)
mergeeee
Diffstat (limited to 'assets')
-rw-r--r--assets/dialog_en-us2
-rw-r--r--assets/ui/button_corners.pngbin0 -> 786 bytes
-rw-r--r--assets/ui/button_corners_flat.pngbin0 -> 282 bytes
-rw-r--r--assets/ui/button_side_borders.pngbin0 -> 203 bytes
-rw-r--r--assets/ui/button_side_borders_flat.pngbin0 -> 192 bytes
-rw-r--r--assets/ui/button_top_bot_borders.pngbin0 -> 198 bytes
-rw-r--r--assets/ui/button_top_bot_borders_flat.pngbin0 -> 196 bytes
7 files changed, 1 insertions, 1 deletions
diff --git a/assets/dialog_en-us b/assets/dialog_en-us
index dfe7b03..2224aa6 100644
--- a/assets/dialog_en-us
+++ b/assets/dialog_en-us
@@ -4,7 +4,7 @@ I heard if you complete a quest, you'll get a special reward.
How much wood could a woodchuck chuck if a woodchuck could chuck wood?
I don't think anyone has ever been able to climb up that hill.
If you ever see a hole in the ground, watch out; it could mean the end for you.
-Did you know this game has over 5000 lines of code? I didn't. I didn't even know I was in a game until now...
+Did you know this game has over 10000 lines of code? I didn't. I didn't even know I was in a game until now...
HELP MY CAPS LOCK IS STUCK
You know, if anyone ever asked me who I wanted to be when I grow up, I would say Abby Ross.
I want to have the wallpaper in our house changed. It doesn't really fit the environment.
diff --git a/assets/ui/button_corners.png b/assets/ui/button_corners.png
new file mode 100644
index 0000000..38f0cf9
--- /dev/null
+++ b/assets/ui/button_corners.png
Binary files differ
diff --git a/assets/ui/button_corners_flat.png b/assets/ui/button_corners_flat.png
new file mode 100644
index 0000000..527500f
--- /dev/null
+++ b/assets/ui/button_corners_flat.png
Binary files differ
diff --git a/assets/ui/button_side_borders.png b/assets/ui/button_side_borders.png
new file mode 100644
index 0000000..4f0ec6d
--- /dev/null
+++ b/assets/ui/button_side_borders.png
Binary files differ
diff --git a/assets/ui/button_side_borders_flat.png b/assets/ui/button_side_borders_flat.png
new file mode 100644
index 0000000..ef9dbfe
--- /dev/null
+++ b/assets/ui/button_side_borders_flat.png
Binary files differ
diff --git a/assets/ui/button_top_bot_borders.png b/assets/ui/button_top_bot_borders.png
new file mode 100644
index 0000000..f78b1e3
--- /dev/null
+++ b/assets/ui/button_top_bot_borders.png
Binary files differ
diff --git a/assets/ui/button_top_bot_borders_flat.png b/assets/ui/button_top_bot_borders_flat.png
new file mode 100644
index 0000000..431e6b8
--- /dev/null
+++ b/assets/ui/button_top_bot_borders_flat.png
Binary files differ