-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathLunarLander.Designer.cs
147 lines (135 loc) · 5.41 KB
/
LunarLander.Designer.cs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
<<<<<<< HEAD
namespace LunarLander
{
partial class LunarLander
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.updateTimer = new System.Windows.Forms.Timer(this.components);
this.gameScreen = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.gameScreen)).BeginInit();
this.SuspendLayout();
//
// updateTimer
//
this.updateTimer.Enabled = true;
this.updateTimer.Interval = 50;
this.updateTimer.Tick += new System.EventHandler(this.timer);
//
// gameScreen
//
this.gameScreen.Location = new System.Drawing.Point(-2, 1);
this.gameScreen.Name = "gameScreen";
this.gameScreen.Size = new System.Drawing.Size(1686, 760);
this.gameScreen.TabIndex = 0;
this.gameScreen.TabStop = false;
//
// LunarLander
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
this.ClientSize = new System.Drawing.Size(1684, 761);
this.Controls.Add(this.gameScreen);
this.Name = "LunarLander";
this.Text = "Form1";
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.keyDown);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.keyUp);
((System.ComponentModel.ISupportInitialize)(this.gameScreen)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Timer updateTimer;
private System.Windows.Forms.PictureBox gameScreen;
}
}
=======
namespace LunarLander
{
partial class LunarLander
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.updateTimer = new System.Windows.Forms.Timer(this.components);
this.gameScreen = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.gameScreen)).BeginInit();
this.SuspendLayout();
//
// updateTimer
//
this.updateTimer.Enabled = true;
this.updateTimer.Interval = 50;
this.updateTimer.Tick += new System.EventHandler(this.timer);
//
// gameScreen
//
this.gameScreen.Location = new System.Drawing.Point(-2, 1);
this.gameScreen.Name = "gameScreen";
this.gameScreen.Size = new System.Drawing.Size(805, 450);
this.gameScreen.TabIndex = 0;
this.gameScreen.TabStop = false;
//
// LunarLander
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.gameScreen);
this.Name = "LunarLander";
this.Text = "Form1";
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.keyDown);
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.keyUp);
((System.ComponentModel.ISupportInitialize)(this.gameScreen)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Timer updateTimer;
private System.Windows.Forms.PictureBox gameScreen;
}
}
>>>>>>> f911a7e2a17b228e7d4e8e1b6c4ed4cb05192dd6