Remove all vgui limitation because we switch to freevgui here

Same flag is used in gl4es's CMakeLists

.gitmodules

@@ -46,3 +46,6 @@
 [submodule "3rdparty/mbedtls/mbedtls"]
 	path = 3rdparty/mbedtls/mbedtls
 	url = https://github.com/FWGS/mbedtls-releases.git
+[submodule "3rdparty/freevgui"]
+	path = 3rdparty/freevgui
+	url = https://github.com/FWGS/freevgui.git

3rdparty/gl4es/wscript

@@ -16,6 +16,8 @@ def build(bld):
 	cflags = []
 	if bld.env.COMPILER_CC != 'msvc':
 		cflags += ['-w', '-fvisibility=hidden', '-std=gnu99']
+	else:
+		cflags += ['-wd4098']
 	bld.stlib(source   = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
 		target   = 'gl4es',
 		includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'],

Documentation/opensource-mods.md

@@ -38,6 +38,9 @@ Mirrored on github - https://github.com/solidi/hl-mods/tree/master/cir
 ## Counter-Life
 Available on ModDB - https://www.moddb.com/mods/counter-life/downloads/cl-version-1-source-code
 
+## Crack-Life Anniversary Campaign
+Available on ModDB - https://www.moddb.com/mods/crack-life/downloads/crack-life-anniversary-campaign-sdk
+
 ## Cthulhu
 Uploaded to github by Oleg Cherkasky - https://github.com/gunrunners-paradise/Cthulhu-HLmod-SDK
 
@@ -85,12 +88,21 @@ Available on ModDB - https://www.moddb.com/mods/half-life-echoes
 ## Half-Life: Expanded Arsenal
 Available on ModDB - https://www.moddb.com/mods/half-life-expanded-arsenal
 
+## Half-Life: Featureful
+Branch **featureful** in halflife-featureful - https://github.com/FreeSlave/halflife-featureful
+
 ## Half-Life: Field Intensity
 Branch **field_intensity_1.7** in halflife-featureful - https://github.com/FreeSlave/halflife-featureful/tree/field_intensity_1.7
 
 ## Half-Life: Gravgun mod
 Branch **gravgun** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/gravgun
 
+## Half-Life: Induction
+Version 1.4: Branch **induction** in halflife-featureful - https://github.com/FreeSlave/halflife-featureful/tree/induction
+
+## Half-Life: Insecure
+Version 1.5 is available on ModDB - https://www.moddb.com/mods/half-life-insecure/downloads/half-life-insecure-map-tools-and-source-code-ver-15
+
 ## Half-Life: Invasion
 Official github repository - https://github.com/jlecorre/hlinvasion
 
@@ -109,6 +121,9 @@ Official github repository - https://github.com/Fograin/hl-subsmod-ex
 ## Half-Life: Rally
 Official gitlab repository - https://gitlab.com/hlrally/src
 
+## Half-Life: Reprocessing
+Official github repository - https://github.com/EgorYak/ReprocessingSourceCode
+
 ## Half-Life: RXT
 Available on ModDB - https://www.moddb.com/mods/half-life-rxt/downloads/rxt-source-code-v57
 
@@ -147,6 +162,9 @@ Mirrored on github (Includes maps and models source files) - https://github.com/
 ## Ingram Chillin' Mod
 Official SourceForge repository - https://sourceforge.net/projects/icm-hl/
 
+## Intense Force
+Branch **intense_force** in halflife-featureful - https://github.com/FreeSlave/halflife-featureful/tree/intense_force
+
 ## Master Sword
 Official github repository of Master Sword Classic - https://github.com/BerntA/MasterSwordClassic
 
@@ -189,6 +207,9 @@ Available in Valve's Half-Life repository - https://github.com/ValveSoftware/hal
 ## Spirit of Half-Life
 [Logic&Trick's](https://github.com/LogicAndTrick) mirror - https://files.logic-and-trick.com/#/Half-Life/Mods/Spirit%20of%20Half-Life
 
+## The Last Bullet
+Official github repository - https://github.com/GT-Project-Cat/The-Last-Bullet-Updated-Code
+
 ## The Wastes
 Version 1.5: mirrored on code.idtech.space - https://code.idtech.space/vera/halflife-thewastes-sdk
 
@@ -212,6 +233,19 @@ Download page on official site - http://www.thothie.com/ww/
 ## Wrong Door
 Available on ModDB - https://www.moddb.com/mods/wrong-door/downloads/wrong-door-sdk
 
+## XDM
+*This mod is opensource but access to source code is always rebus*
+
+How to get sources of version 3.0.4.3:
+
+Download SFX-archive from ModDB - https://www.moddb.com/mods/xdm/downloads/xdm3043
+
+Extract it.
+
+Open client.dll in HEX-editor and patch header - change `Win!` to `Rar!`
+
+Extract it using unrar - password `iamtheone` 
+
 ## XashXT
 Mirrored on github - https://github.com/a1batross/XashXT_original
 
@@ -301,7 +335,7 @@ Unkle Mike's recreation - https://hlfx.ru/forum/showthread.php?s=&threadid=5253
 Reverse-engineered code: branch **bshift** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bshift
 
 ## Half-Life: Induction
-Branch **induction** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction
+Version 1.0-1.2: Branch **induction_1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/induction_1.2
 
 ## Half-Life: Opposing Force
 Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/hlsdk-xash3d
@@ -375,6 +409,9 @@ Branch **aghl** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/
 ## Bubblemod
 Branch **bubblemod** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/bubblemod
 
+## Counter-Life
+Branch **counter-life** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/counter-life
+
 ## Deathmatch Classic
 Deathmatch Classic: Adrenaline Gamer Edition - https://github.com/martinwebrant/agmod/tree/master/src/dmc
 
@@ -388,6 +425,9 @@ Branch **delta_particles** in hlsdk-portable - https://github.com/FWGS/hlsdk-por
 ## Half-Life: Echoes
 Branch **echoes** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/echoes
 
+## Half-Life: Insecure
+Branch **insecure** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/insecure
+
 ## Half-Life: Invasion
 Port to HLSDK 2.4 by malortie - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-invasion
 
@@ -423,4 +463,3 @@ Branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tr
 
 ## Zombie-X
 Branch **zombie-x** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/zombie-x
-

Documentation/supported-mod-list.md

@@ -892,6 +892,8 @@ Currently, fresh Xash3D FWGS builds for Android, PS Vita and Nintendo Switch use
 ## List of games and mods with custom gamedll
 For mods from this category - first of all place mod folder beside **valve** folder.
 
+NOTE: Precompiled libraries for some mods from this category may be already available for your platform in [hlsdk-mega-build](https://github.com/FWGS/hlsdk-mega-build) and this mods may be launch on Android out-of-the-box.
+
 1. **[Absolute Redemption](https://www.moddb.com/mods/absolute-redemption)**
 
 To run this mod on specific platforms you may be need to compile libraries from **redemption** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
@@ -950,7 +952,11 @@ This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-14. **[Counter Strike 1.6](https://store.steampowered.com/app/10/CounterStrike/)**
+14. **[Counter-Life](https://www.moddb.com/mods/counter-life)**
+
+To run this mod on specific platforms you may be need to compile libraries from **counter-life** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
+
+15. **[Counter Strike 1.6](https://store.steampowered.com/app/10/CounterStrike/)**
 
 On x86 you may be need to compile client part.
 
@@ -962,57 +968,65 @@ Client: https://github.com/Velaron/cs16-client/
 
 Server: https://github.com/rehlds/ReGameDLL_CS
 
-15. **[Crack-Life](https://www.moddb.com/mods/crack-life/downloads/crack-life)**
+16. **[Crack-Life](https://www.moddb.com/mods/crack-life/downloads/crack-life)**
 
 To run this mod on specific platforms you may be need to compile libraries from **cracklife** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-16. **[Crack-Life: Campaign Mode](https://www.moddb.com/mods/crack-life/downloads/crack-life-campaign-mode)**
+17. **[Crack-Life: Campaign Mode](https://www.moddb.com/mods/crack-life/downloads/crack-life-campaign-mode)**
 
 To run this mod on specific platforms you may be need to compile libraries from **clcampaign** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-17. **[Deathmatch Classic](https://store.steampowered.com/app/40/Deathmatch_Classic/)**
+18. **[Deathmatch Classic](https://store.steampowered.com/app/40/Deathmatch_Classic/)**
 
 Steam version already supports x86 Linux.
 
 To run this mod on specific platforms you may be need to compile libraries from **dmc** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-18. **[Delta Particles](https://www.moddb.com/mods/half-life-delta)**
+19. **[Delta Particles](https://www.moddb.com/mods/half-life-delta)**
 
 This mod already supports x86 Linux.
 
-Support for other platforms may be available later.
+To run this mod on specific platforms you may be need to compile libraries from **delta_particles** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-19. **[Escape from the Darkness](https://www.moddb.com/mods/escape-from-the-darkness)**
+20. **[Escape from the Darkness](https://www.moddb.com/mods/escape-from-the-darkness)**
 
 To run this mod on specific platforms you may be need to compile libraries from **eftd** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-20. **[Gang Wars](https://www.moddb.com/mods/gangwars)**
+21. **[Gang Wars](https://www.moddb.com/mods/gangwars)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-21. **[Half-Life: Blue Shift](https://store.steampowered.com/app/130/HalfLife_Blue_Shift/)**
+22. **[Half-Life: Blue Shift](https://store.steampowered.com/app/130/HalfLife_Blue_Shift/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **bshift** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-22. **[Half-Life: Decay](https://www.moddb.com/mods/half-life-decay)**
+23. **[Half-Life: Decay](https://www.moddb.com/mods/half-life-decay)**
 
 Currently, you can compile mod libraries for x86 Linux from **decay-pc** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
 Support for other platforms may be available later.
 
-23. **[Half-Life: Echoes](https://www.moddb.com/mods/half-life-echoes)**
+24. **[Half-Life: Echoes](https://www.moddb.com/mods/half-life-echoes)**
 
 To run this mod on specific platforms you may be need to compile libraries from **echoes** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-24. **[Half-Life: Field Intensity](https://www.moddb.com/mods/field-intensity)**
+25. [Half-Life: Featureful](https://freeslave.github.io/halflife-featureful/)
+
+*It's modding SDK*
 
 This mod already supports x86 Linux.
 
-Support for other platforms may be available later.
+To run this mod on specific platforms you may be need to compile libraries from **featureful** branch of [halflife-featureful](https://github.com/FreeSlave/halflife-featureful).
 
-25. **Half-Life: Gravgun** (unfinished) by *mittorn*, *a1batross* and *Solexid*
+26. **[Half-Life: Field Intensity](https://www.moddb.com/mods/field-intensity)**
+
+This mod already supports x86 Linux.
+
+To run this mod on specific platforms you may be need to compile libraries from **field_intensity_1.7** branch of [halflife-featureful](https://github.com/FreeSlave/halflife-featureful).
+
+27. **Half-Life: Gravgun** (unfinished) by *mittorn*, *a1batross* and *Solexid*
 
 *Support temporary abandoned*
 
@@ -1022,163 +1036,183 @@ Currently, MSVC is not supported, use MinGW if you need build for Windows.
 
 Mod files: [1](http://mittorn.fwgs.ru/coop-entpatches/), [2](http://mittorn.fwgs.ru/ggm/), [3](https://github.com/nillerusr/gravgun-extras).
 
-26. **[Half-Life: Induction 1.2](https://www.moddb.com/mods/half-life-induction)**
+28. **[Half-Life: Induction 1.2](https://www.moddb.com/mods/half-life-induction)**
 
 To run this mod on specific platforms you may be need to compile libraries from **induction_1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-27. **[Half-Life: Invasion](https://www.moddb.com/mods/half-life-invasion)**
+29. **[Half-Life: Induction 1.4](https://www.moddb.com/mods/half-life-induction)**
 
-This mod supports x86 Linux.
+This mod already supports x86 Linux.
 
-Support for other platforms may be available later.
+To run this mod on specific platforms you may be need to compile libraries from **induction** branch of [halflife-featureful](https://github.com/FreeSlave/halflife-featureful).
 
-28. **[Half-Life: Intense Force](https://www.moddb.com/downloads/intense-force)**
+30. **[Half-Life: Insecure](https://www.moddb.com/mods/half-life-insecure)**
+
+To run this mod on specific platforms you may be need to compile libraries from **insecure** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
+
+31. **[Half-Life: Intense Force](https://www.moddb.com/downloads/intense-force)**
 
 This mod already supports x86 Linux.
 
 To run this mod on specific platforms you may be need to compile libraries from **intense_force** branch of [halflife-featureful](https://github.com/FreeSlave/halflife-featureful).
 
-29. **[Half-Life: Opposing Force](https://store.steampowered.com/app/50/HalfLife_Opposing_Force/)**
+32. **[Half-Life: Invasion](https://www.moddb.com/mods/half-life-invasion)**
+
+This mod supports x86 Linux.
+
+Support for other platforms may be available later.
+
+33. **[Half-Life: Opposing Force](https://store.steampowered.com/app/50/HalfLife_Opposing_Force/)**
 
 Steam version already supports x86 Linux.
 
 To run this mod on specific platforms you may be need to compile libraries from **opfor** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-30. **[Half-Life: Quest mod](https://csm.dev/threads/half-life-the-quest-mod-isxodniki.38030/)**
+34. **[Half-Life: Quest mod](https://csm.dev/threads/half-life-the-quest-mod-isxodniki.38030/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **sci** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-31. **[Half-Life: TopDown](https://www.moddb.com/mods/half-life-top-downs)**
+35. **[Half-Life: TopDown](https://www.moddb.com/mods/half-life-top-downs)**
 
 To run this mod on specific platforms you may be need to compile libraries from **topdown** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-32. **[Half-Life: Urbicide](https://www.moddb.com/mods/half-life-urbicide)**
+36. **[Half-Life: Urbicide](https://www.moddb.com/mods/half-life-urbicide)**
 
 To run this mod on specific platforms you may be need to compile libraries from **hl_urbicide** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-33. **[Half-Life: Visitors](https://www.moddb.com/mods/half-life-visitors)**
+37. **[Half-Life: Visitors](https://www.moddb.com/mods/half-life-visitors)**
 
 To run this mod on specific platforms you may be need to compile libraries from **visitors** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-34. **[Half-Rats: Parasomnia](https://www.moddb.com/mods/half-rats-parasomnia/downloads/half-rats-parasomnia-v10b-steamlinux)**
+38. **[Half-Rats: Parasomnia](https://www.moddb.com/mods/half-rats-parasomnia/downloads/half-rats-parasomnia-v10b-steamlinux)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-35. **[Half-Screwed: Death and Rebirth](https://www.moddb.com/mods/half-screwed)**
+39. **[Half-Screwed: Death and Rebirth](https://www.moddb.com/mods/half-screwed)**
 
 To run this mod on specific platforms you may be need to compile libraries from **half-screwed** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-36. **[Half-Secret](https://www.moddb.com/mods/half-secret)**
+40. **[Half-Secret](https://www.moddb.com/mods/half-secret)**
 
 To run this mod on specific platforms you may be need to compile libraries from **half-secret** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-37. **[Natural Selection](https://www.moddb.com/mods/natural-selection)**
+41. **[Natural Selection](https://www.moddb.com/mods/natural-selection)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-38. **[Night at the Office](https://www.moddb.com/mods/night-at-the-office)**
+42. **[Night at the Office](https://www.moddb.com/mods/night-at-the-office)**
 
 To run this mod on specific platforms you may be need to compile libraries from **noffice** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-39. **[Paranoia](https://www.moddb.com/mods/paranoia)**
+43. **[Paranoia](https://www.moddb.com/mods/paranoia)**
 
 *Support temporary abandoned*
 
 [Source code](https://github.com/FWGS/paranoia_toolkit).
 
-40. **[Poke646](https://poke646.com/)**
+44. **[Poke646](https://poke646.com/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **poke646** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-41. **[Poke646: Vendetta](https://poke646.com/)**
+45. **[Poke646: Vendetta](https://poke646.com/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **poke646_vendetta** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-42. [PrimeXT](https://snmetamorph.github.io/PrimeXT/)
+46. [PrimeXT](https://snmetamorph.github.io/PrimeXT/)
+
+*It's modding SDK*
 
 [Source code](https://github.com/SNMetamorph/PrimeXT)
 
-43. **[Quake Remake](https://www.moddb.com/games/quake-remake)**
+47. **[Quake Remake](https://www.moddb.com/games/quake-remake)**
 
 *Support was fully abandoned due Quake Wrapper release.*
 
 [Actual source code](https://github.com/FWGS/quakeremake)
 
-44. **[Rebellion](https://www.moddb.com/mods/rebellion1)**
+48. **[Rebellion](https://www.moddb.com/mods/rebellion1)**
 
 To run this mod on specific platforms you may be need to compile libraries from **rebellion** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-45. **[Residual Life](https://www.moddb.com/mods/hl-residual-life)**
+49. **[Residual Life](https://www.moddb.com/mods/hl-residual-life)**
 
 To run this mod on specific platforms you may be need to compile libraries from **residual_point** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-46. **[Residual Point](https://www.moddb.com/mods/hl-residual-point)**
+50. **[Residual Point](https://www.moddb.com/mods/hl-residual-point)**
 
 To run this mod on specific platforms you may be need to compile libraries from **residual_point** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-47. **[Ricochet](https://store.steampowered.com/app/60/Ricochet/)**
+51. **[Ricochet](https://store.steampowered.com/app/60/Ricochet/)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-48. [Sewer](https://www.moddb.com/games/half-life/addons/sewer-beta)
+52. [Sewer](https://www.moddb.com/games/half-life/addons/sewer-beta)
 
 To run this mod on specific platforms you may be need to compile libraries from **sewer_beta** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-49. [Spirit of Half-Life 1.2](https://www.moddb.com/mods/spirit-of-half-life)
+53. [Spirit of Half-Life 1.2](https://www.moddb.com/mods/spirit-of-half-life)
+
+*It's modding SDK*
 
 To run this mod on specific platforms you may be need to compile libraries from **sohl1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-50. **[Swiss Cheese Halloween](https://www.moddb.com/mods/half-life-halloween-mod)**
+54. **[Swiss Cheese Halloween](https://www.moddb.com/mods/half-life-halloween-mod)**
 
 To run this mod on specific platforms you may be need to compile libraries from **halloween** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-51. **[Team Fortress Classic](https://store.steampowered.com/app/20/Team_Fortress_Classic/)**
+55. **[Team Fortress Classic](https://store.steampowered.com/app/20/Team_Fortress_Classic/)**
 
 This mod already supports x86 Linux.
 
 Currently, only source code of [client part](https://github.com/Velaron/tf15-client) is available.
 
-52. **[The Gate](https://www.moddb.com/mods/the-gate)**
+56. **[The Gate](https://www.moddb.com/mods/the-gate)**
 
 To run this mod on specific platforms you may be need to compile libraries from **thegate** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-53. **[They Hunger: Trilogy](https://www.moddb.com/mods/they-hunger)**
+57. **[The Last Bullet](https://www.moddb.com/mods/the-last-bullet-update)**
+
+To run this mod on specific platforms you may be need to compile libraries from **fwgs** branch of [The-Last-Bullet-Updated-Code](https://github.com/GT-Project-Cat/The-Last-Bullet-Updated-Code).
+
+58. **[They Hunger: Trilogy](https://www.moddb.com/mods/they-hunger)**
 
 To run this mod on specific platforms you may be need to compile libraries from **theyhunger** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-54. **[ThreeWave CTF](https://www.moddb.com/games/deathmatch-classic/downloads/threewave-ctf)**
+59. **[ThreeWave CTF](https://www.moddb.com/games/deathmatch-classic/downloads/threewave-ctf)**
 
 To run this mod on specific platforms you may be need to compile libraries from **dmc** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-55. **[Times of Troubles](https://www.moddb.com/mods/times-of-troubles)**
+60. **[Times of Troubles](https://www.moddb.com/mods/times-of-troubles)**
 
 To run this mod on specific platforms you may be need to compile libraries from **tot** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-56. [XashXT](https://csm.dev/threads/xashxt-0-65-rev-4-release-stable.38319/)
+61. [XashXT](https://csm.dev/threads/xashxt-0-65-rev-4-release-stable.38319/)
+
+*It's modding SDK*
 
 *Support was fully abandoned due PrimeXT development*
 
 [Source code](https://github.com/FWGS/XashXT-FWGS/)
 
-57. **[X-Half-Life DeathMatch](https://www.moddb.com/mods/xdm)**
+62. **[X-Half-Life DeathMatch](https://www.moddb.com/mods/xdm)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-58. **[Xen-Warrior](https://www.moddb.com/mods/xen-warrior)**
+63. **[Xen-Warrior](https://www.moddb.com/mods/xen-warrior)**
 
 To run this mod on specific platforms you may be need to compile libraries from **sohl1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
 Don't forget to enable XENWARRIOR build option!!!
 
-59. [Zombie-X](https://www.moddb.com/mods/zombie-x-10-final)
+64. [Zombie-X](https://www.moddb.com/mods/zombie-x-10-final)
 
 To run this mod on specific platforms you may be need to compile libraries from **zombie-x** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 

engine/client/identification.c

@@ -15,13 +15,14 @@ GNU General Public License for more details.
 
 #include "build.h"
 #include <inttypes.h>
-#if XASH_LINUX
 #include <fcntl.h>
+#if !XASH_WIN32
 #include <dirent.h>
+#else
+#include <io.h>
 #endif
 #include "common.h"
 #include "client.h"
-#include "platform/platform.h"
 
 /*
 ==========================================================
@@ -96,6 +97,8 @@ IDENTIFICATION
 #define MAXBITS_GEN 30
 #define MAXBITS_CHECK MAXBITS_GEN + 6
 
+static qboolean ID_ProcessFile( bloomfilter_t *value, const char *path );
+
 static void ID_BloomFilter_f( void )
 {
 	bloomfilter_t value = 0;
@@ -200,6 +203,84 @@ static qboolean ID_ProcessCPUInfo( bloomfilter_t *value )
 	return true;
 }
 
+static qboolean ID_ValidateNetDevice( const char *dev )
+{
+	const char *prefix = "/sys/class/net";
+
+	// These devices are fake, their mac address is generated each boot, while assign_type is 0
+	if( !Q_strnicmp( dev, "ccmni", sizeof( "ccmni" ) ) ||
+		!Q_strnicmp( dev, "ifb", sizeof( "ifb" ) ) )
+		return false;
+
+	byte *pfile = FS_LoadDirectFile( va( "%s/%s/addr_assign_type", prefix, dev ), NULL );
+
+	// if NULL, it may be old kernel
+	if( pfile )
+	{
+		int assignType = Q_atoi( (char*)pfile );
+
+		Mem_Free( pfile );
+
+		// check is MAC address is constant
+		if( assignType != 0 )
+			return false;
+	}
+
+	return true;
+}
+
+static int ID_ProcessNetDevices( bloomfilter_t *value )
+{
+	const char *prefix = "/sys/class/net";
+	DIR *dir;
+	struct dirent *entry;
+	int count = 0;
+
+	if( !( dir = opendir( prefix ) ) )
+		return 0;
+
+	while( ( entry = readdir( dir ) ) && BloomFilter_Weight( *value ) < MAXBITS_GEN )
+	{
+		if( !Q_strcmp( entry->d_name, "." ) || !Q_strcmp( entry->d_name, ".." ) )
+			continue;
+
+		if( !ID_ValidateNetDevice( entry->d_name ) )
+			continue;
+
+		count += ID_ProcessFile( value, va( "%s/%s/address", prefix, entry->d_name ) );
+	}
+	closedir( dir );
+	return count;
+}
+
+static int ID_CheckNetDevices( bloomfilter_t value )
+{
+	const char *prefix = "/sys/class/net";
+
+	DIR *dir;
+	struct dirent *entry;
+	int count = 0;
+	bloomfilter_t filter = 0;
+
+	if( !( dir = opendir( prefix ) ) )
+		return 0;
+
+	while( ( entry = readdir( dir ) ) )
+	{
+		if( !Q_strcmp( entry->d_name, "." ) || !Q_strcmp( entry->d_name, ".." ) )
+			continue;
+
+		if( !ID_ValidateNetDevice( entry->d_name ) )
+			continue;
+
+		if( ID_ProcessFile( &filter, va( "%s/%s/address", prefix, entry->d_name ) ) )
+			count += ( value & filter ) == filter, filter = 0;
+	}
+
+	closedir( dir );
+	return count;
+}
+
 static void ID_TestCPUInfo_f( void )
 {
 	bloomfilter_t value = 0;
@@ -210,6 +291,8 @@ static void ID_TestCPUInfo_f( void )
 		Msg( "Could not get serial\n" );
 }
 
+#endif
+
 static qboolean ID_ProcessFile( bloomfilter_t *value, const char *path )
 {
 	int fd = open( path, O_RDONLY );
@@ -239,6 +322,7 @@ static qboolean ID_ProcessFile( bloomfilter_t *value, const char *path )
 	return true;
 }
 
+#if !XASH_WIN32
 static int ID_ProcessFiles( bloomfilter_t *value, const char *prefix, const char *postfix )
 {
 	DIR *dir;
@@ -281,94 +365,7 @@ static int ID_CheckFiles( bloomfilter_t value, const char *prefix, const char *p
 	closedir( dir );
 	return count;
 }
-#endif // XASH_LINUX
-
-#if XASH_POSIX
-#define MAX_NETDEVICES 16
-
-static qboolean ID_IsReservedMAC( uint64_t mac )
-{
-	byte first = ( mac >> 40 ) & 0xff;
-
-	// no address at all
-	if( mac == 0 )
-		return true;
-
-	// group and local bits of the first octet, see https://www.rfc-editor.org/rfc/rfc9542#section-2.1.1
-	if( FBitSet( first, 0x01 ) || FBitSet( first, 0x02 ))
-		return true;
-
-	// IANA OUI, see https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml and https://www.rfc-editor.org/rfc/rfc9568#section-7.3
-	if(( mac >> 24 ) == 0x00005e )
-		return true;
-
-	return false;
-}
-
-static void ID_FormatMAC( char *out, size_t size, uint64_t mac )
-{
-	// format exactly like /sys/class/net/ */address contents, so ids generated by older versions stay valid
-	Q_snprintf( out, size, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-		(uint)(( mac >> 40 ) & 0xffu ),
-		(uint)(( mac >> 32 ) & 0xffu ),
-		(uint)(( mac >> 24 ) & 0xffu ),
-		(uint)(( mac >> 16 ) & 0xffu ),
-		(uint)(( mac >> 8  ) & 0xffu ),
-		(uint)( mac & 0xffu ));
-}
-
-static int ID_ProcessNetDevices( bloomfilter_t *value )
-{
-	uint64_t macs[MAX_NETDEVICES];
-	int total = Posix_GetNetDeviceAddresses( macs, MAX_NETDEVICES );
-	int count = 0;
-
-	for( int i = 0; i < total && BloomFilter_Weight( *value ) < MAXBITS_GEN; i++ )
-	{
-		char buf[32];
-
-		if( ID_IsReservedMAC( macs[i] ))
-			continue;
-
-		ID_FormatMAC( buf, sizeof( buf ), macs[i] );
-
-		if( !ID_VerifyHEX( buf ))
-			continue;
-
-		*value |= BloomFilter_ProcessStr( buf );
-		count++;
-	}
-
-	return count;
-}
-
-static int ID_CheckNetDevices( bloomfilter_t value )
-{
-	uint64_t macs[MAX_NETDEVICES];
-	int total = Posix_GetNetDeviceAddresses( macs, MAX_NETDEVICES );
-	int count = 0;
-
-	for( int i = 0; i < total; i++ )
-	{
-		char buf[32];
-
-		if( ID_IsReservedMAC( macs[i] ))
-			continue;
-
-		ID_FormatMAC( buf, sizeof( buf ), macs[i] );
-
-		if( !ID_VerifyHEX( buf ))
-			continue;
-
-		bloomfilter_t filter = BloomFilter_ProcessStr( buf );
-		count += ( value & filter ) == filter;
-	}
-
-	return count;
-}
-#endif // XASH_POSIX
-
-#if XASH_WIN32
+#else
 static int ID_GetKeyData( HKEY hRootKey, char *subKey, char *value, LPBYTE data, DWORD cbData )
 {
 	HKEY hKey;
@@ -542,17 +539,6 @@ static bloomfilter_t ID_GenerateRawId( void )
 
 	count += ID_ProcessCPUInfo( &value );
 	count += ID_ProcessFiles( &value, "/sys/block", "device/cid" );
-#endif
-#if XASH_OSX
-	char buf[64];
-
-	if( Apple_GetSerialNumber( buf, sizeof( buf )))
-	{
-		value |= BloomFilter_ProcessStr( buf );
-		count++;
-	}
-#endif
-#if XASH_POSIX
 	count += ID_ProcessNetDevices( &value );
 #endif
 #if XASH_WIN32
@@ -601,26 +587,12 @@ static uint ID_CheckRawId( bloomfilter_t filter )
 	}
 
 #endif // !XASH_ANDROID
+	count += ID_CheckNetDevices( filter );
 	count += ID_CheckFiles( filter, "/sys/block", "device/cid" );
 	if( ID_ProcessCPUInfo( &value ) )
 		count += (filter & value) == value;
 #endif
 
-#if XASH_OSX
-	char buf[64];
-
-	if( Apple_GetSerialNumber( buf, sizeof( buf )))
-	{
-		value = BloomFilter_ProcessStr( buf );
-		count += (filter & value) == value;
-		value = 0;
-	}
-#endif
-
-#if XASH_POSIX
-	count += ID_CheckNetDevices( filter );
-#endif
-
 #if XASH_WIN32
 	count += ID_CheckWMIC( filter, L"wmic path win32_physicalmedia get SerialNumber" );
 	count += ID_CheckWMIC( filter, L"wmic bios get serialnumber" );

engine/platform/apple/id_apple.c

@@ -1,50 +0,0 @@
-/*
-id_apple.c - macOS hardware serial id source
-Copyright (C) 2026 Xash3D FWGS Contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "platform/platform.h"
-#include <AvailabilityMacros.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/IOKitLib.h>
-
-// kIOMasterPortDefault was renamed to kIOMainPortDefault in macOS 12 SDK
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 120000
-#define kIOMainPortDefault kIOMasterPortDefault
-#endif
-
-static qboolean Apple_GetPlatformExpertProperty( CFStringRef key, char *out, size_t size )
-{
-	io_service_t service = IOServiceGetMatchingService( kIOMainPortDefault, IOServiceMatching( "IOPlatformExpertDevice" ));
-
-	if( !service )
-		return false;
-
-	qboolean ret = false;
-	CFTypeRef prop = IORegistryEntryCreateCFProperty( service, key, kCFAllocatorDefault, 0 );
-
-	if( prop )
-	{
-		if( CFGetTypeID( prop ) == CFStringGetTypeID() && CFStringGetCString( (CFStringRef)prop, out, size, kCFStringEncodingUTF8 ))
-			ret = true;
-		CFRelease( prop );
-	}
-
-	IOObjectRelease( service );
-	return ret;
-}
-
-qboolean Apple_GetSerialNumber( char *out, size_t size )
-{
-	return Apple_GetPlatformExpertProperty( CFSTR( "IOPlatformSerialNumber" ), out, size );
-}

engine/platform/platform.h

@@ -69,12 +69,6 @@ void IOS_LaunchDialog( void );
 void Posix_Daemonize( void );
 void Posix_SetupSigtermHandling( void );
 char *Posix_Input( void );
-// returns the number of stable network device MAC addresses, each packed into low 48 bits
-int Posix_GetNetDeviceAddresses( uint64_t *addresses, int max );
-#endif
-
-#if XASH_OSX
-qboolean Apple_GetSerialNumber( char *out, size_t size );
 #endif
 
 #if XASH_SDL

engine/platform/posix/id_posix.c

@@ -1,141 +0,0 @@
-/*
-id_posix.c - network device enumeration for unique id generation
-Copyright (C) 2026 Xash3D FWGS contributors
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
-
-#include "platform/platform.h"
-
-#if XASH_LINUX
-#include <dirent.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-static qboolean Posix_ValidateNetDevice( const char *dev )
-{
-	const char *prefix = "/sys/class/net";
-
-	// These devices are fake, their mac address is generated each boot, while assign_type is 0
-	if( !Q_strnicmp( dev, "ccmni", sizeof( "ccmni" ) - 1 ) || !Q_strnicmp( dev, "ifb", sizeof( "ifb" ) - 1 ))
-		return false;
-
-	byte *pfile = FS_LoadDirectFile( va( "%s/%s/addr_assign_type", prefix, dev ), NULL );
-
-	// if NULL, it may be old kernel
-	if( pfile )
-	{
-		int assignType = Q_atoi( (char*)pfile );
-
-		Mem_Free( pfile );
-
-		// check is MAC address is constant
-		if( assignType != 0 )
-			return false;
-	}
-
-	return true;
-}
-
-int Posix_GetNetDeviceAddresses( uint64_t *addresses, int max )
-{
-	const char *prefix = "/sys/class/net";
-	DIR *dir = opendir( prefix );
-	struct dirent *entry;
-	int count = 0;
-
-	if( !dir )
-		return 0;
-
-	while(( entry = readdir( dir )) && count < max )
-	{
-		if( !Q_strcmp( entry->d_name, "." ) || !Q_strcmp( entry->d_name, ".." ))
-			continue;
-
-		if( !Posix_ValidateNetDevice( entry->d_name ))
-			continue;
-
-		int fd = open( va( "%s/%s/address", prefix, entry->d_name ), O_RDONLY );
-
-		if( fd < 0 )
-			continue;
-
-		char buffer[64];
-		int ret = read( fd, buffer, sizeof( buffer ) - 1 );
-
-		close( fd );
-
-		if( ret <= 0 )
-			continue;
-
-		buffer[ret] = 0;
-
-		uint mac[6];
-		char term = 0;
-
-		if( sscanf( buffer, "%02x:%02x:%02x:%02x:%02x:%02x%c", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5], &term ) < 6 )
-			continue;
-
-		// skip malformed or long address devices, we only need MAC addresses and they're always 48-bit
-		if( term != '\n' && term != '\0' )
-			continue;
-
-		addresses[count] = ((uint64_t)mac[0] << 40) | ((uint64_t)mac[1] << 32) | ((uint64_t)mac[2] << 24) | ((uint64_t)mac[3] << 16) | ((uint64_t)mac[4] << 8) | (uint64_t)mac[5];
-		count++;
-	}
-
-	closedir( dir );
-	return count;
-}
-#elif XASH_APPLE || XASH_FREEBSD || XASH_NETBSD || XASH_OPENBSD
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-
-int Posix_GetNetDeviceAddresses( uint64_t *addresses, int max )
-{
-	struct ifaddrs *ifaddr;
-	int count = 0;
-
-	if( getifaddrs( &ifaddr ) < 0 )
-		return 0;
-
-	for( struct ifaddrs *ifa = ifaddr; ifa != NULL && count < max; ifa = ifa->ifa_next )
-	{
-		if( !ifa->ifa_addr || ifa->ifa_addr->sa_family != AF_LINK )
-			continue;
-
-		if( FBitSet( ifa->ifa_flags, IFF_LOOPBACK | IFF_POINTOPOINT ))
-			continue;
-
-		const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)ifa->ifa_addr;
-
-		if( sdl->sdl_alen != 6 )
-			continue;
-
-		const byte *mac = (const byte *)LLADDR( sdl );
-
-		addresses[count] = ((uint64_t)mac[0] << 40) | ((uint64_t)mac[1] << 32) | ((uint64_t)mac[2] << 24) | ((uint64_t)mac[3] << 16) | ((uint64_t)mac[4] << 8) | (uint64_t)mac[5];
-		count++;
-	}
-
-	freeifaddrs( ifaddr );
-	return count;
-}
-#else
-int Posix_GetNetDeviceAddresses( uint64_t *addresses, int max )
-{
-	Con_Reportf( S_WARN "%s: implement me!\n", __func__ );
-	return 0;
-}
-#endif

engine/server/server.h

@@ -705,23 +705,4 @@ int SV_LightForEntity( edict_t *pEdict );
 //
 void SV_SourceQuery_HandleConnnectionlessPacket( const char *c, netadr_t from, sizebuf_t *msg );
 
-static inline qboolean SV_CheckGroupOp( int op, int groupinfo, int mask )
-{
-	if( op == GROUP_OP_AND && !FBitSet( groupinfo, mask ))
-		return false;
-
-	if( op == GROUP_OP_NAND && FBitSet( groupinfo, mask ))
-		return false;
-
-	return true;
-}
-
-static inline qboolean SV_CheckGroupTrace( const edict_t *e1, const edict_t *e2 )
-{
-	if( e1->v.groupinfo && e2->v.groupinfo )
-		return SV_CheckGroupOp( svs.groupop, e1->v.groupinfo, e2->v.groupinfo );
-
-	return true;
-}
-
 #endif//SERVER_H

engine/server/sv_game.c

@@ -435,8 +435,14 @@ static int SV_Multicast( int dest, const vec3_t origin, const edict_t *ent, qboo
 		if( filter && cl == sv.current_client && FBitSet( sv.current_client->flags, FCL_PREDICT_MOVEMENT ))
 			continue;
 
-		if( SV_IsValidEdict( ent ) && !SV_CheckGroupTrace( ent, cl->edict ))
-			continue;
+		if( SV_IsValidEdict( ent ) && ent->v.groupinfo && cl->edict->v.groupinfo )
+		{
+			if( svs.groupop == GROUP_OP_AND && !FBitSet( cl->edict->v.groupinfo, ent->v.groupinfo ))
+				continue;
+
+			if( svs.groupop == GROUP_OP_NAND && FBitSet( cl->edict->v.groupinfo, ent->v.groupinfo ))
+				continue;
+		}
 
 		if( !SV_CheckClientVisiblity( cl, mask ))
 			continue;
@@ -4117,8 +4123,14 @@ void GAME_EXPORT SV_PlaybackEventFull( int flags, const edict_t *pInvoker, word
 		if( cl->state != cs_spawned || !cl->edict || FBitSet( cl->flags, FCL_FAKECLIENT ))
 			continue;
 
-		if( SV_IsValidEdict( pInvoker ) && !SV_CheckGroupTrace( pInvoker, cl->edict ))
-			continue;
+		if( SV_IsValidEdict( pInvoker ) && pInvoker->v.groupinfo && cl->edict->v.groupinfo )
+		{
+			if( svs.groupop == GROUP_OP_AND && !FBitSet( cl->edict->v.groupinfo, pInvoker->v.groupinfo ))
+				continue;
+
+			if( svs.groupop == GROUP_OP_NAND && FBitSet( cl->edict->v.groupinfo, pInvoker->v.groupinfo ))
+				continue;
+		}
 
 		if( SV_IsValidEdict( pInvoker ))
 		{

engine/server/sv_phys.c

@@ -60,47 +60,6 @@ Utility functions
 
 ===============================================================================
 */
-/*
-================
-SV_CheckVelocity
-================
-*/
-void SV_CheckVelocity( edict_t *ent )
-{
-	float	wishspd;
-	float	maxspd;
-
-	// bound velocity
-	for( int i = 0; i < 3; i++ )
-	{
-		if( IS_NAN( ent->v.velocity[i] ))
-		{
-			if( sv_check_errors.value )
-				Con_Printf( "Got a NaN velocity on %s\n", SV_GetString( ent->v.classname ));
-			ent->v.velocity[i] = 0.0f;
-		}
-
-		if( IS_NAN( ent->v.origin[i] ))
-		{
-			if( sv_check_errors.value )
-				Con_Printf( "Got a NaN origin on %s\n", SV_GetString( ent->v.classname ));
-			ent->v.origin[i] = 0.0f;
-		}
-	}
-
-	wishspd = DotProduct( ent->v.velocity, ent->v.velocity );
-	maxspd = sv_maxvelocity.value * sv_maxvelocity.value * 1.73f; // half-diagonal
-
-	if( wishspd > maxspd )
-	{
-		wishspd = sqrt( wishspd );
-		if( sv_check_errors.value )
-			Con_Printf( "Got a velocity too high on %s ( %.2f > %.2f )\n", SV_GetString( ent->v.classname ), wishspd, sqrt( maxspd ));
-		wishspd = sv_maxvelocity.value / wishspd;
-		VectorScale( ent->v.velocity, wishspd, ent->v.velocity );
-	}
-}
-
 /*
 ================
 SV_CheckAllEnts
@@ -151,6 +110,47 @@ static void SV_CheckAllEnts( void )
 	}
 }
 
+/*
+================
+SV_CheckVelocity
+================
+*/
+void SV_CheckVelocity( edict_t *ent )
+{
+	float	wishspd;
+	float	maxspd;
+
+	// bound velocity
+	for( int i = 0; i < 3; i++ )
+	{
+		if( IS_NAN( ent->v.velocity[i] ))
+		{
+			if( sv_check_errors.value )
+				Con_Printf( "Got a NaN velocity on %s\n", SV_GetString( ent->v.classname ));
+			ent->v.velocity[i] = 0.0f;
+		}
+
+		if( IS_NAN( ent->v.origin[i] ))
+		{
+			if( sv_check_errors.value )
+				Con_Printf( "Got a NaN origin on %s\n", SV_GetString( ent->v.classname ));
+			ent->v.origin[i] = 0.0f;
+		}
+	}
+
+	wishspd = DotProduct( ent->v.velocity, ent->v.velocity );
+	maxspd = sv_maxvelocity.value * sv_maxvelocity.value * 1.73f; // half-diagonal
+
+	if( wishspd > maxspd )
+	{
+		wishspd = sqrt( wishspd );
+		if( sv_check_errors.value )
+			Con_Printf( "Got a velocity too high on %s ( %.2f > %.2f )\n", SV_GetString( ent->v.classname ), wishspd, sqrt( maxspd ));
+		wishspd = sv_maxvelocity.value / wishspd;
+		VectorScale( ent->v.velocity, wishspd, ent->v.velocity );
+	}
+}
+
 /*
 ================
 SV_UpdateBaseVelocity
@@ -158,20 +158,26 @@ SV_UpdateBaseVelocity
 */
 void SV_UpdateBaseVelocity( edict_t *ent )
 {
-	if( !FBitSet( ent->v.flags, FL_ONGROUND ))
-		return;
+	if( ent->v.flags & FL_ONGROUND )
+	{
+		edict_t	*groundentity = ent->v.groundentity;
 
-	const edict_t *groundentity = ent->v.groundentity;
+		if( SV_IsValidEdict( groundentity ))
+		{
+			// On conveyor belt that's moving?
+			if( groundentity->v.flags & FL_CONVEYOR )
+			{
+				vec3_t	new_basevel;
 
-	if( !SV_IsValidEdict( groundentity ) || !FBitSet( groundentity->v.flags, FL_CONVEYOR ))
-		return;
+				VectorScale( groundentity->v.movedir, groundentity->v.speed, new_basevel );
+				if( ent->v.flags & FL_BASEVELOCITY )
+					VectorAdd( new_basevel, ent->v.basevelocity, new_basevel );
 
-	if( FBitSet( ent->v.flags, FL_BASEVELOCITY ))
-		VectorMA( ent->v.basevelocity, groundentity->v.speed, groundentity->v.movedir, ent->v.basevelocity );
-	else
-		VectorScale( groundentity->v.movedir, groundentity->v.speed, ent->v.basevelocity );
-
-	ent->v.flags |= FL_BASEVELOCITY;
+				ent->v.flags |= FL_BASEVELOCITY;
+				VectorCopy( new_basevel, ent->v.basevelocity );
+			}
+		}
+	}
 }
 
 /*
@@ -183,15 +189,18 @@ returns true if the entity is in solid currently
 */
 static qboolean SV_TestEntityPosition( edict_t *ent, edict_t *blocker )
 {
+	qboolean	monsterClip = FBitSet( ent->v.flags, FL_MONSTERCLIP ) ? true : false;
+	trace_t	trace;
+
 	if( FBitSet( ent->v.flags, FL_CLIENT|FL_FAKECLIENT ))
 	{
 		// to avoid falling through tracktrain update client mins\maxs here
-		int hull = FBitSet( ent->v.flags, FL_DUCKING ) ? 1 : 0;
-		SV_SetMinMaxSize( ent, host.player_mins[hull], host.player_maxs[hull], true );
+		if( FBitSet( ent->v.flags, FL_DUCKING ))
+			SV_SetMinMaxSize( ent, host.player_mins[1], host.player_maxs[1], true );
+		else SV_SetMinMaxSize( ent, host.player_mins[0], host.player_maxs[0], true );
 	}
 
-	qboolean monsterClip = FBitSet( ent->v.flags, FL_MONSTERCLIP ) ? true : false;
-	trace_t trace = SV_Move( ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent, monsterClip );
+	trace = SV_Move( ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent, monsterClip );
 
 	if( SV_IsValidEdict( blocker ) && SV_IsValidEdict( trace.ent ))
 	{
@@ -203,25 +212,6 @@ static qboolean SV_TestEntityPosition( edict_t *ent, edict_t *blocker )
 	return trace.startsolid;
 }
 
-static qboolean SV_TryThink( edict_t *ent, double frametime, double time )
-{
-	float thinktime = ent->v.nextthink;
-	if( thinktime <= 0.0f || thinktime > ( time + frametime ))
-		return false;
-
-	// don't let things stay in the past.
-	// it is possible to start that way
-	// by a trigger with a local time.
-	if( thinktime < time )
-		thinktime = time;
-
-	ent->v.nextthink = 0.0f;
-	svgame.globals->time = thinktime;
-	svgame.dllFuncs.pfnThink( ent );
-
-	return true;
-}
-
 /*
 =============
 SV_RunThink
@@ -234,10 +224,21 @@ Returns false if the entity removed itself.
 */
 static qboolean SV_RunThink( edict_t *ent )
 {
+	float	thinktime;
+
 	if( !FBitSet( ent->v.flags, FL_KILLME ))
 	{
-		if( !SV_TryThink( ent, sv.frametime, sv.time ))
+		thinktime = ent->v.nextthink;
+		if( thinktime <= 0.0f || thinktime > (sv.time + sv.frametime))
 			return true;
+
+		if( thinktime < sv.time )
+			thinktime = sv.time;	// don't let things stay in the past.
+						// it is possible to start that way
+						// by a trigger with a local time.
+		ent->v.nextthink = 0.0f;
+		svgame.globals->time = thinktime;
+		svgame.dllFuncs.pfnThink( ent );
 	}
 
 	if( FBitSet( ent->v.flags, FL_KILLME ))
@@ -258,13 +259,25 @@ Returns false if the entity removed itself.
 */
 qboolean SV_PlayerRunThink( edict_t *ent, float frametime, double time )
 {
+	float	thinktime;
+
 	if( svgame.physFuncs.SV_PlayerThink )
 		return svgame.physFuncs.SV_PlayerThink( ent, frametime, time );
 
 	if( !FBitSet( ent->v.flags, FL_KILLME|FL_DORMANT ))
 	{
-		if( !SV_TryThink( ent, frametime, time ))
+		thinktime = ent->v.nextthink;
+		if( thinktime <= 0.0f || thinktime > (time + frametime))
 			return true;
+
+		if( thinktime < time )
+			thinktime = time;	// don't let things stay in the past.
+					// it is possible to start that way
+					// by a trigger with a local time.
+
+		ent->v.nextthink = 0.0f;
+		svgame.globals->time = thinktime;
+		svgame.dllFuncs.pfnThink( ent );
 	}
 
 	if( FBitSet( ent->v.flags, FL_KILLME ))
@@ -284,11 +297,17 @@ void SV_Impact( edict_t *e1, edict_t *e2, trace_t *trace )
 {
 	svgame.globals->time = sv.time;
 
-	if( FBitSet( e1->v.flags|e2->v.flags, FL_KILLME ))
+	if(( e1->v.flags|e2->v.flags ) & FL_KILLME )
 		return;
 
-	if( !SV_CheckGroupTrace( e1, e2 ))
-		return;
+	if( e1->v.groupinfo && e2->v.groupinfo )
+	{
+		if( svs.groupop == GROUP_OP_AND && !FBitSet( e1->v.groupinfo, e2->v.groupinfo ))
+			return;
+
+		if( svs.groupop == GROUP_OP_NAND && FBitSet( e1->v.groupinfo, e2->v.groupinfo ))
+			return;
+	}
 
 	if( e1->v.solid != SOLID_NOT )
 	{

engine/server/sv_pmove.c

@@ -205,7 +205,10 @@ static void SV_AddLinksToPmove( areanode_t *node, const vec3_t pmove_mins, const
 
 		if( check->v.groupinfo != 0 )
 		{
-			if( !SV_CheckGroupOp( svs.groupop, check->v.groupinfo, pl->v.groupinfo ))
+			if( svs.groupop == GROUP_OP_AND && !FBitSet( check->v.groupinfo, pl->v.groupinfo ))
+				continue;
+
+			if( svs.groupop == GROUP_OP_NAND && FBitSet( check->v.groupinfo, pl->v.groupinfo ))
 				continue;
 		}
 
@@ -974,9 +977,9 @@ void SV_RunCmd( sv_client_t *cl, usercmd_t *ucmd, int random_seed )
 			// touch other objects
 			for( int i = 0; i < svgame.pmove->numtouch; i++ )
 			{
-				pmtrace_t *pmtrace = &svgame.pmove->touchindex[i];
-				edict_t *touch = SV_EdictNum( svgame.pmove->physents[pmtrace->ent].info );
-				trace_t trace;
+				pmtrace_t	*pmtrace = &svgame.pmove->touchindex[i];
+				edict_t		*touch = SV_EdictNum( svgame.pmove->physents[pmtrace->ent].info );
+				trace_t		trace;
 
 				VectorCopy( pmtrace->deltavelocity, clent->v.velocity );
 				PM_ConvertTrace( &trace, pmtrace, touch );

engine/server/sv_world.c

@@ -522,8 +522,14 @@ static void SV_TouchLinks( edict_t *ent, areanode_t *node )
 			if( touch == ent || touch->v.solid != SOLID_TRIGGER ) // disabled ?
 				continue;
 
-			if( !SV_CheckGroupTrace( touch, ent ))
-				continue;
+			if( touch->v.groupinfo && ent->v.groupinfo )
+			{
+				if( svs.groupop == GROUP_OP_AND && !FBitSet( touch->v.groupinfo, ent->v.groupinfo ))
+					continue;
+
+				if( svs.groupop == GROUP_OP_NAND && FBitSet( touch->v.groupinfo, ent->v.groupinfo ))
+					continue;
+			}
 
 			if( !BoundsIntersect( ent->v.absmin, ent->v.absmax, touch->v.absmin, touch->v.absmax ))
 				continue;
@@ -719,7 +725,10 @@ static void SV_WaterLinks( const vec3_t origin, int *pCont, areanode_t *node )
 
 		if( touch->v.groupinfo )
 		{
-			if( !SV_CheckGroupOp( svs.groupop, touch->v.groupinfo, svs.groupmask ))
+			if( svs.groupop == GROUP_OP_AND && !FBitSet( touch->v.groupinfo, svs.groupmask ))
+				continue;
+
+			if( svs.groupop == GROUP_OP_NAND && FBitSet( touch->v.groupinfo, svs.groupmask ))
 				continue;
 		}
 
@@ -1092,8 +1101,14 @@ static qboolean SV_ClipToEntity( edict_t *touch, moveclip_t *clip )
 	trace_t	trace;
 	model_t	*mod;
 
-	if( SV_IsValidEdict( clip->passedict ) && !SV_CheckGroupTrace( touch, clip->passedict ))
-		return true;
+	if( touch->v.groupinfo && SV_IsValidEdict( clip->passedict ) && clip->passedict->v.groupinfo != 0 )
+	{
+		if( svs.groupop == GROUP_OP_AND && !FBitSet( touch->v.groupinfo, clip->passedict->v.groupinfo ))
+			return true;
+
+		if( svs.groupop == GROUP_OP_NAND && FBitSet( touch->v.groupinfo, clip->passedict->v.groupinfo ))
+			return true;
+	}
 
 	if( touch == clip->passedict || touch->v.solid == SOLID_NOT )
 		return true;

engine/wscript

@@ -26,12 +26,7 @@ int main(int argc, char **argv)
 }
 '''
 
-def get_frameworks(env):
-	if env.IOS:
-		return ['Foundation', 'UIKit', 'QuartzCore', 'GameController', 'SystemConfiguration', 'CFNetwork', 'AVFoundation', 'CoreGraphics']
-	if env.DEST_OS == 'darwin':
-		return ['IOKit', 'CoreFoundation']
-	return []
+frameworks = ['Foundation', 'UIKit', 'QuartzCore', 'GameController', 'SystemConfiguration', 'CFNetwork', 'AVFoundation', 'CoreGraphics']
 
 @TaskGen.extension('.m')
 def m_hook(self, node):
@@ -129,8 +124,9 @@ def configure(conf):
 	if not conf.env.DEST_OS in ['win32', 'android']:
 		conf.check_pthreads(mode='c')
 	
-	for i in get_frameworks(conf.env):
-		conf.check(features='c cprogram', framework=i, uselib_store=i, msg='Checking for %s framework' % i)
+	if conf.env.IOS:
+		for i in frameworks :
+			conf.check(features='c cprogram', framework=i, uselib_store=i, msg='Checking for %s framework' % i)
 
 	conf.define('ENGINE_DLL', 1)
 
@@ -183,8 +179,6 @@ def build(bld):
 		source += bld.path.ant_glob('platform/ios/*.c')
 		source += bld.path.ant_glob('platform/ios/*.m')
 		includes += bld.path.ant_glob('platform/ios')
-	elif bld.env.DEST_OS == 'darwin':
-		source += bld.path.ant_glob('platform/apple/*.c')
 	
 	# include sources for optional features
 	if bld.get_define('XASH_CUSTOM_SWAP'):
@@ -212,7 +206,6 @@ def build(bld):
 		]
 	else: # POSIX
 		libs += ['M', 'RT', 'PTHREAD', 'ASOUND', 'HAIKU', 'MAGX', 'LOG', 'SOCKET']
-		libs += get_frameworks(bld.env)
 		if not bld.env.STATIC:
 			libs += ['DL']
 
@@ -281,6 +274,7 @@ def build(bld):
 			install_path = bld.env.LIBDIR
 
 		if bld.env.IOS:
+			libs += frameworks
 			defines += ['XASH_SDLMAIN=1']
 
 		if bld.env.DEST_OS in ['nswitch', 'psvita', 'emscripten']:

scripts/waifulib/vgui.py

@@ -1,97 +0,0 @@
-#! /usr/bin/env python
-# encoding: utf-8
-# mittorn, 2018
-
-from waflib.Configure import conf
-from waflib import Logs
-import os
-
-VGUI_SUPPORTED_OS = ['win32', 'darwin', 'linux']
-
-VGUI_FRAGMENT = '''#include <VGUI.h>
-int main() { return 0; }'''
-
-def options(opt):
-	grp = opt.add_option_group('VGUI options')
-
-	vgui_dev_path = os.path.join(opt.path.path_from(opt.root), 'vgui-dev')
-
-	grp.add_option('--vgui', action = 'store', dest = 'VGUI_DEV', default=vgui_dev_path,
-		help = 'path to vgui-dev repo [default: %(default)s]')
-
-	grp.add_option('--enable-unsupported-vgui', action = 'store_true', dest = 'ENABLE_UNSUPPORTED_VGUI', default=False,
-		help = 'ignore all checks and allow link against anything [default: %(default)s]')
-
-	grp.add_option('--skip-vgui-sanity-check', action = 'store_false', dest = 'VGUI_SANITY_CHECK', default=True,
-		help = 'skip checking VGUI sanity [default: %(default)s]' )
-	return
-
-@conf
-def check_vgui(conf):
-	if not conf.options.ENABLE_UNSUPPORTED_VGUI:
-		conf.start_msg('Does this architecture support VGUI?')
-
-		if conf.env.DEST_CPU != 'x86':
-			conf.end_msg('no')
-			Logs.warn('vgui is not supported on this CPU: ' + str(conf.env.DEST_CPU))
-			return False
-		else: conf.end_msg('yes')
-
-		conf.start_msg('Does this OS support VGUI?')
-		if conf.env.DEST_OS not in VGUI_SUPPORTED_OS:
-			conf.end_msg('no')
-			Logs.warn('vgui is not supported on this OS: ' + str(conf.env.DEST_OS))
-			return False
-		else: conf.end_msg('yes')
-
-		conf.start_msg('Does this toolchain able to link VGUI?')
-		if conf.env.DEST_OS == 'win32' and conf.env.COMPILER_CXX != 'msvc':
-			conf.end_msg('no')
-			# we have ABI incompatibility ONLY on MinGW
-			Logs.warn('vgui can\'t be linked with MinGW')
-			return False
-		else: conf.end_msg('yes')
-
-	conf.start_msg('Configuring VGUI by provided path')
-	vgui_dev = conf.options.VGUI_DEV
-
-	libpath = os.path.abspath(os.path.join(vgui_dev, 'lib'))
-
-	if conf.env.DEST_OS == 'win32':
-		conf.env.LIB_VGUI = ['vgui']
-		libpath = os.path.join(libpath, 'win32_vc6')
-		if conf.env.DEST_CPU != 'x86':
-			# for 32-bit x86 it's expected to be under win32_vc6
-			# for others, it's expected to be under win32_vc6 subdirectory matching CPU arch (x86_64 for 64-bit CPUs)
-			libpath = os.path.join(libpath, conf.env.DEST_CPU)
-		conf.env.LIBPATH_VGUI = [libpath]
-	elif conf.env.DEST_OS == 'linux':
-		conf.env.LIB_VGUI = [':vgui.so']
-		if conf.env.DEST_CPU != 'x86':
-			libpath = os.path.join(libpath, conf.env.DEST_CPU)
-		conf.env.LIBPATH_VGUI = [libpath]
-	elif conf.env.DEST_OS == 'darwin':
-		if conf.env.DEST_CPU != 'x86':
-			conf.env.LDFLAGS_VGUI = [os.path.join(libpath, conf.env.DEST_CPU, 'vgui.dylib')]
-		else:
-			conf.env.LDFLAGS_VGUI = [os.path.join(libpath, 'vgui.dylib')]
-	else:
-		# TODO: figure out what to do here
-		conf.env.LIB_VGUI = ['vgui']
-		conf.env.LIBPATH_VGUI = [os.path.join(libpath, conf.env.DEST_OS, conf.env.DEST_CPU)]
-
-	conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(vgui_dev, 'include'))]
-
-	conf.env.HAVE_VGUI = 1
-	conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
-
-	if conf.env.HAVE_VGUI and conf.options.VGUI_SANITY_CHECK:
-		try:
-			conf.check_cxx(fragment=VGUI_FRAGMENT,
-				msg = 'Checking for library VGUI sanity',
-				use = 'VGUI',
-				execute = False)
-		except conf.errors.ConfigurationError:
-			conf.fatal("Can't compile simple program. Check your path to vgui-dev repository.")
-
-	return True

wscript

@@ -127,6 +127,7 @@ SUBDIRS = [
 	Subproject('3rdparty/opusfile',     lambda x: x.env.CLIENT and not x.env.HAVE_SYSTEM_OPUSFILE),
 	Subproject('3rdparty/maintui',      lambda x: x.env.CLIENT and x.env.TUI),
 	Subproject('3rdparty/mainui',       lambda x: x.env.CLIENT and x.env.DEST_OS != 'android'),
+	Subproject('3rdparty/freevgui',     lambda x: x.env.CLIENT),
 	Subproject('3rdparty/vgui_support', lambda x: x.env.CLIENT),
 	Subproject('3rdparty/MultiEmulator',lambda x: x.env.CLIENT),
 #	Subproject('3rdparty/freevgui',     lambda x: x.env.CLIENT),