From 350596b94f3d886812cb453e05540a16c3db5e5b Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 5 Mar 2013 17:23:03 -0500 Subject: Add cloud menu background by Krisi, configurable with the menu_clouds option. Also add a menuheader, menusplash, menufooter_clouds, and allow HD menu footers. And finally don't git-ignore textures/base/. --- src/guiMainMenu.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index c2e68579e..4accbaa27 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -209,7 +209,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) changeCtype(""); // Version - //if(m_data->selected_tab != TAB_CREDITS) { core::rect rect(0, 0, size.X, 40); rect += v2s32(4, 0); @@ -219,7 +218,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) } //v2s32 center(size.X/2, size.Y/2); - v2s32 c800(size.X/2-400, size.Y/2-300); + v2s32 c800(size.X/2-400, size.Y/2-270); m_topleft_client = c800 + v2s32(90, 70+50+30); m_size_client = v2s32(620, 270); @@ -237,7 +236,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20); // Tabs -#if 1 { core::rect rect(0, 0, m_size_client.X, 30); rect += m_topleft_client + v2s32(0, -30); @@ -250,7 +248,6 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) e->addTab(wgettext("Credits")); e->setActiveTab(m_data->selected_tab); } -#endif if(m_data->selected_tab == TAB_SINGLEPLAYER) { @@ -786,15 +783,15 @@ void GUIMainMenu::drawMenu() driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); } video::ITexture *logotexture = - driver->getTexture(getTexturePath("menulogo.png").c_str()); + driver->getTexture(getTexturePath("logo.png").c_str()); if(logotexture) { v2s32 logosize(logotexture->getOriginalSize().Width, logotexture->getOriginalSize().Height); - logosize *= 2; + core::rect rect(0,0,logosize.X,logosize.Y); rect += AbsoluteRect.UpperLeftCorner + m_topleft_client; - rect += v2s32(130, 50); + rect += v2s32(500, 30); driver->draw2DImage(logotexture, rect, core::rect(core::position2d(0,0), core::dimension2di(logotexture->getSize())), -- cgit v1.2.3 From 16c031be770fcacb0b46d6543d3299a9e3399085 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 14 Mar 2013 16:15:09 -0400 Subject: Remove 'tape and glue', update Credits tab --- src/guiMainMenu.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 12 deletions(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 4accbaa27..79170d99a 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -42,6 +42,40 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "subgame.h" +#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0])) + +const wchar_t *contrib_core_strs[] = { + L"Perttu Ahola (celeron55) ", + L"Ryan Kwolek (kwolekr) ", + L"PilzAdam ", + L"Ilya Zhuravlev (thexyz) ", + L"Lisa Milne (darkrose) " +}; + +const wchar_t *contrib_active_strs[] = { + L"RealBadAngel ", + L"sfan5 ", + L"sapier ", + L"proller ", + L"Vanessa Ezekowitz (VanessaE) ", + L"Jurgen Doser (doserj) ", + L"ShadowNinja", + L"dannydark ", + L"Jeija ", + L"MirceaKitsune " +}; + +const wchar_t *contrib_previous_strs[] = { + L"kahrl ", + L"Giuseppe Bilotta (Oblomov) ", + L"Jonathan Neuschafer ", + L"Nils Dagsson Moskopp (erlehmann) ", + L"Constantin Wenger (SpeedProg) ", + L"matttpt ", + L"JacobF " +}; + + struct CreateWorldDestMainMenu : public CreateWorldDest { CreateWorldDestMainMenu(GUIMainMenu *menu): @@ -256,7 +290,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) core::rect rect(0, 0, 10, m_size_client.Y); rect += m_topleft_client + v2s32(15, 0); //const wchar_t *text = L"H\nY\nB\nR\nI\nD"; - const wchar_t *text = L"T\nA\nP\nE\n\nA\nN\nD\n\nG\nL\nU\nE"; + const wchar_t *text = L"S\nI\nN\nG\nL\nE\n \nP\nL\nA\nY\nE\nR\n"; gui::IGUIStaticText *t = Environment->addStaticText(text, rect, false, true, this, -1); t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER); @@ -703,7 +737,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) { // CREDITS { - core::rect rect(0, 0, 10, m_size_client.Y); + core::rect rect(0, 0, 9, m_size_client.Y); rect += m_topleft_client + v2s32(15, 0); const wchar_t *text = L"C\nR\nE\nD\nI\nT\nS"; gui::IGUIStaticText *t = @@ -711,15 +745,34 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER); } { - core::rect rect(0, 0, 454, 250); - rect += m_topleft_client + v2s32(110, 50+35); - Environment->addStaticText(narrow_to_wide( - "Minetest " VERSION_STRING "\n" - "http://minetest.net/\n" - "\n" - "by Perttu Ahola \n" - "and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschäfer, thexyz, VanessaE, sfan5... and tens of more random people." - ).c_str(), rect, false, true, this, -1); + core::rect rect(0, 0, 130, 70); + rect += m_topleft_client + v2s32(35, 160); + Environment->addStaticText( + L"Minetest " VERSION_STRING "\nhttp://minetest.net/", + rect, false, true, this, -1); + } + { + video::SColor yellow(255, 255, 255, 0); + core::rect rect(0, 0, 450, 260); + rect += m_topleft_client + v2s32(168, 5); + + irr::gui::IGUIListBox *list = Environment->addListBox(rect, this); + + list->addItem(L"Core Developers"); + list->setItemOverrideColor(list->getItemCount() - 1, yellow); + for (int i = 0; i != ARRAYLEN(contrib_core_strs); i++) + list->addItem(contrib_core_strs[i]); + list->addItem(L""); + list->addItem(L"Active Contributors"); + list->setItemOverrideColor(list->getItemCount() - 1, yellow); + for (int i = 0; i != ARRAYLEN(contrib_active_strs); i++) + list->addItem(contrib_active_strs[i]); + list->addItem(L""); + list->addItem(L"Previous Contributors"); + list->setItemOverrideColor(list->getItemCount() - 1, yellow); + for (int i = 0; i != ARRAYLEN(contrib_previous_strs); i++) + list->addItem(contrib_previous_strs[i]); + list->addItem(L""); } } @@ -791,7 +844,7 @@ void GUIMainMenu::drawMenu() core::rect rect(0,0,logosize.X,logosize.Y); rect += AbsoluteRect.UpperLeftCorner + m_topleft_client; - rect += v2s32(500, 30); + rect += v2s32(50, 60); driver->draw2DImage(logotexture, rect, core::rect(core::position2d(0,0), core::dimension2di(logotexture->getSize())), -- cgit v1.2.3 From f98d0433f9a72c09eddad319763e750e2deb19a3 Mon Sep 17 00:00:00 2001 From: proller Date: Sat, 23 Mar 2013 17:37:50 +0400 Subject: Random guest name and finite liquid checkbox --- src/guiMainMenu.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 79170d99a..9e6b01dd6 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -140,6 +140,7 @@ enum GUI_ID_SHADERS_CB, GUI_ID_PRELOAD_ITEM_VISUALS_CB, GUI_ID_ENABLE_PARTICLES_CB, + GUI_ID_LIQUID_FINITE_CB, GUI_ID_DAMAGE_CB, GUI_ID_CREATIVE_CB, GUI_ID_PUBLIC_CB, @@ -430,6 +431,10 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) e->setDrawBackground(true); if (m_data->serverlist_show_available == false) m_data->servers = ServerList::getLocal(); +#if USE_CURL + else + m_data->servers = ServerList::getOnline(); +#endif updateGuiServerList(); e->setSelected(0); } @@ -722,6 +727,13 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) GUI_ID_ENABLE_PARTICLES_CB, wgettext("Enable Particles")); } + { + core::rect rect(0, 0, option_w+20+20, 30); + rect += m_topleft_client + v2s32(option_x+175*2, option_y+20*3); + Environment->addCheckBox(m_data->liquid_finite, rect, this, + GUI_ID_LIQUID_FINITE_CB, wgettext("Finite liquid")); + } + // Key change button { core::rect rect(0, 0, 120, 30); @@ -968,6 +980,12 @@ void GUIMainMenu::readInput(MainMenuData *dst) dst->enable_particles = ((gui::IGUICheckBox*)e)->isChecked(); } + { + gui::IGUIElement *e = getElementFromId(GUI_ID_LIQUID_FINITE_CB); + if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX) + dst->liquid_finite = ((gui::IGUICheckBox*)e)->isChecked(); + } + { gui::IGUIElement *e = getElementFromId(GUI_ID_WORLD_LISTBOX); if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX) -- cgit v1.2.3 From ca7043e52d6a5d0ee1b91f287371fbe7f216697e Mon Sep 17 00:00:00 2001 From: Mukul Sati Date: Sat, 23 Mar 2013 02:24:31 -0400 Subject: Set of changes to build mineTest using Visual Studio 11.0. These affect the following: 1. String concatenation in guiMainMenu.cpp - it is required for all individual strings to be of the same type ; adding explicit L qualifier before the other strings. 2. Correcting type of BlockMakeData to struct in place of class forward declarations. This information is used for name decoration by Visual Studio, leading to linker errors in case of mismatches. 3. Windows headers define max as a macro somewhere, leading to a compile time error in profiler.h; using () around function to prevent macro match from occurring. --- src/guiMainMenu.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 9e6b01dd6..5dc73cd96 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -43,6 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "subgame.h" #define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0])) +#define LSTRING(x) LSTRING_(x) +#define LSTRING_(x) L##x const wchar_t *contrib_core_strs[] = { L"Perttu Ahola (celeron55) ", @@ -760,7 +762,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) core::rect rect(0, 0, 130, 70); rect += m_topleft_client + v2s32(35, 160); Environment->addStaticText( - L"Minetest " VERSION_STRING "\nhttp://minetest.net/", + L"Minetest " LSTRING(VERSION_STRING) L"\nhttp://minetest.net/", rect, false, true, this, -1); } { -- cgit v1.2.3 From 3640c8c051bc6b72f4af52752b2d48ced274f539 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 14:35:35 -0400 Subject: Update Credits tab --- src/guiMainMenu.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 5dc73cd96..49028fc5b 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -51,20 +51,21 @@ const wchar_t *contrib_core_strs[] = { L"Ryan Kwolek (kwolekr) ", L"PilzAdam ", L"Ilya Zhuravlev (thexyz) ", - L"Lisa Milne (darkrose) " + L"Lisa Milne (darkrose) ", + L"Maciej Kasatkin (RealBadAngel) ", + L"proller " }; const wchar_t *contrib_active_strs[] = { - L"RealBadAngel ", L"sfan5 ", L"sapier ", - L"proller ", L"Vanessa Ezekowitz (VanessaE) ", L"Jurgen Doser (doserj) ", + L"Jeija ", + L"MirceaKitsune ", L"ShadowNinja", L"dannydark ", - L"Jeija ", - L"MirceaKitsune " + L"0gb.us <0gb.us@0gb.us>" }; const wchar_t *contrib_previous_strs[] = { -- cgit v1.2.3 From e17ae475cf8cec3f724bf99f6a52e49a19d99d91 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 30 Mar 2013 18:09:38 +0100 Subject: GUI: Make singleplayer default tab, store selected serverlist, show title of serverlist --- src/guiMainMenu.cpp | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 49028fc5b..579e6092d 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -157,6 +157,7 @@ enum GUI_ID_SERVERLIST, GUI_ID_SERVERLIST_TOGGLE, GUI_ID_SERVERLIST_DELETE, + GUI_ID_SERVERLIST_TITLE, }; enum @@ -427,16 +428,37 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) changeCtype(""); // Server List { - core::rect rect(0, 0, 390, 160); - rect += m_topleft_client + v2s32(50, 10); + core::rect rect(0, 0, 390, 140); + rect += m_topleft_client + v2s32(50, 30); gui::IGUIListBox *e = Environment->addListBox(rect, this, GUI_ID_SERVERLIST); e->setDrawBackground(true); - if (m_data->serverlist_show_available == false) - m_data->servers = ServerList::getLocal(); #if USE_CURL - else + if(m_data->selected_serverlist == SERVERLIST_FAVORITES) { + m_data->servers = ServerList::getLocal(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Favorites:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } + } else { m_data->servers = ServerList::getOnline(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Public Server List:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } + } +#else + m_data->servers = ServerList::getLocal(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Favorites:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } #endif updateGuiServerList(); e->setSelected(0); @@ -474,7 +496,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_TOGGLE, wgettext("Show Public")); e->setIsPushButton(true); - if (m_data->serverlist_show_available) + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) { e->setText(wgettext("Show Favorites")); e->setPressed(); @@ -487,7 +509,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) rect += m_topleft_client + v2s32(50+260+10, 180); gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_DELETE, wgettext("Delete")); - if (m_data->serverlist_show_available) // Hidden on Show-Online mode + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // Hidden when on public list e->setVisible(false); } // Start game button @@ -1154,25 +1176,28 @@ bool GUIMainMenu::OnEvent(const SEvent& event) gui::IGUIElement *togglebutton = getElementFromId(GUI_ID_SERVERLIST_TOGGLE); gui::IGUIElement *deletebutton = getElementFromId(GUI_ID_SERVERLIST_DELETE); gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST); - if (m_data->serverlist_show_available) // switch to favorite list + gui::IGUIElement *title = getElementFromId(GUI_ID_SERVERLIST_TITLE); + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // switch to favorite list { m_data->servers = ServerList::getLocal(); togglebutton->setText(wgettext("Show Public")); + title->setText(wgettext("Favorites:")); deletebutton->setVisible(true); updateGuiServerList(); serverlist->setSelected(0); + m_data->selected_serverlist = SERVERLIST_FAVORITES; } else // switch to online list { m_data->servers = ServerList::getOnline(); togglebutton->setText(wgettext("Show Favorites")); + title->setText(wgettext("Public Server List:")); deletebutton->setVisible(false); updateGuiServerList(); serverlist->setSelected(0); + m_data->selected_serverlist = SERVERLIST_PUBLIC; } serverListOnSelected(); - - m_data->serverlist_show_available = !m_data->serverlist_show_available; } #endif } -- cgit v1.2.3 From 1aa50b13622c1e264044839ecdf0152670dae6ce Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 30 Mar 2013 18:56:29 +0100 Subject: Make the textbox for serverlist title wider --- src/guiMainMenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 579e6092d..4c2030039 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -437,7 +437,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) if(m_data->selected_serverlist == SERVERLIST_FAVORITES) { m_data->servers = ServerList::getLocal(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Favorites:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); @@ -445,7 +445,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) } else { m_data->servers = ServerList::getOnline(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Public Server List:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); @@ -454,7 +454,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) #else m_data->servers = ServerList::getLocal(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Favorites:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); -- cgit v1.2.3