diff --git a/Help/gzdb/compilingtheeditor.html b/Help/gzdb/compilingtheeditor.html index 98bebab7..95b3b4cc 100644 --- a/Help/gzdb/compilingtheeditor.html +++ b/Help/gzdb/compilingtheeditor.html @@ -23,8 +23,8 @@

Optional software:

Obtaining the source:

- The GZDoom Builder source code is hosted on SourceForge and is available through SVN at the following location: - 
https://svn.code.sf.net/p/doombuilder/code/branches/GZDoomBuilder
- If you don't want to use a SVN client, head to https://sourceforge.net/p/doombuilder/code/HEAD/tree/branches/GZDoomBuilder/ and press "Download Snapshot" button. + The GZDoom Builder source code is hosted at GitHub (https://github.com/m-x-d/GZDoom-Builder).

Quick start guide:

- This guide assumes you are using Visual Studio 2008 / Visual C# 2008 Express Edition and Tortiose SVN. + This guide assumes you are using Visual Studio 2008 / Visual C# 2008 Express Edition and TortioseGit.
    -
  1. Create an empty folder, right click on it and choose "SVN Checkout..." from the context menu.
    2. -
  2. Enter "https://svn.code.sf.net/p/doombuilder/code/branches/GZDoomBuilder" in the "URL of repository" field and click OK.
    3. +
  3. Create an empty folder, right click on it and choose "GIT Clone..." from the context menu.
    4. +
  4. Enter "https://github.com/m-x-d/GZDoom-Builder.git" in the "URL" field, click OK and wait for the source to download.
  5. Open "Builder.sln" in the Visual Studio and make sure it compiles and runs (click the green "Play" button, or press F5).
    6. -
  6. If you've made some code changes and want to submit them to the main GZDB repository, you can make a diff patch (right-click on the GZDB source folder and choose "TortioseSVN -> Create patch...") and post it at the official GZDB thread at ZDoom.org (http://forum.zdoom.org/viewtopic.php?f=3&t=32392&start=999999).
    7. +
  7. If you are planning to submit your changes to the main GZDoom Builder repository, it's recomeded to fork GZDoom Builder at GitHub, make the changes, then submit a Pull Request.

Batch files:

