Skip to content
Snippets Groups Projects
Commit a39434bd authored by Tran Peter's avatar Tran Peter
Browse files

el gato #20

parent c83adeac
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!27Player can now place bombs that have a explosion radius that dont go through the wall.,!20Merge ui into development
...@@ -31,7 +31,7 @@ public class LoadingScreenController implements Initializable { ...@@ -31,7 +31,7 @@ public class LoadingScreenController implements Initializable {
"Did you know, that since 2009, Martin isn't on the FBI list?", "Did you know, that since 2009, Martin isn't on the FBI list?",
"BattleArena is actually derived from the combination of the words 'Battle' and 'Arena'.", "BattleArena is actually derived from the combination of the words 'Battle' and 'Arena'.",
"Yannik ist over 1,80m tall.", "Yannik ist over 1,80m tall.",
"Electricity is a vital part to compute this game.", "Electricity is a vital part to play this game.",
"There is a typo in one of the tips.", "There is a typo in one of the tips.",
"Over 1000 people play games every day.", "Over 1000 people play games every day.",
"A lot of people believe Nikola Tesla was the first to invent electricity but some clouds beat him to it.", "A lot of people believe Nikola Tesla was the first to invent electricity but some clouds beat him to it.",
......
...@@ -34,7 +34,7 @@ public class MenuBorderPaneController implements Initializable { ...@@ -34,7 +34,7 @@ public class MenuBorderPaneController implements Initializable {
private MediaPlayer musicPlayer, mediaPlayer; private MediaPlayer musicPlayer, mediaPlayer;
private MediaView mediaView; private MediaView mediaView;
private final String[] videoFiles = {"depression", "allMyFellas", "wooOOoo", "myMind", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger", private final String[] videoFiles = {"depression", "allMyFellas", "wooOOoo", "myMind", "dogCheese", "gta", "cat", "bobama", "roomba", "firework", "cheezburger",
"kangaroo", "lifeCouldBeMonke", "seal", "imNotYou", "parkingTickets", "russianKid", "rejectHumanity", "horse", "catSitting", "pablo", "holyCrap", "kangaroo", "lifeCouldBeMonke", "seal", "rolling", "imNotYou", "parkingTickets", "russianKid", "rejectHumanity", "horse", "catSitting", "pablo", "holyCrap",
"lessGoo", "sadCat", "basketball", "yoinkySploinky", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog", "lessGoo", "sadCat", "basketball", "yoinkySploinky", "msPuff", "=D", "banana", "chaCha", "async", "sadHorse", "minecraftCat", "muecke", "top10Cats", "dog",
"pot", "mineCraftCat2", "catEating", "catJump", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"}; "pot", "mineCraftCat2", "catEating", "catJump", "bear", "pancake", "frog", "gtfo", "carl", "dog2", "slippery", "wolf", "legCat", "sad", "waaahhh"};
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment