Merge remote changes with local

This commit is contained in:
dexyfex
2018-08-15 09:00:05 +10:00
Unverified
21 changed files with 2107 additions and 120 deletions
+11
View File
@@ -78,6 +78,7 @@
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.YmapNewEntityMenu = new System.Windows.Forms.ToolStripMenuItem();
this.YmapNewCarGenMenu = new System.Windows.Forms.ToolStripMenuItem();
this.YmapNewGrassBatchMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.YmapAddToProjectMenu = new System.Windows.Forms.ToolStripMenuItem();
this.YmapRemoveFromProjectMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -522,6 +523,7 @@
this.toolStripSeparator11,
this.YmapNewEntityMenu,
this.YmapNewCarGenMenu,
this.YmapNewGrassBatchMenu,
this.toolStripSeparator12,
this.YmapAddToProjectMenu,
this.YmapRemoveFromProjectMenu});
@@ -558,6 +560,14 @@
this.YmapNewCarGenMenu.Text = "New Car Generator";
this.YmapNewCarGenMenu.Click += new System.EventHandler(this.YmapNewCarGenMenu_Click);
//
// YmapNewGrassBatchMenu
//
this.YmapNewGrassBatchMenu.Enabled = false;
this.YmapNewGrassBatchMenu.Name = "YmapNewGrassBatchMenu";
this.YmapNewGrassBatchMenu.Size = new System.Drawing.Size(199, 22);
this.YmapNewGrassBatchMenu.Text = "New Grass Batch";
this.YmapNewGrassBatchMenu.Click += new System.EventHandler(this.YmapNewGrassBatchMenu_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
@@ -1324,6 +1334,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
private System.Windows.Forms.ToolStripMenuItem ScenarioAddToProjectMenu;
private System.Windows.Forms.ToolStripMenuItem ScenarioRemoveFromProjectMenu;
private System.Windows.Forms.ToolStripMenuItem YmapNewGrassBatchMenu;
private System.Windows.Forms.ToolStripMenuItem ToolsNavMeshGeneratorMenu;
}
}