From e3d358411e0256cb906e1b99383a9e6f6d44ce2e Mon Sep 17 00:00:00 2001 From: Grinch_ Date: Fri, 4 Feb 2022 11:24:50 +0600 Subject: [PATCH] version 3.1 prep --- README.md | 4 +++- src/cheatmenu.cpp | 57 +++++++++++++++++++++++--------------------- src/dllmain.cpp | 3 +-- src/version.h | 4 ++-- tools/DebugAll.bat | 20 ++++++++-------- tools/DebugIII.bat | 4 ++-- tools/DebugVC.bat | 4 ++-- tools/ReleaseAll.bat | 10 ++++---- tools/ReleaseIII.bat | 2 +- tools/ReleaseVC.bat | 2 +- 10 files changed, 57 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 938c3a4..e0f7cca 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,8 @@ You can either open a issue here or directly contact me on discord (Recommended) 3. [MinHook](https://github.com/TsudaKageyu/minhook) 4. [Plugin SDK](https://github.com/DK22Pac/plugin-sdk) +All credits are given in Menu/About tab. + ## Images
Show Images @@ -92,7 +94,7 @@ You can either open a issue here or directly contact me on discord (Recommended) ## How to add ___ to CheatMenu (SA Only) -*Be careful about editing 'json' files, especially commas! Check [here](https://en.wikipedia.org/wiki/JSON)* +*Be careful about editing 'json' files, especially commas! Check [here](https://en.wikipedia.org/wiki/JSON). Use [Magic TXD](https://gtaforums.com/topic/851436-relopensrc-magictxd/) to open **.txd** files* ### Player Skins (Recommended) *If you just want more player skins without much hassel use this* diff --git a/src/cheatmenu.cpp b/src/cheatmenu.cpp index 48edbd0..d21ca31 100644 --- a/src/cheatmenu.cpp +++ b/src/cheatmenu.cpp @@ -226,33 +226,10 @@ void CheatMenu::ShowAnniversaryPage() Ui::CenterdText("Happy Anniversary!"); ImGui::NewLine(); - ImGui::TextWrapped("On this day, in 2019, the first public version of menu was released in MixMods Forum." -" It's been a blast working on it and I've learned a lot in the process.\n\nThanks to you and everyone who used or" -" contributed to the modification in any form or shape."); - - ImGui::NewLine(); - ImGui::TextWrapped("Feel free to star the GitHub repo or join the discord server and provide feedback, ideas, or suggestions."); - ImGui::NewLine(); - - if (ImGui::Button("Discord server", ImVec2(Ui::GetSize(2)))) - { - ShellExecute(nullptr, "open", DISCORD_INVITE, nullptr, nullptr, SW_SHOWNORMAL); - } - - ImGui::SameLine(); - - if (ImGui::Button("GitHub repo", ImVec2(Ui::GetSize(2)))) - { - ShellExecute(nullptr, "open", GITHUB_LINK, nullptr, nullptr, SW_SHOWNORMAL); - } - - ImGui::NewLine(); - - static bool showHistory = false; - ImGui::Checkbox("Show backstory", &showHistory); - + static bool showHistory; if (showHistory) { + ImGui::Checkbox("Show backstory", &showHistory); ImGui::BeginChild("BACKSTORY"); ImGui::TextWrapped("I wanted to share the backstory behind the initial idea or plan behind the menu." " This is gonna be long so feel free to skip it if you're not interested."); @@ -265,11 +242,11 @@ void CheatMenu::ShowAnniversaryPage() ImGui::TextWrapped("In 2018, I finally got an opportunity to learn CLEO or GTA3Script after Junior released" " his tutorial. I started from basics but it soon became apparent that due to the limitations of CLEO, creating menus were" -"really tedious."); +" really tedious."); ImGui::NewLine(); ImGui::TextWrapped("Later that year I found Moonloader, which had ImGui support. Meaning I could make menus" -" without brainfucking myself (kudos to everyone who writes 100s of lines in CLEO). I recall starting working on" +" without brain fucking myself (kudos to everyone who writes 100s of lines in CLEO). I recall starting working on" " the menu in October/November that same year."); ImGui::NewLine(); @@ -286,6 +263,32 @@ void CheatMenu::ShowAnniversaryPage() ImGui::EndChild(); } + else + { + ImGui::TextWrapped("On this day, in 2019, the first public version of menu was released in MixMods Forum." + " It's been a blast working on it and I've learned a lot in the process.\n\nThanks to you and everyone who used or" + " contributed to the modification in any form or shape."); + + ImGui::NewLine(); + ImGui::TextWrapped("Feel free to star the GitHub repo or join the discord server and provide feedback, ideas, or suggestions."); + ImGui::NewLine(); + + if (ImGui::Button("Discord server", ImVec2(Ui::GetSize(2)))) + { + ShellExecute(nullptr, "open", DISCORD_INVITE, nullptr, nullptr, SW_SHOWNORMAL); + } + + ImGui::SameLine(); + + if (ImGui::Button("GitHub repo", ImVec2(Ui::GetSize(2)))) + { + ShellExecute(nullptr, "open", GITHUB_LINK, nullptr, nullptr, SW_SHOWNORMAL); + } + + ImGui::NewLine(); + + ImGui::Checkbox("Show backstory", &showHistory); + } } void CheatMenu::ShowWelcomePage() diff --git a/src/dllmain.cpp b/src/dllmain.cpp index db67e3d..1be790c 100644 --- a/src/dllmain.cpp +++ b/src/dllmain.cpp @@ -61,7 +61,6 @@ void MenuThread(void* param) CheatMenu menu; - // Checking for updates once a day SYSTEMTIME st; GetSystemTime(&st); @@ -73,8 +72,8 @@ void MenuThread(void* param) while (true) { - Sleep(5000); Updater::Process(); + Sleep(5000); } } diff --git a/src/version.h b/src/version.h index c60e589..1e8505b 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,6 @@ #pragma once #define MENU_NAME "Cheat Menu" #define MENU_VERSION_NUMBER "3.1" -#define MENU_VERSION MENU_VERSION_NUMBER"-beta" -#define BUILD_NUMBER "20220128" +#define MENU_VERSION MENU_VERSION_NUMBER +#define BUILD_NUMBER "20220204" #define MENU_TITLE MENU_NAME " v" MENU_VERSION diff --git a/tools/DebugAll.bat b/tools/DebugAll.bat index 793ac0c..6a7ee05 100644 --- a/tools/DebugAll.bat +++ b/tools/DebugAll.bat @@ -7,13 +7,13 @@ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug del %SA_DIR%"\CheatMenuSA.asi" /Q del %SA_DIR%"\CheatMenuSA.pdb" /Q -del %SA_DIR%"\CheatMenuVC.asi" /Q -del %SA_DIR%"\CheatMenuVC.pdb" /Q -del %SA_DIR%"\CheatMenuIII.asi" /Q -del %SA_DIR%"\CheatMenuIII.pdb" /Q -%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y \ No newline at end of file +del %VC_DIR%"\CheatMenuVC.asi" /Q +del %VC_DIR%"\CheatMenuVC.pdb" /Q +del %III_DIR%"\CheatMenuIII.asi" /Q +del %III_DIR%"\CheatMenuIII.pdb" /Q +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.pdb" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/DebugIII.bat b/tools/DebugIII.bat index e51df04..0e3d4b8 100644 --- a/tools/DebugIII.bat +++ b/tools/DebugIII.bat @@ -5,7 +5,7 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuIII -del %SA_DIR%"\CheatMenuIII.asi" /Q -del %SA_DIR%"\CheatMenuIII.pdb" /Q +del %III_DIR%"\CheatMenuIII.asi" /Q +del %III_DIR%"\CheatMenuIII.pdb" /Q %systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y %systemroot%\System32\xcopy /s "bin\CheatMenuIII.pdb" %III_DIR% /K /D /H /Y diff --git a/tools/DebugVC.bat b/tools/DebugVC.bat index 5d892bd..d7ae609 100644 --- a/tools/DebugVC.bat +++ b/tools/DebugVC.bat @@ -5,7 +5,7 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Debug /t:CheatMenuVC -del %SA_DIR%"\CheatMenuVC.asi" /Q -del %SA_DIR%"\CheatMenuVC.pdb" /Q +del %VC_DIR%"\CheatMenuVC.asi" /Q +del %VC_DIR%"\CheatMenuVC.pdb" /Q %systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y %systemroot%\System32\xcopy /s "bin\CheatMenuVC.pdb" %VC_DIR% /K /D /H /Y diff --git a/tools/ReleaseAll.bat b/tools/ReleaseAll.bat index f7f6002..41e54c5 100644 --- a/tools/ReleaseAll.bat +++ b/tools/ReleaseAll.bat @@ -6,8 +6,8 @@ echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release del %SA_DIR%"\CheatMenuSA.asi" /Q -del %SA_DIR%"\CheatMenuVC.asi" /Q -del %SA_DIR%"\CheatMenuIII.asi" /Q -%systemroot%\System32\xcopy /s "build\bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y -%systemroot%\System32\xcopy /s "build\bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y \ No newline at end of file +del %VC_DIR%"\CheatMenuVC.asi" /Q +del %III_DIR%"\CheatMenuIII.asi" /Q +%systemroot%\System32\xcopy /s "bin\CheatMenuSA.asi" %SA_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y +%systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y \ No newline at end of file diff --git a/tools/ReleaseIII.bat b/tools/ReleaseIII.bat index 408424a..1dc143b 100644 --- a/tools/ReleaseIII.bat +++ b/tools/ReleaseIII.bat @@ -5,5 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuIII -del %SA_DIR%"\CheatMenuIII.asi" /Q +del %III_DIR%"\CheatMenuIII.asi" /Q %systemroot%\System32\xcopy /s "bin\CheatMenuIII.asi" %III_DIR% /K /D /H /Y diff --git a/tools/ReleaseVC.bat b/tools/ReleaseVC.bat index 25612c2..902306e 100644 --- a/tools/ReleaseVC.bat +++ b/tools/ReleaseVC.bat @@ -5,5 +5,5 @@ echo -------------------------------------------------- echo[ call "tools\Setup.bat" MsBuild CheatMenu.sln /property:Configuration=Release /t:CheatMenuVC -del %SA_DIR%"\CheatMenuVC.asi" /Q +del %VC_DIR%"\CheatMenuVC.asi" /Q %systemroot%\System32\xcopy /s "bin\CheatMenuVC.asi" %VC_DIR% /K /D /H /Y