Skip to content

Commit

Permalink
peak license update
Browse files Browse the repository at this point in the history
  • Loading branch information
TheSillyDoggo committed Oct 1, 2024
1 parent a38d516 commit 4d5d364
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 54 deletions.
22 changes: 1 addition & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1 @@
MIT License

Copyright (c) 2024 im not putting my full name here

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
i do not give sorkopiko permission to use any code from this mod for their own use
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 1.7.0

- Fixed UI Button speed fading too fast
- Ported **No Camera Shake** To Windows and macOS
- Ported **Pulsing Menu** To Windows and macOS

# 1.6.9

- Fixed lag in game caused by custom fonts
Expand Down
2 changes: 1 addition & 1 deletion mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "3.7.1",
"version": "v1.6.9",
"version": "v1.7.0",
"gd": {
"win": "2.206",
"android": "2.206",
Expand Down
2 changes: 1 addition & 1 deletion src/Client/AndroidBall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void AndroidBall::UpdateVisible(bool i)

ColourUtility::pastel++;

btnOverlay->setColor(ColourUtility::getPastelColour(ColourUtility::pastel));
btnOverlay->setColor(ColourUtility::getPastelColour());
instance = this;

if (btn->getActionByTag(69))
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void Client::initImGui()
style->Colors[ImGuiCol_TitleBg] = ImVec4(20.0f / 255, 20.0f / 255, 20.0f / 255, 1);
style->ScrollbarSize = 8;

auto font = ImGui::GetIO().Fonts->AddFontFromFileTTF((Mod::get()->getResourcesDir() / "Poppins-Regular.ttf").string().c_str(), 20.0f);
auto font = ImGui::GetIO().Fonts->AddFontFromFileTTF((Mod::get()->getResourcesDir() / "Poppins-Regular.ttf").string().c_str(), 16.0f);
io->FontDefault = font;

sortWindows(true);
Expand Down
5 changes: 0 additions & 5 deletions src/Client/ClientSetup.h
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ class ClientUtils
"no-wave",
"no-particles",
"solid-wave",
"no-shake",
"custom-trans",
"menu-bg-blur",
"free-scroll",
Expand Down Expand Up @@ -574,10 +573,6 @@ class ClientUtils
#endif

#ifdef GEODE_IS_WINDOWS
//Client::GetModule("tps-bypass")->setIncompatible("This mod has <cr>not yet</c> been ported to <cl>Windows 2.206</c>");
//Client::GetModule("all-plat")->setIncompatible("This mod has <cr>not yet</c> been ported to <cl>2.206</c> on <cl>Windows</c>.");
Client::GetModule("no-shake")->setIncompatible("This mod has <cr>not yet</c> been ported to <cl>2.206</c> on <cl>Windows</c>.");
//Client::GetModule("custom-obj-limit")->setIncompatible("This mod has <cr>not yet</c> been ported to <cl>2.206</c> on <cl>Windows</c>.");

#endif

Expand Down
11 changes: 5 additions & 6 deletions src/Client/Types/InputModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ int imguiTextInputChanged(ImGuiInputTextCallbackData* data)

if (ImGui::IsKeyPressed(ImGuiKey_Backspace) && data->BufTextLen == 0)
playSound();

if (data->BufTextLen > mod->maxSize)
if (mod->text.size() > mod->maxSize)
{
mod->text = mod->text.substr(0, mod->maxSize);

playSound();
return 0;
}

return ret;
}

Expand All @@ -32,9 +31,9 @@ void InputModule::drawImGui()

auto t = text.c_str();

if (ImGui::InputText(name.c_str(), (char*)text.c_str(), maxSize, ImGuiInputTextFlags_CallbackAlways, imguiTextInputChanged))
if (ImGui::InputText(name.c_str(), (char*)text.c_str(), 127, ImGuiInputTextFlags_CallbackAlways, imguiTextInputChanged))
{

}
//text = t;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Defines/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#define QOLMOD_VERIFYHACK
#define QOLMOD_AUTOSONG
#define QOLMOD_NOJUSTDONT
#define QOLMOD_PULSINGMENU

#ifdef GEODE_IS_ANDROID
#define QOLMOD_PULSINGMENU
#define QOLMOD_SHOWLAYOUT
#endif

Expand Down
43 changes: 25 additions & 18 deletions src/Hacks/NoCamera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,40 @@

using namespace geode::prelude;

class $modify (EffectGameObject)
{
//edit_eStaticBtn_001.png
};

Module* shake = nullptr;
Module* stati = nullptr;
#ifdef GEODE_IS_WINDOWS
#define APPLY_SHAKE_INLINE
#endif

class $modify (GJBaseGameLayer)
{
#ifdef GEODE_IS_ANDROID
void applyShake(cocos2d::CCPoint& p0)
#ifdef APPLY_SHAKE_INLINE

void updateCamera(float physDeltaX60)
{
if (!shake)
shake = Client::GetModule("no-shake");
m_gameState.m_cameraShakeFactor = 0;
m_gameState.m_cameraShakeEnabled = false;

if (!shake->enabled)
GJBaseGameLayer::applyShake(p0);
GJBaseGameLayer::updateCamera(physDeltaX60);
}

#else

void applyShake(cocos2d::CCPoint& p0)
{

}

#endif

QOLMOD_MOD_ALL_HOOKS("no-shake")
};

class $modify (GJBaseGameLayer)
{
void updateStaticCameraPos(cocos2d::CCPoint p0, bool p1, bool p2, bool p3, float p4, int p5, float p6)
{
if (!stati)
stati = Client::GetModule("no-static");

if (!stati->enabled)
GJBaseGameLayer::updateStaticCameraPos(p0, p1, p2, p3, p4, p5, p6);

}

QOLMOD_MOD_ALL_HOOKS("no-static")
};
6 changes: 6 additions & 0 deletions src/Hacks/PulsingTitle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ class MenuPulse : public CCNode

void update(float dt)
{
#ifdef GEODE_IS_WINDOWS
MBO(bool, engine, 0x218) = true;
#else
engine->enableMetering();
#endif

engine->update(dt);

float met = MBO(float, engine, offset);
Expand All @@ -74,6 +79,7 @@ class $modify (MenuLayer)
if (!MenuLayer::init())
return false;


FMODAudioEngine::sharedEngine()->enableMetering();

auto mp = MenuPulse::create();
Expand Down

0 comments on commit 4d5d364

Please sign in to comment.