diff --git a/.cproject b/.cproject index ce07ed67..810e066a 100644 --- a/.cproject +++ b/.cproject @@ -116,7 +116,7 @@ - + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index fe87ca4d..2c38dd00 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/TODO b/TODO index 289f9a33..22201f33 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,6 @@ 1. Bring back some sort of GUI (at least ImGUI) 2. Proper `scripts/menu` -3. Fix GLEZ not working for some (shader error) 4. Locate most of the crashes 5. Make it catbot compatible diff --git a/libglez b/libglez index c0f71437..dd1055e0 160000 --- a/libglez +++ b/libglez @@ -1 +1 @@ -Subproject commit c0f714373c4cabfb6593198679facd3f4db08eaf +Subproject commit dd1055e0e900d942619f036742659225515d127a diff --git a/libxoverlay b/libxoverlay index 58c1b2a4..72ecdb8a 160000 --- a/libxoverlay +++ b/libxoverlay @@ -1 +1 @@ -Subproject commit 58c1b2a45c63f09bea1ecbcf486349881fbd4a82 +Subproject commit 72ecdb8a808caeac7c676efac845d815f16dd923 diff --git a/makefile b/makefile index e11580a2..e5125b5c 100644 --- a/makefile +++ b/makefile @@ -60,8 +60,8 @@ LDFLAGS=-shared -L$(realpath $(LIB_DIR)) SOURCES=$(shell find $(SRC_DIR) -name "*.c*" -print) ifndef CLANG -CXX=$(shell sh -c "which g++-6 || which g++") -CC=$(shell sh -c "which gcc-6 || which gcc") +CXX=$(shell sh -c "which g++-7 || which g++-6 || which g++") +CC=$(shell sh -c "which gcc-7 || which g++-6 || which gcc") LD=$(CXX) LDFLAGS+=-m32 -fno-gnu-unique else diff --git a/scripts/libs.txt b/scripts/libs.txt new file mode 100644 index 00000000..092bd989 --- /dev/null +++ b/scripts/libs.txt @@ -0,0 +1 @@ +libssl-dev:i386 libsdl2-dev libfreetype6-dev libfreetype6-dev:i386 libglew-dev libglew-dev:i386 \ No newline at end of file diff --git a/source-sdk-2013 b/source-sdk-2013 index 0d8dceea..039cf5f9 160000 --- a/source-sdk-2013 +++ b/source-sdk-2013 @@ -1 +1 @@ -Subproject commit 0d8dceea4310fde5706b3ce1c70609d72a38efdf +Subproject commit 039cf5f936d8d5ffe71a127fddc376dd8d53cc65 diff --git a/src/visual/drawing.cpp b/src/visual/drawing.cpp index 87ed83ec..491adbd9 100644 --- a/src/visual/drawing.cpp +++ b/src/visual/drawing.cpp @@ -84,7 +84,7 @@ void draw::Initialize() { g_IEngine->GetScreenSize(draw::width, draw::height); } - fonts::main_font = draw_api::create_font(DATA_PATH "/fonts/tahoma.ttf", 14); + fonts::main_font = draw_api::create_font(DATA_PATH "/fonts/verasans.ttf", 14); } bool draw::EntityCenterToScreen(CachedEntity *entity, Vector &out)