From 6400fc71a04ca4be4b08ef10a77e4e22e3641b7a Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 27 Jul 2013 14:26:54 +0100 Subject: [PATCH 1/6] Added extra ignores for git. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 567609b12..8b1ed026b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ build/ +MCServer/MCServer + From 265fa6d750ffca7d6a95859f352e46b804c3c63f Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 27 Jul 2013 22:32:07 +0100 Subject: [PATCH 2/6] Fixed Window Titles being MCS-* For example, MCS-Chest, MCS-DoubleChest, etc. --- source/UI/Window.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp index d09c57337..415ce08ff 100644 --- a/source/UI/Window.cpp +++ b/source/UI/Window.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Window.h" @@ -682,7 +681,7 @@ void cWindow::BroadcastInventoryProgress(short a_Progressbar, short a_Value) // cInventoryWindow: cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : - cWindow(cWindow::Inventory, "MCS-Inventory"), + cWindow(cWindow::Inventory, "Inventory"), m_Player(a_Player) { m_SlotAreas.push_back(new cSlotAreaCrafting(2, *this)); // The creative inventory doesn't display it, but it's still counted into slot numbers @@ -699,7 +698,7 @@ cInventoryWindow::cInventoryWindow(cPlayer & a_Player) : // cCraftingWindow: cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : - cWindow(cWindow::Workbench, "MCS-Workbench") + cWindow(cWindow::Workbench, "Crafting Table") { m_SlotAreas.push_back(new cSlotAreaCrafting(3, *this)); m_SlotAreas.push_back(new cSlotAreaInventory(*this)); @@ -714,7 +713,7 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) : // cChestWindow: cChestWindow::cChestWindow(cChestEntity * a_Chest) : - cWindow(cWindow::Chest, "MCS-SingleChest"), + cWindow(cWindow::Chest, "Chest"), m_World(a_Chest->GetWorld()), m_BlockX(a_Chest->GetPosX()), m_BlockY(a_Chest->GetPosY()), @@ -736,7 +735,7 @@ cChestWindow::cChestWindow(cChestEntity * a_Chest) : cChestWindow::cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_SecondaryChest) : - cWindow(cWindow::Chest, "MCS-DoubleChest"), + cWindow(cWindow::Chest, "Double Chest"), m_World(a_PrimaryChest->GetWorld()), m_BlockX(a_PrimaryChest->GetPosX()), m_BlockY(a_PrimaryChest->GetPosY()), @@ -775,7 +774,7 @@ cChestWindow::~cChestWindow() // cDropSpenserWindow: cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cDropSpenserEntity * a_DropSpenser) : - cWindow(cWindow::DropSpenser, "MCS-DropSpenser") + cWindow(cWindow::DropSpenser, "Dropspenser") { m_ShouldDistributeToHotbarFirst = false; m_SlotAreas.push_back(new cSlotAreaItemGrid(a_DropSpenser->GetContents(), *this)); @@ -791,7 +790,7 @@ cDropSpenserWindow::cDropSpenserWindow(int a_BlockX, int a_BlockY, int a_BlockZ, // cHopperWindow: cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEntity * a_Hopper) : - super(cWindow::Hopper, "MCS-Hopper") + super(cWindow::Hopper, "Hopper") { m_ShouldDistributeToHotbarFirst = false; m_SlotAreas.push_back(new cSlotAreaItemGrid(a_Hopper->GetContents(), *this)); @@ -807,7 +806,7 @@ cHopperWindow::cHopperWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cHopperEn // cFurnaceWindow: cFurnaceWindow::cFurnaceWindow(int a_BlockX, int a_BlockY, int a_BlockZ, cFurnaceEntity * a_Furnace) : - cWindow(cWindow::Furnace, "MCS-Furnace") + cWindow(cWindow::Furnace, "Furnace") { m_ShouldDistributeToHotbarFirst = false; m_SlotAreas.push_back(new cSlotAreaFurnace(a_Furnace, *this)); From b5c38e98fb7627e971712983c581fe7fe5c3c9bd Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:25:25 +0100 Subject: [PATCH 3/6] Added some more root .gitignores. --- .gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b1ed026b..bde685901 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ build/ MCServer/MCServer - +ChunkWorxSave.ini +doxy/ +Profiling +SymSrv +cloc-ignored.txt +cloc.xml +cloc.xsl From 79a0afd953723543510643e784f44fcb5a1a1040 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:26:47 +0100 Subject: [PATCH 4/6] Added a .gitignore for the MCServer directory. --- MCServer/.gitignore | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 MCServer/.gitignore diff --git a/MCServer/.gitignore b/MCServer/.gitignore new file mode 100644 index 000000000..e455b8cdc --- /dev/null +++ b/MCServer/.gitignore @@ -0,0 +1,20 @@ +*.exe +ChunkWorx.ini +ChunkWorxSave.ini +MCServer +banned.ini +logs +players +whitelist.ini +world +API.txt +*.dat +schematics +*.schematic +*.ilk +*.pdb +memdump.xml +*.grab +ProtectionAreas.ini +ProtectionAreas.sqlite +helgrind.log From 74a3de203bd253aabfb37b4aa1757caa00e6f360 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:31:10 +0100 Subject: [PATCH 5/6] Added a .gitignore for the VC2008 folder. --- VC2008/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 VC2008/.gitignore diff --git a/VC2008/.gitignore b/VC2008/.gitignore new file mode 100644 index 000000000..3b3be3257 --- /dev/null +++ b/VC2008/.gitignore @@ -0,0 +1,5 @@ +Debug/ +Release/ +*.user +*.ncb +*.suo From 534cddf4c1157b579eb5c56372ad395a86a78fd4 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sun, 28 Jul 2013 10:32:03 +0100 Subject: [PATCH 6/6] Added a .gitignore for the anvilstats folder. --- Tools/AnvilStats/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Tools/AnvilStats/.gitignore diff --git a/Tools/AnvilStats/.gitignore b/Tools/AnvilStats/.gitignore new file mode 100644 index 000000000..4ed720fed --- /dev/null +++ b/Tools/AnvilStats/.gitignore @@ -0,0 +1,5 @@ +.xls +Statistics.txt +*.bmp +Profiling +*.png