From 10391eddf48fa3771f5e2bb7be6604afa800c2aa Mon Sep 17 00:00:00 2001 From: Cfauto Date: Mon, 15 Jun 2026 19:43:49 +0200 Subject: [PATCH] Various fixes --- .github/workflows/build.yml | 4 +- README.md | 60 +++++++++------------------ appframework/glmrendererinfo_osx.mm | 2 +- engine/masterserver.cpp | 3 +- materialsystem/shaderapiempty/wscript | 4 ++ serverbrowser/wscript | 2 +- thirdparty | 2 +- vgui2/vgui_controls/RichText.cpp | 6 +++ wscript | 8 ++-- 9 files changed, 40 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1dff5036..f1cd8d50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build +name: Build Half-Life 2 on: [push, pull_request] env: @@ -122,4 +122,4 @@ jobs: name: windows${{matrix.bits}}${{matrix.flags}} path: | build_hl2 - !build_hl2/**/*.pdb \ No newline at end of file + !build_hl2/**/*.pdb diff --git a/README.md b/README.md index a29954bb..0aecc0aa 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,28 @@ # Source Engine -[![GitHub Actions Status](https://github.com/nillerusr/source-engine/actions/workflows/build.yml/badge.svg)](https://github.com/nillerusr/source-engine/actions/workflows/build.yml) [![GitHub Actions Status](https://github.com/nillerusr/source-engine/actions/workflows/tests.yml/badge.svg)](https://github.com/nillerusr/source-engine/actions/workflows/tests.yml) - Discord: [![Discord Server](https://img.shields.io/discord/672055862608658432.svg)](https://discord.gg/hZRB7WMgGw) +[![GitHub Actions Status](https://github.com/Cfauto28/source-engine/actions/workflows/build.yml/badge.svg)](https://github.com/Cfauto28/source-engine/actions/workflows/build.yml) [![GitHub Actions Status](https://github.com/Cfauto28/source-engine/actions/workflows/tests.yml/badge.svg)](https://github.com/Cfauto28/source-engine/actions/workflows/tests.yml) - -Information from [wikipedia](https://wikipedia.org/wiki/Source_(game_engine)): - -Source is a 3D game engine developed by Valve. -It debuted as the successor to GoldSrc with Half-Life: Source in June 2004, -followed by Counter-Strike: Source and Half-Life 2 later that year. -Source does not have a concise version numbering scheme; instead, it was released in incremental versions - Source code is based on TF2 2018 leak. Don't use it for commercial purposes. This project is using waf buildsystem. If you have waf-related questions look https://waf.io/book # Features: -- Android, OSX, FreeBSD, Windows, Linux( glibc, musl ) support -- Arm support( except windows ) -- 64bit support -- Modern toolchains support -- Fixed many undefined behaviours -- Touch support( even on windows/linux/osx ) -- VTF 7.5 support -- PBR support -- bsp v19-v21 support( bsp v21 support is partial, portal 2 and csgo maps works fine ) -- mdl v46-49 support -- Removed useless/unnecessary dependencies -- Achivement system working without steam -- Fixed many bugs -- Serverbrowser works without steam +- [x] Android, macOS, FreeBSD, Windows, Linux (glibc, musl) support +- [x] Arm support (except windows) +- [x] 64bit support +- [x] Modern toolchains support +- [x] Fixed many undefined behaviours +- [x] Touch support (even on windows/linux/macos) +- [x] VTF 7.5 support +- [x] PBR support +- [x] bsp v19-v21 support (bsp v21 support is partial, portal 2 and csgo maps work fine) +- [x] mdl v46-49 support +- [x] Removed useless/unnecessary dependencies +- [x] Achivement system working without steam +- [x] Fixed many bugs +- [x] Serverbrowser works without steam +- [x] VScript support (based on the Mapbase implementation) +- [ ] Rewrite materialsystem for OpenGL render +- [ ] dxvk-native support +- [ ] Elbrus port +- [ ] Bink audio support (for video_bink) -# Current tasks -- Rewrite materialsystem for OpenGL render -- dxvk-native support -- Elbrus port -- Bink audio support( for video_bink ) - -# How to Build? -- [Building instructions(EN)](https://github.com/nillerusr/source-engine/wiki/Source-Engine-(EN)) -- [Building instructions(RU)](https://github.com/nillerusr/source-engine/wiki/Source-Engine-(RU)) - -# Support me -BTC: `bc1qnjq92jj9uqjtafcx2zvnwd48q89hgtd6w8a6na` - -ETH: `0x5d0D561146Ed758D266E59B56e85Af0b03ABAF46` - -XMR: `48iXvX61MU24m5VGc77rXQYKmoww3dZh6hn7mEwDaLVTfGhyBKq2teoPpeBq6xvqj4itsGh6EzNTzBty6ZDDevApCFNpsJ` diff --git a/appframework/glmrendererinfo_osx.mm b/appframework/glmrendererinfo_osx.mm index a36f6249..c5164871 100644 --- a/appframework/glmrendererinfo_osx.mm +++ b/appframework/glmrendererinfo_osx.mm @@ -24,7 +24,7 @@ #include "tier1/utllinkedlist.h" #include "togl/rendermechanism.h" #include "appframework/ilaunchermgr.h" // gets pulled in from glmgr.h -#include "appframework/iappsystemgroup.h" +#include "appframework/IAppSystemGroup.h" #include "inputsystem/ButtonCode.h" diff --git a/engine/masterserver.cpp b/engine/masterserver.cpp index da87a0e8..de909e10 100644 --- a/engine/masterserver.cpp +++ b/engine/masterserver.cpp @@ -31,8 +31,7 @@ extern ConVar sv_lan; static char g_MasterServers[][64] = { "185.192.97.130:27010", - "168.138.92.21:27016", - "135.125.188.162:27010" + "ms.workbench.network:27010" }; #ifdef DEDICATED diff --git a/materialsystem/shaderapiempty/wscript b/materialsystem/shaderapiempty/wscript index 5d927359..ad9c6097 100755 --- a/materialsystem/shaderapiempty/wscript +++ b/materialsystem/shaderapiempty/wscript @@ -18,6 +18,10 @@ def configure(conf): ]) def build(bld): + + if bld.env.DEST_OS == 'android': + return + source = [ 'shaderapiempty.cpp', '../../public/tier0/memoverride.cpp' diff --git a/serverbrowser/wscript b/serverbrowser/wscript index abeb6297..87c071ae 100755 --- a/serverbrowser/wscript +++ b/serverbrowser/wscript @@ -60,7 +60,7 @@ def build(bld): bld.shlib( source = source, - target = PROJECT_NAME, + target = PROJECT_NAME.lower() if bld.env.DEST_OS == 'darwin' else PROJECT_NAME, name = PROJECT_NAME, features = 'c cxx', includes = includes, diff --git a/thirdparty b/thirdparty index cafff0e4..c5b901ec 160000 --- a/thirdparty +++ b/thirdparty @@ -1 +1 @@ -Subproject commit cafff0e47374dbfc190c2b0e6a422a91b8864fa3 +Subproject commit c5b901ecef515ea068fa8b8a19ca5cd5353905cb diff --git a/vgui2/vgui_controls/RichText.cpp b/vgui2/vgui_controls/RichText.cpp index 20bb89d4..6a78d77d 100644 --- a/vgui2/vgui_controls/RichText.cpp +++ b/vgui2/vgui_controls/RichText.cpp @@ -862,6 +862,12 @@ void RichText::Paint() if ( m_LineBreaks.IsValidIndex( lineBreakIndexIndex ) && m_LineBreaks[lineBreakIndexIndex] < iLim ) iLim = m_LineBreaks[lineBreakIndexIndex]; + // Stop when entering or exiting the selected range + if ( i < selection0 && iLim >= selection0 ) + iLim = selection0; + if ( i >= selection0 && i < selection1 && iLim >= selection1 ) + iLim = selection1; + // Handle non-drawing characters specially for ( int iT = i; iT < iLim; iT++ ) { diff --git a/wscript b/wscript index ff6ae8fd..6f14c43c 100644 --- a/wscript +++ b/wscript @@ -7,7 +7,7 @@ from waflib import Logs, Context, Configure import sys import os -VERSION = '1.0' +VERSION = '1.17' APPNAME = 'source-engine' top = '.' @@ -66,7 +66,7 @@ projects={ 'launcher', 'launcher_main', 'materialsystem', -# 'materialsystem/shaderapiempty', + 'materialsystem/shaderapiempty', 'materialsystem/shaderapidx9', 'materialsystem/shaderlib', 'materialsystem/stdshaders', @@ -305,8 +305,8 @@ def options(opt): grp.add_option('--use-togl', action = 'store', dest = 'GL', type = 'int', default = sys.platform != 'win32', help = 'build engine with ToGL [default: %default]') - grp.add_option('--build-games', action = 'store', dest = 'GAMES', type = 'string', default = 'hl2', - help = 'build games [default: %default]') + grp.add_option('--game', action = 'store', dest = 'GAMES', type = 'string', default = 'hl2', + help = 'build game [default: %default]') grp.add_option('--use-ccache', action = 'store_true', dest = 'CCACHE', default = False, help = 'build using ccache [default: %default]')