diff --git a/.vs/Catch the button/v16/.suo b/.vs/Catch the button/v16/.suo index f3f7661..a82bdb5 100644 Binary files a/.vs/Catch the button/v16/.suo and b/.vs/Catch the button/v16/.suo differ diff --git a/Catch the button/AudioSystem.cs b/Catch the button/AudioSystem.cs index 5b4364e..deba0a5 100644 --- a/Catch the button/AudioSystem.cs +++ b/Catch the button/AudioSystem.cs @@ -10,10 +10,17 @@ namespace Catch_the_button { static SoundPlayer hit = new SoundPlayer(); static SoundPlayer miss = new SoundPlayer(); static SoundPlayer levelup = new SoundPlayer(); + static SoundPlayer gamestart = new SoundPlayer(); static internal void Init() { hit.SoundLocation = "./resources/hit.wav"; miss.SoundLocation = "./resources/miss.wav"; levelup.SoundLocation = "./resources/levelup.wav"; + gamestart.SoundLocation = "./resources/game-start.wav"; + + hit.Load(); + miss.Load(); + levelup.Load(); + gamestart.Load(); } static internal void Hit() { hit.Play(); @@ -24,5 +31,8 @@ namespace Catch_the_button { static internal void LevelUp() { levelup.Play(); } + static internal void Play() { + gamestart.Play(); + } } } diff --git a/Catch the button/Game.cs b/Catch the button/Game.cs index 0cbdf59..f4caf7b 100644 --- a/Catch the button/Game.cs +++ b/Catch the button/Game.cs @@ -67,7 +67,6 @@ namespace Catch_the_button { formResetter.Stop(); } static internal void Start() { //pressed button start - AudioSystem.Init(); points = miss = 0; delay = 2000; btn.Visible = btn.Enabled = true; @@ -76,6 +75,7 @@ namespace Catch_the_button { btn.Location = new Point((frm.Width - btn.Width) / 2, (frm.Height - btn.Height) / 2); status = true; timer.Interval = delay; + AudioSystem.Play(); } static void Go() { //first button hit timer.Start(); diff --git a/Catch the button/LeaderDialog.Designer.cs b/Catch the button/LeaderDialog.Designer.cs index 608b376..769e898 100644 --- a/Catch the button/LeaderDialog.Designer.cs +++ b/Catch the button/LeaderDialog.Designer.cs @@ -39,7 +39,7 @@ namespace Catch_the_button { this.score.Location = new System.Drawing.Point(13, 80); this.score.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.score.Name = "score"; - this.score.Size = new System.Drawing.Size(190, 29); + this.score.Size = new System.Drawing.Size(238, 36); this.score.TabIndex = 0; this.score.Text = "Your score is: ..."; // @@ -49,7 +49,7 @@ namespace Catch_the_button { this.label1.Location = new System.Drawing.Point(14, 123); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(210, 24); + this.label1.Size = new System.Drawing.Size(267, 29); this.label1.TabIndex = 1; this.label1.Text = "Please enter your name"; // @@ -59,7 +59,7 @@ namespace Catch_the_button { this.label2.Location = new System.Drawing.Point(14, 147); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(295, 24); + this.label2.Size = new System.Drawing.Size(377, 29); this.label2.TabIndex = 2; this.label2.Text = "(leave blank to not save the score)"; // @@ -68,7 +68,7 @@ namespace Catch_the_button { this.name.Location = new System.Drawing.Point(18, 187); this.name.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7); this.name.Name = "name"; - this.name.Size = new System.Drawing.Size(373, 28); + this.name.Size = new System.Drawing.Size(373, 34); this.name.TabIndex = 3; // // submit @@ -89,13 +89,13 @@ namespace Catch_the_button { this.label3.Location = new System.Drawing.Point(63, 9); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(272, 55); + this.label3.Size = new System.Drawing.Size(339, 69); this.label3.TabIndex = 5; this.label3.Text = "Game Over"; // // LeaderDialog // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); + this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 29F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(408, 290); this.Controls.Add(this.label3); @@ -108,6 +108,10 @@ namespace Catch_the_button { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7); + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(426, 337); + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(426, 337); this.Name = "LeaderDialog"; this.Text = "Leaderboards"; this.Load += new System.EventHandler(this.Form2_Load); diff --git a/Catch the button/Main.Designer.cs b/Catch the button/Main.Designer.cs index fdaa6be..8fa52bc 100644 --- a/Catch the button/Main.Designer.cs +++ b/Catch the button/Main.Designer.cs @@ -25,6 +25,10 @@ namespace Catch_the_button { /// private void InitializeComponent() { this.Menu = new System.Windows.Forms.Panel(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); this.button = new System.Windows.Forms.Label(); this.stats = new System.Windows.Forms.Panel(); this.milestone = new System.Windows.Forms.Label(); @@ -45,10 +49,6 @@ namespace Catch_the_button { this.label4 = new System.Windows.Forms.Label(); this.quit = new System.Windows.Forms.Button(); this.start = new System.Windows.Forms.Button(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); this.Menu.SuspendLayout(); this.stats.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -81,6 +81,42 @@ namespace Catch_the_button { this.Menu.Size = new System.Drawing.Size(961, 521); this.Menu.TabIndex = 0; // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(12, 393); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(120, 23); + this.label11.TabIndex = 1005; + this.label11.Text = "Miss: -1pt"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(12, 370); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(252, 23); + this.label10.TabIndex = 1004; + this.label10.Text = "Click after 500ms: 1pt"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(12, 347); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(241, 23); + this.label8.TabIndex = 1; + this.label8.Text = "Click in <500ms: 2pts"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(12, 324); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 23); + this.label9.TabIndex = 1003; + this.label9.Text = "Points:"; + // // button // this.button.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -306,42 +342,6 @@ namespace Catch_the_button { this.start.UseVisualStyleBackColor = true; this.start.Click += new System.EventHandler(this.start_Click); // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(12, 347); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(241, 23); - this.label8.TabIndex = 1; - this.label8.Text = "Click in <500ms: 2pts"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(12, 324); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 23); - this.label9.TabIndex = 1003; - this.label9.Text = "Points:"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(12, 370); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(252, 23); - this.label10.TabIndex = 1004; - this.label10.Text = "Click after 500ms: 1pt"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(12, 393); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(120, 23); - this.label11.TabIndex = 1005; - this.label11.Text = "Miss: -1pt"; - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 23F); @@ -352,6 +352,9 @@ namespace Catch_the_button { this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; this.Margin = new System.Windows.Forms.Padding(4); + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(981, 567); + this.MinimumSize = new System.Drawing.Size(981, 567); this.Name = "Main"; this.Text = "Catch the Button 2"; this.Load += new System.EventHandler(this.Form1_Load); diff --git a/Catch the button/Main.cs b/Catch the button/Main.cs index dc57275..422bc71 100644 --- a/Catch the button/Main.cs +++ b/Catch the button/Main.cs @@ -14,13 +14,13 @@ namespace Catch_the_button { public Main() { InitializeComponent(); } - private void start_Click(object sender, EventArgs e) { Game.Start(); } private void Form1_Load(object sender, EventArgs e) { Game.Init(ptsCount, hp, Menu, button, this, timeleft, milestone); + AudioSystem.Init(); Leaderboard.Init(ldrboard, this, highscore); button.Parent = stats.Parent = this; } diff --git a/Catch the button/bin/Debug/Catch the button.exe b/Catch the button/bin/Debug/Catch the button.exe index 0c7b144..5412e5e 100644 Binary files a/Catch the button/bin/Debug/Catch the button.exe and b/Catch the button/bin/Debug/Catch the button.exe differ diff --git a/Catch the button/bin/Debug/Catch the button.pdb b/Catch the button/bin/Debug/Catch the button.pdb index ccb78fa..617b032 100644 Binary files a/Catch the button/bin/Debug/Catch the button.pdb and b/Catch the button/bin/Debug/Catch the button.pdb differ diff --git a/Catch the button/bin/Debug/resources/game-start.wav b/Catch the button/bin/Debug/resources/game-start.wav new file mode 100644 index 0000000..763ffee Binary files /dev/null and b/Catch the button/bin/Debug/resources/game-start.wav differ diff --git a/Catch the button/bin/Debug/resources/hit.wav b/Catch the button/bin/Debug/resources/hit.wav index 1a1aaba..8d69228 100644 Binary files a/Catch the button/bin/Debug/resources/hit.wav and b/Catch the button/bin/Debug/resources/hit.wav differ diff --git a/Catch the button/bin/Debug/resources/leaderboards.txt b/Catch the button/bin/Debug/resources/leaderboards.txt index 2d964e7..8e9e3f2 100644 --- a/Catch the button/bin/Debug/resources/leaderboards.txt +++ b/Catch the button/bin/Debug/resources/leaderboards.txt @@ -1 +1 @@ - ahoj:28 \ No newline at end of file +Helio:90 \ No newline at end of file diff --git a/Catch the button/bin/Debug/resources/miss.wav b/Catch the button/bin/Debug/resources/miss.wav index 6330126..13829b9 100644 Binary files a/Catch the button/bin/Debug/resources/miss.wav and b/Catch the button/bin/Debug/resources/miss.wav differ diff --git a/Catch the button/bin/Release/Catch the Button 2 Budge Osu edition.zip b/Catch the button/bin/Release/Catch the Button 2 Budge Osu edition.zip new file mode 100644 index 0000000..313135a Binary files /dev/null and b/Catch the button/bin/Release/Catch the Button 2 Budge Osu edition.zip differ diff --git a/Catch the button/bin/Release/Catch the button.exe b/Catch the button/bin/Release/Catch the button.exe index 2784a15..773b27f 100644 Binary files a/Catch the button/bin/Release/Catch the button.exe and b/Catch the button/bin/Release/Catch the button.exe differ diff --git a/Catch the button/bin/Release/Catch the button.pdb b/Catch the button/bin/Release/Catch the button.pdb index 3f3e673..75b1720 100644 Binary files a/Catch the button/bin/Release/Catch the button.pdb and b/Catch the button/bin/Release/Catch the button.pdb differ diff --git a/Catch the button/bin/Release/resources/game-start.wav b/Catch the button/bin/Release/resources/game-start.wav new file mode 100644 index 0000000..763ffee Binary files /dev/null and b/Catch the button/bin/Release/resources/game-start.wav differ diff --git a/Catch the button/bin/Release/resources/hit.wav b/Catch the button/bin/Release/resources/hit.wav new file mode 100644 index 0000000..8d69228 Binary files /dev/null and b/Catch the button/bin/Release/resources/hit.wav differ diff --git a/Catch the button/bin/Release/resources/leaderboards.txt b/Catch the button/bin/Release/resources/leaderboards.txt index 3ea7ea7..8e9e3f2 100644 --- a/Catch the button/bin/Release/resources/leaderboards.txt +++ b/Catch the button/bin/Release/resources/leaderboards.txt @@ -1,4 +1 @@ -test:69 -helo 000:38 -helio 2.9:28 -Helio 3.0 rev 2:82 \ No newline at end of file +Helio:90 \ No newline at end of file diff --git a/Catch the button/bin/Release/resources/levelup.wav b/Catch the button/bin/Release/resources/levelup.wav new file mode 100644 index 0000000..54047d5 Binary files /dev/null and b/Catch the button/bin/Release/resources/levelup.wav differ diff --git a/Catch the button/bin/Release/resources/miss.wav b/Catch the button/bin/Release/resources/miss.wav new file mode 100644 index 0000000..13829b9 Binary files /dev/null and b/Catch the button/bin/Release/resources/miss.wav differ diff --git a/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache b/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache index ed822d1..68dc497 100644 Binary files a/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache and b/Catch the button/obj/Debug/Catch the button.csproj.GenerateResource.cache differ diff --git a/Catch the button/obj/Debug/Catch the button.exe b/Catch the button/obj/Debug/Catch the button.exe index 0c7b144..5412e5e 100644 Binary files a/Catch the button/obj/Debug/Catch the button.exe and b/Catch the button/obj/Debug/Catch the button.exe differ diff --git a/Catch the button/obj/Debug/Catch the button.pdb b/Catch the button/obj/Debug/Catch the button.pdb index ccb78fa..617b032 100644 Binary files a/Catch the button/obj/Debug/Catch the button.pdb and b/Catch the button/obj/Debug/Catch the button.pdb differ diff --git a/Catch the button/obj/Release/Catch the button.csproj.CoreCompileInputs.cache b/Catch the button/obj/Release/Catch the button.csproj.CoreCompileInputs.cache index 300046c..32ea565 100644 --- a/Catch the button/obj/Release/Catch the button.csproj.CoreCompileInputs.cache +++ b/Catch the button/obj/Release/Catch the button.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -aabdfd7f744b6ad22ce51304f1c72f99ab00735e +7e7e98c865c1df8538bd0356387b4b01a47eae0b diff --git a/Catch the button/obj/Release/Catch the button.csproj.FileListAbsolute.txt b/Catch the button/obj/Release/Catch the button.csproj.FileListAbsolute.txt index 75ace05..eeb1ad4 100644 --- a/Catch the button/obj/Release/Catch the button.csproj.FileListAbsolute.txt +++ b/Catch the button/obj/Release/Catch the button.csproj.FileListAbsolute.txt @@ -20,3 +20,14 @@ C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Release\ C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.csproj.CoreCompileInputs.cache C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.exe C:\Users\vasik\Documents\GitHub\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.pdb +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Release\Catch the button.exe.config +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Release\Catch the button.exe +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\bin\Release\Catch the button.pdb +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.csproj.AssemblyReference.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch_the_button.Main.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch_the_button.LeaderDialog.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch_the_button.Properties.Resources.resources +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.csproj.GenerateResource.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.csproj.CoreCompileInputs.cache +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.exe +C:\Users\helio\Documents\Catch-the-Button-2\Catch the button\obj\Release\Catch the button.pdb diff --git a/Catch the button/obj/Release/Catch the button.csproj.GenerateResource.cache b/Catch the button/obj/Release/Catch the button.csproj.GenerateResource.cache index 116a641..dbbdef1 100644 Binary files a/Catch the button/obj/Release/Catch the button.csproj.GenerateResource.cache and b/Catch the button/obj/Release/Catch the button.csproj.GenerateResource.cache differ diff --git a/Catch the button/obj/Release/Catch the button.exe b/Catch the button/obj/Release/Catch the button.exe index 2784a15..773b27f 100644 Binary files a/Catch the button/obj/Release/Catch the button.exe and b/Catch the button/obj/Release/Catch the button.exe differ diff --git a/Catch the button/obj/Release/Catch the button.pdb b/Catch the button/obj/Release/Catch the button.pdb index 3f3e673..75b1720 100644 Binary files a/Catch the button/obj/Release/Catch the button.pdb and b/Catch the button/obj/Release/Catch the button.pdb differ