aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-06-02 14:13:33 -0700
committer1029chris <1029chris@gmail.com>2016-06-02 14:13:33 -0700
commitf6c6bce430ce906b188ef6a6d500676c4116a534 (patch)
tree2c02b979956118abfe442f27c8c74a90097c33b4
parent0f93500dcd5f72b34225834bf534cd9efed1deea (diff)
Added 3 new windows
Video Player, Music Player, and Image viewer
-rw-r--r--assets.lua5
-rw-r--r--assets/icon_16_image.pngbin0 -> 270 bytes
-rw-r--r--assets/icon_16_music.pngbin0 -> 422 bytes
-rw-r--r--assets/icon_16_video.pngbin0 -> 286 bytes
-rw-r--r--var.lua3
5 files changed, 7 insertions, 1 deletions
diff --git a/assets.lua b/assets.lua
index e118031..c05313a 100644
--- a/assets.lua
+++ b/assets.lua
@@ -18,7 +18,10 @@ function loadAssets(id)
files = love.graphics.newImage("assets/icon_16_files.png"),
help = love.graphics.newImage("assets/icon_16_help.png"),
settings = love.graphics.newImage("assets/icon_16_settings.png"),
- antivirus = love.graphics.newImage("assets/icon_16_antivirus.png")
+ antivirus = love.graphics.newImage("assets/icon_16_antivirus.png"),
+ image = love.graphics.newImage("assets/icon_16_image.png"),
+ video = love.graphics.newImage("assets/icon_16_video.png"),
+ music = love.graphics.newImage("assets/icon_16_music.png")
}
end
if id == 3 then
diff --git a/assets/icon_16_image.png b/assets/icon_16_image.png
new file mode 100644
index 0000000..c71c5f0
--- /dev/null
+++ b/assets/icon_16_image.png
Binary files differ
diff --git a/assets/icon_16_music.png b/assets/icon_16_music.png
new file mode 100644
index 0000000..e68b572
--- /dev/null
+++ b/assets/icon_16_music.png
Binary files differ
diff --git a/assets/icon_16_video.png b/assets/icon_16_video.png
new file mode 100644
index 0000000..fededbc
--- /dev/null
+++ b/assets/icon_16_video.png
Binary files differ
diff --git a/var.lua b/var.lua
index c8436d5..b2f38e1 100644
--- a/var.lua
+++ b/var.lua
@@ -58,6 +58,9 @@ function loadVar()
loadWin(4, 200, 150, "Antivirus", icons[32].antivirus, icons[16].antivirus)
loadWin(5, 450, 400, "Help", icons[32].help, icons[16].help)
loadWin(6, 400, 550, "Settings", icons[32].settings, icons[16].settings)
+ loadWin(7, 400, 400, "Image Viewer", nil, icons[16].image)
+ loadWin(8, 400, 300, "Video Player", nil, icons[16].video)
+ loadWin(9, 250, 150, "Music Player", nil, icons[16].music)
win[4].crazy = false
win[4].crazyLeft = false
win[4].crazyUp = false