GZDB source comes with several batch files, which can be used to automatically compile and package the editor. Before launching a batch file for the first time, make sure to open it and check that variables holding software paths point to the right directories. These variables are always located near the top of the file, after the info block. diff --git a/README.md b/README.md index a5555040..f0f31a5a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,20 @@ -Comprehensive map editor for Doom, Heretic, Hexen and Strife based games mainly geared towards GZDoom source port. -Includes 3D editing mode and various other modern tools and techniques such as script editors with syntax highlighting and auto-complete. +System requirements: +• 2.4 GHz CPU or faster (multi-core recommended). +• Windows XP, Vista, 7, 8 or 10. +• Graphics card with Pixel Shader model 2.0 support. + +Required software: +• Microsoft .Net Framework 3.5 (http://www.microsoft.com/download/en/details.aspx?id=25150). +• DirectX 9.0 Runtime (https://www.microsoft.com/en-us/download/details.aspx?id=35&44F86079-8679-400C-BFF2-9CA5F2BCBDFC=1). + +Official thread at ZDoom.org: +• http://forum.zdoom.org/viewtopic.php?f=3&t=32392 + +Unofficial thread at iddqd.ru (in russian): +• http://i.iddqd.ru/viewtopic.php?t=522 + +Git builds at DRDTeam.org: +• http://devbuilds.drdteam.org/doombuilder2-gzdb/ + +More detailed info can be found in the editor documentation (Refmanual.chm). -Based on Doom Builder 2 by CodeImp (http://www.doombuilder.com/). diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index 399be930..e5b00d3d 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -1215,6 +1215,7 @@ + @@ -1440,7 +1441,12 @@ - call "%25VSINSTALLDIR%25\Common7\Tools\vsvars32.bat" -EDITBIN.EXE /NOLOGO /LARGEADDRESSAWARE "$(TargetPath)" + if exist "%25VS140COMNTOOLS%25" call "%25VS140COMNTOOLS%25vsvars32.bat" +else if exist "%25VS120COMNTOOLS%25" call "%25VS120COMNTOOLS%25vsvars32.bat" +else if exist "%25VS110COMNTOOLS%25" call "%25VS110COMNTOOLS%25vsvars32.bat" +else if exist "%25VS100COMNTOOLS%25" call "%25VS100COMNTOOLS%25vsvars32.bat" +else if exist "%25VS90COMNTOOLS%25" call "%25VS90COMNTOOLS%25vsvars32.bat" + +editbin.exe /NOLOGO /LARGEADDRESSAWARE "$(TargetPath)" \ No newline at end of file diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs index 84245c71..9576ba51 100644 --- a/Source/Core/Properties/Resources.Designer.cs +++ b/Source/Core/Properties/Resources.Designer.cs @@ -375,6 +375,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap Github { + get { + object obj = ResourceManager.GetObject("Github", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Grid2 { get { object obj = ResourceManager.GetObject("Grid2", resourceCulture); diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx index 437f6422..6c4646f9 100644 --- a/Source/Core/Properties/Resources.resx +++ b/Source/Core/Properties/Resources.resx @@ -613,4 +613,7 @@ ..\Resources\Folder96Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Github.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Source/Core/Resources/Github.png b/Source/Core/Resources/Github.png new file mode 100644 index 00000000..d778fdc2 Binary files /dev/null and b/Source/Core/Resources/Github.png differ diff --git a/Source/Core/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs index 6ba01aac..be888cc3 100644 --- a/Source/Core/Windows/AboutForm.Designer.cs +++ b/Source/Core/Windows/AboutForm.Designer.cs @@ -37,8 +37,10 @@ namespace CodeImp.DoomBuilder.Windows this.codeimplink = new System.Windows.Forms.LinkLabel(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.gitlink = new System.Windows.Forms.LinkLabel(); + this.label2 = new System.Windows.Forms.Label(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.gzdbLink = new System.Windows.Forms.LinkLabel(); + this.zdoomorglink = new System.Windows.Forms.LinkLabel(); this.copyversion = new System.Windows.Forms.Button(); this.version = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); @@ -146,9 +148,11 @@ namespace CodeImp.DoomBuilder.Windows // // tabPage1 // + this.tabPage1.Controls.Add(this.gitlink); + this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(pictureBox3); this.tabPage1.Controls.Add(this.pictureBox4); - this.tabPage1.Controls.Add(this.gzdbLink); + this.tabPage1.Controls.Add(this.zdoomorglink); this.tabPage1.Controls.Add(this.copyversion); this.tabPage1.Controls.Add(this.version); this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); @@ -160,6 +164,28 @@ namespace CodeImp.DoomBuilder.Windows this.tabPage1.Text = "About GZDoom Builder"; this.tabPage1.UseVisualStyleBackColor = true; // + // gitlink + // + this.gitlink.AutoSize = true; + this.gitlink.LinkColor = System.Drawing.SystemColors.HotTrack; + this.gitlink.Location = new System.Drawing.Point(169, 181); + this.gitlink.Name = "gitlink"; + this.gitlink.Size = new System.Drawing.Size(134, 13); + this.gitlink.TabIndex = 18; + this.gitlink.TabStop = true; + this.gitlink.Text = "Project page at github.com"; + this.gitlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gitlink_LinkClicked); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(14, 135); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(286, 26); + this.label2.TabIndex = 17; + this.label2.Text = "GZDoom Builder is designed and programmed by MaxED.\r\nGZDoom Builder uses game con" + + "figurations created by Gez."; + // // pictureBox4 // this.pictureBox4.Image = global::CodeImp.DoomBuilder.Properties.Resources.MLogo; @@ -170,20 +196,17 @@ namespace CodeImp.DoomBuilder.Windows this.pictureBox4.TabIndex = 16; this.pictureBox4.TabStop = false; // - // gzdbLink + // zdoomorglink // - this.gzdbLink.AutoSize = true; - this.gzdbLink.LinkArea = new System.Windows.Forms.LinkArea(110, 152); - this.gzdbLink.LinkColor = System.Drawing.SystemColors.HotTrack; - this.gzdbLink.Location = new System.Drawing.Point(11, 136); - this.gzdbLink.Name = "gzdbLink"; - this.gzdbLink.Size = new System.Drawing.Size(309, 42); - this.gzdbLink.TabIndex = 15; - this.gzdbLink.TabStop = true; - this.gzdbLink.Text = "GZDoom Builder is designed and programmed by MaxED.\r\nGZDoom Builder uses game con" + - "figurations created by Gez.\r\nOfficial thread at ZDoom.org"; - this.gzdbLink.UseCompatibleTextRendering = true; - this.gzdbLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gzdbLink_LinkClicked); + this.zdoomorglink.AutoSize = true; + this.zdoomorglink.LinkColor = System.Drawing.SystemColors.HotTrack; + this.zdoomorglink.Location = new System.Drawing.Point(14, 181); + this.zdoomorglink.Name = "zdoomorglink"; + this.zdoomorglink.Size = new System.Drawing.Size(140, 13); + this.zdoomorglink.TabIndex = 15; + this.zdoomorglink.TabStop = true; + this.zdoomorglink.Text = "Official thread at ZDoom.org"; + this.zdoomorglink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.zdoomorglink_LinkClicked); // // copyversion // @@ -261,9 +284,11 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.PictureBox pictureBox4; - private System.Windows.Forms.LinkLabel gzdbLink; + private System.Windows.Forms.LinkLabel zdoomorglink; private System.Windows.Forms.Button copyversion; private System.Windows.Forms.Label version; private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.LinkLabel gitlink; } } \ No newline at end of file diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs index b541c0bb..8a548289 100644 --- a/Source/Core/Windows/AboutForm.cs +++ b/Source/Core/Windows/AboutForm.cs @@ -53,11 +53,17 @@ namespace CodeImp.DoomBuilder.Windows } //mxd - private void gzdbLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + private void zdoomorglink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { General.OpenWebsite("http://forum.zdoom.org/viewtopic.php?f=3&t=32392"); } + //mxd + private void gitlink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + General.OpenWebsite("https://github.com/m-x-d/GZDoom-Builder"); + } + // This copies the version number to clipboard private void copyversion_Click(object sender, EventArgs e) { diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs index 699ccfbf..5fc8e34b 100644 --- a/Source/Core/Windows/MainForm.Designer.cs +++ b/Source/Core/Windows/MainForm.Designer.cs @@ -147,6 +147,7 @@ namespace CodeImp.DoomBuilder.Windows this.itemhelpeditmode = new System.Windows.Forms.ToolStripMenuItem(); this.itemhelpcheckupdates = new System.Windows.Forms.ToolStripMenuItem(); this.seperatorhelpmanual = new System.Windows.Forms.ToolStripSeparator(); + this.itemhelpissues = new System.Windows.Forms.ToolStripMenuItem(); this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem(); this.toolbar = new System.Windows.Forms.ToolStrip(); this.toolbarContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -1231,6 +1232,7 @@ namespace CodeImp.DoomBuilder.Windows this.itemShortcutReference, this.itemopenconfigfolder, this.itemhelpeditmode, + this.itemhelpissues, this.itemhelpcheckupdates, this.seperatorhelpmanual, this.itemhelpabout}); @@ -1286,6 +1288,14 @@ namespace CodeImp.DoomBuilder.Windows this.seperatorhelpmanual.Name = "seperatorhelpmanual"; this.seperatorhelpmanual.Size = new System.Drawing.Size(229, 6); // + // itemhelpissues + // + this.itemhelpissues.Image = global::CodeImp.DoomBuilder.Properties.Resources.Github; + this.itemhelpissues.Name = "itemhelpissues"; + this.itemhelpissues.Size = new System.Drawing.Size(232, 22); + this.itemhelpissues.Text = "&GitHub issues tracker"; + this.itemhelpissues.Click += new System.EventHandler(this.itemhelpissues_Click); + // // itemhelpabout // this.itemhelpabout.Image = global::CodeImp.DoomBuilder.Properties.Resources.About; @@ -2799,6 +2809,7 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.ToolStripMenuItem itemclosemap; private System.Windows.Forms.Timer redrawtimer; private System.Windows.Forms.ToolStripMenuItem menuhelp; + private System.Windows.Forms.ToolStripMenuItem itemhelpissues; private System.Windows.Forms.ToolStripMenuItem itemhelpabout; private System.Windows.Forms.ToolStripMenuItem itemhelpcheckupdates; private CodeImp.DoomBuilder.Controls.RenderTargetControl display; diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs index f3252634..6c238f77 100644 --- a/Source/Core/Windows/MainForm.cs +++ b/Source/Core/Windows/MainForm.cs @@ -3091,6 +3091,12 @@ namespace CodeImp.DoomBuilder.Windows { UpdateChecker.PerformCheck(true); } + + //mxd. Github issues clicked + private void itemhelpissues_Click(object sender, EventArgs e) + { + General.OpenWebsite("https://github.com/m-x-d/GZDoom-Builder/issues"); + } // About clicked private void itemhelpabout_Click(object sender, EventArgs e)