mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-21 23:58:51 -05:00
Code Issues Projects Releases Wiki Activity

fetch imgui (#4094)

Browse Source
This commit is contained in:
briaguya 2024-04-30 22:49:54 -04:00 committed by GitHub
parent c70e6d280a
commit 8480f37f77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit 5b67a45fc47d8d6e86d104651d83d0939d807ae4
Subproject commit 8b4a7a627b36abbc21955bed8adc59eaf9385fcb

2
soh/soh/Enhancements/audio/AudioEditor.h
View File

@ -7,7 +7,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <imgui.h>
#include "AudioCollection.h"
class AudioEditor : public Ship::GuiWindow {

2
soh/soh/Enhancements/controls/InputViewer.cpp
View File

@ -7,7 +7,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <imgui.h>
#include <spdlog/spdlog.h>
#include <cmath>

2
soh/soh/Enhancements/controls/SohInputEditorWindow.h
View File

@ -5,7 +5,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <imgui.h>
#include <unordered_map>
#include <string>
#include <vector>

4
soh/soh/Enhancements/debugconsole.cpp
View File

@ -20,8 +20,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <imgui.h>
#include <imgui_internal.h>
#undef PATH_HACK
#undef Path

4
soh/soh/Enhancements/game-interactor/GameInteractor_Remote.cpp
View File

@ -2,8 +2,8 @@
#include "GameInteractor.h"
#include <spdlog/spdlog.h>
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <imgui.h>
#include <imgui_internal.h>
#include <unordered_map>
#include <tuple>
#include <type_traits>

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -15,8 +15,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <imgui.h>
#include <imgui_internal.h>
#include "../custom-message/CustomMessageTypes.h"
#include "../item-tables/ItemTableManager.h"
#include "../presets.h"

2
soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp
View File

@ -1,5 +1,5 @@
#include "ResolutionEditor.h"
#include <ImGui/imgui.h>
#include <imgui.h>
#include <libultraship/libultraship.h>
#include <soh/UIWidgets.hpp>

2
soh/soh/OTRGlobals.cpp
View File

@ -319,7 +319,7 @@ OTRGlobals::OTRGlobals() {
context->InitConsole();
auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>("gControllerConfigurationEnabled", "Input Editor");
context->InitWindow(sohInputEditorWindow);
context->InitWindow({ sohInputEditorWindow });
auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f);

4
soh/soh/SohGui.cpp
View File

@ -11,8 +11,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <imgui.h>
#include <imgui_internal.h>
#include <libultraship/libultraship.h>
#include <Fast3D/gfx_pc.h>

2
soh/soh/SohMenuBar.cpp
View File

@ -2,7 +2,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include "ImGui/imgui.h"
#include <imgui.h>
#include "regex"
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/libultraship.h>

2
soh/soh/SohModals.cpp
View File

@ -1,5 +1,5 @@
#include "SohModals.h"
#include "ImGui/imgui.h"
#include <imgui.h>
#include <vector>
#include <string>
#include <libultraship/bridge.h>

4
soh/soh/UIWidgets.cpp
View File

@ -10,8 +10,8 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <imgui.h>
#include <imgui_internal.h>
#include <libultraship/libultraship.h>
#include <libultraship/libultra/types.h>

2
soh/soh/UIWidgets.hpp
View File

@ -16,7 +16,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <ImGui/imgui.h>
#include <imgui.h>
namespace UIWidgets {