Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ayy #8

Merged
merged 5 commits into from Feb 4, 2021
Merged

Ayy #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a5ca89
Move & Make color picker boxes hot
Crazily Feb 4, 2021
b8e8c5b
Merge remote-tracking branch 'upstream/master'
Crazily Feb 4, 2021
de50af2
Move & make color picker boxes hot
Crazily Feb 4, 2021
58c1dfb
Move & make color picker boxes hot
Crazily Feb 4, 2021
0f6bdb5
Move & make color picker boxes hot
Crazily Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/menu/tabs/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ void Menu::drawMiscTab() {
ImGui::SameLine();ImGui::PopStyleVar();
ImGui::TextDisabled("Credits!");
if (ImGui::IsItemHovered())
ImGui::SetTooltip("sekc (ofcourse)\nAll other contributors on GitHub (cristeigabriel)\nand ocornut for his great ImGui UI framework");
ImGui::SetTooltip("sekc (ofcourse)\nAll other contributors on GitHub (cristeigabriel & crazily)\nand ocornut for his great ImGui UI framework");

ImGui::BeginChild("Trolling", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 260), true); {
ImGui::Text("Trolling");
Expand Down
54 changes: 35 additions & 19 deletions src/core/menu/tabs/visuals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ void Menu::drawVisualsTab() {
ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
ImGui::Text("ESP");
ImGui::Separator();
ImGui::ColorEdit4("##Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
if (CONFIGBOOL("Enemy:Box")) {
ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Enemy:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Box", &CONFIGBOOL("Enemy:Box"));
ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Enemy:DeadESP"));
ImGui::Checkbox("Name", &CONFIGBOOL("Enemy:Name"));
ImGui::Checkbox("Health", &CONFIGBOOL("Enemy:Health"));
ImGui::Checkbox("Health Bar", &CONFIGBOOL("Enemy:HealthBar"));
ImGui::Checkbox("Money", &CONFIGBOOL("Enemy:Money"));
ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Enemy:DeadESP"));
ImGui::EndChild();
}
ImGui::BeginChild("Chams", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
Expand All @@ -33,7 +35,7 @@ void Menu::drawVisualsTab() {
ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Enemy:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);

ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
ImGui::Text("Ignore Z");
ImGui::Text("Occluded");
ImGui::Combo("##IZMaterial", &CONFIGINT("Enemy:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
ImGui::SameLine();
ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Enemy:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
Expand All @@ -47,14 +49,17 @@ void Menu::drawVisualsTab() {
ImGui::BeginChild("ESP", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
ImGui::Text("ESP");
ImGui::Separator();
ImGui::ColorEdit4("##Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
if (CONFIGBOOL("Team:Box")) {
ImGui::ColorEdit4("Box Color", (float*)&CONFIGCOL("Team:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Box", &CONFIGBOOL("Team:Box"));
ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Team:DeadESP"));

ImGui::Checkbox("Name", &CONFIGBOOL("Team:Name"));
ImGui::Checkbox("Health", &CONFIGBOOL("Team:Health"));
ImGui::Checkbox("Health Bar", &CONFIGBOOL("Team:HealthBar"));
ImGui::Checkbox("Money", &CONFIGBOOL("Team:Money"));
ImGui::Checkbox("Only When Dead", &CONFIGBOOL("Team:DeadESP"));
ImGui::EndChild();
}
ImGui::BeginChild("Chams", ImVec2(ImGui::GetWindowContentRegionWidth() * 0.65f, 253), true); {
Expand All @@ -71,7 +76,7 @@ void Menu::drawVisualsTab() {
ImGui::ColorEdit4("##ChamsOverlayColor", (float*)&CONFIGCOL("Team:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);

ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.9f);
ImGui::Text("Ignore Z");
ImGui::Text("Occluded");
ImGui::Combo("##IZMaterial", &CONFIGINT("Team:IgnoreZChamsMaterial"), chamsMaterials, IM_ARRAYSIZE(chamsMaterials));
ImGui::SameLine();
ImGui::ColorEdit4("IgnoreZ Chams Primary Color", (float*)&CONFIGCOL("Team:IgnoreZChamsColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
Expand Down Expand Up @@ -105,36 +110,47 @@ void Menu::drawVisualsTab() {
ImGui::ColorEdit4("##WeaponOverlayColor", (float*)&CONFIGCOL("Weapon:ChamsOverlayColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() * 0.65f);

ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
ImGui::Checkbox("Spread Crosshair", &CONFIGBOOL("World:SpreadCrosshair"));
ImGui::SameLine();
ImGui::Checkbox("Recoil Crosshair", &CONFIGBOOL("World:RecoilCrosshair"));
if (CONFIGBOOL("World:SpreadCrosshair") || CONFIGBOOL("World:RecoilCrosshair")) {
ImGui::SameLine();
ImGui::ColorEdit4("##CrosshairColour", (float*)&CONFIGCOL("World:SpreadCrosshairColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
ImGui::ColorEdit4("##CrosshairBorderColour", (float*)&CONFIGCOL("World:SpreadCrosshairBorderColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
}
ImGui::EndChild();
}
ImGui::SameLine();
ImGui::BeginChild("Items", ImVec2(0, 253), true); {
ImGui::Text("Items");
ImGui::Separator();
if (CONFIGBOOL("Weapon:Box")) {
ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Weapon Box", &CONFIGBOOL("Weapon:Box"));
ImGui::ColorEdit4("Weapon Box Color", (float*)&CONFIGCOL("Weapon:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::Checkbox("Weapon Label", &CONFIGBOOL("Weapon:Name"));
ImGui::Separator();

if (CONFIGBOOL("PlantedC4:Box")) {
ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Planted C4 Box", &CONFIGBOOL("PlantedC4:Box"));
ImGui::ColorEdit4("Planted C4 Box Color", (float*)&CONFIGCOL("PlantedC4:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::Checkbox("Planted C4 Label", &CONFIGBOOL("PlantedC4:Name"));
ImGui::Separator();

if (CONFIGBOOL("Chicken:Box")) {
ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Chicken Box", &CONFIGBOOL("Chicken:Box"));
ImGui::ColorEdit4("Chicken Box Color", (float*)&CONFIGCOL("Chicken:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::Checkbox("Chicken Label", &CONFIGBOOL("Chicken:Name"));
ImGui::Separator();

if (CONFIGBOOL("Fish:Box")) {
ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::SameLine();
}
ImGui::Checkbox("Fish Box", &CONFIGBOOL("Fish:Box"));
ImGui::ColorEdit4("Fish Box Color", (float*)&CONFIGCOL("Fish:BoxColor"), ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::Checkbox("Fish Label", &CONFIGBOOL("Fish:Name"));
ImGui::Separator();

Expand Down