Commit Graph

58 Commits

Author SHA1 Message Date
Andrey Akhmichin 052f140685
Merge branch 'sohl1.2' into aomdc 2022-11-19 13:21:30 +05:00
Andrey Akhmichin 0ce636e72b
Merge branch 'master' into sohl1.2 2022-11-15 10:46:52 +05:00
Andrey Akhmichin 7fb1dab079
Remove useless files overview.cpp/.h. 2022-11-08 23:53:41 +05:00
Andrey Akhmichin b3bef8a7dd
Merge branch 'sohl1.2' into aomdc 2022-08-24 20:21:17 +05:00
Andrey Akhmichin 0cc7784b62
Merge branch 'master' into sohl1.2 2022-08-24 19:28:10 +05:00
Roman Chistokhodov 695e2e060b
Rename false_vgui to fake_vgui (#286) 2022-07-20 05:23:52 +00:00
Andrey Akhmichin 47ad71298b
Merge branch 'master' into aomdc 2022-06-21 06:19:34 +05:00
Andrey Akhmichin f3b8ba2cb5
Merge branch 'master' into sohl1.2 2022-06-21 06:17:52 +05:00
Andrey Akhmichin b0b68d5755
cmake: update vgui path. 2022-06-18 06:42:42 +05:00
Andrey Akhmichin 6c3eb427ba
Merge branch 'sohl1.2' into aomdc 2022-06-17 10:40:17 +05:00
Andrey Akhmichin ac75b528a1
Merge branch 'master' into sohl1.2 2022-06-17 06:48:36 +05:00
Andrey Akhmichin 987ea07ce1
cmake: add more options and show more diagnostic messages. 2022-06-17 03:59:39 +05:00
Andrey Akhmichin d8b05d12d5
cmake: better tgmath.h check. 2022-06-16 11:54:55 +05:00
Andrey Akhmichin 1397f3ab4f
cmake: use "lib" prefixe only for Android. 2022-06-16 10:50:14 +05:00
Andrey Akhmichin b59f695a03
Merge branch 'sohl1.2' into aomdc 2022-06-07 23:46:59 +05:00
Andrey Akhmichin 723180f497
Merge branch 'master' into sohl1.2 2022-06-05 23:07:22 +05:00
Roman Chistokhodov b3804d5ad8
Remove redundant dependency on ws2_32 (#204) 2021-11-03 22:52:12 +05:00
Roman Chistokhodov ba2cab60df
Get VGUI back (optionally) (#194)
* Get VGUI back (optionally)

* Add some missing VGUI invocations

* Update CMakeLists.txt to build with vgui for Windows

* Move windows.h inclusions only to those places where it's really needed

* Try fix mingw build

* Update hud_spectator

* Merge nekonomicon's vgui branch

* Don't include vgui panel and app in cdll_int.cpp if vgui is real

* Deduplicate scoreboard global variables

* Add options to prefer non-vgui motd and scoreboard when vgui is enabled

* Add vgui-dev as a submodule. Add building vith vgui to CI

* Fix artifact uploading

* Don't use global variable when not necessary

* char* to const char* in CMenuHandler_StringCommand constructor

* Fix 'format string is not a literal string' warnings

* Fix 'always evaluate to true' warnings

* Team Fortress classes to const char*

* CreateCommandMenu accepts const char*

* Fix printf formats. Turn some unsigned longs into unsigned ints since they use only 32 bits anyway

* Explicit assignment result as condition

* Prevent memory leak on menu reading

* Localize button text

* Create FileInputStream on stack avoiding the leak

* Remove Servers Browser code

* Arrow file names to const char*

* Fix assignment to the wrong variable
2021-10-27 01:35:11 +00:00
Andrey Akhmichin 7e971b66ca Merge branch 'sohl1.2' into aomdc 2021-09-17 23:29:06 +05:00
Andrey Akhmichin db8ac8f2f0 Merge branch 'master' into sohl1.2 2021-09-17 23:28:25 +05:00
Roman Chistokhodov 136ee78cfd
Make msvc builds in release mode with static runtime (#185) 2021-08-27 13:04:15 +05:00
Andrey Akhmichin 7298dfebdd Merge branch 'sohl1.2' into aomdc 2021-06-20 04:31:59 +05:00
Andrey Akhmichin 314d096c1f Merge branch 'master' into sohl1.2 2021-06-20 04:26:46 +05:00
Bohdan Shulyar 662af50306
Bump minimum CMake version (lower versions are deprecated) (#182) 2021-06-18 07:41:38 +05:00
Andrey Akhmichin 724fcb856b Merge branch 'master' into sohl1.2 2020-11-22 20:22:32 +05:00
Andrey Akhmichin 6e21091e92 Merge branch 'master' into aomdc 2020-11-22 20:08:31 +05:00
Agent Agrimar a39583f1ef client: cmake: add winmm.lib dependency
This fixes a linker error when compiling for win32 with Goldsrc Support enabled.
2020-09-13 15:06:52 +03:00
Andrey Akhmichin e03788de52 Merge branch 'master' into sohl1.2 2020-01-01 04:46:25 +05:00
Andrey Akhmichin 2f334bc3ba Merge branch 'master' into aomdc 2020-01-01 04:30:57 +05:00
Andrey Akhmichin c1ba788c58 Merge branch 'sohl1.2' into aomdc 2019-11-17 19:01:29 +05:00
Andrey Akhmichin 16e0a45d3c Merge branch 'master' into sohl1.2 2019-11-11 04:00:45 +05:00
Alibek Omarov 8622cc945d CMakeLists: remove legacy 64 postfix 2019-11-11 01:07:20 +03:00
Andrey Akhmichin 4a02cfc012 Merge branch 'double_promotion' 2019-11-05 02:48:47 +05:00
Jonathan Poncelet 71afe6e204 Build: Added user32.lib dependency to CMake
Also had to add ResetThink to cbase.h, as it was missing in deug.
2019-10-30 17:43:30 +03:00
Andrey Akhmichin 11adcd5ac8 cmake: Add check for tgmath.h header. 2019-10-13 20:58:14 +05:00
Night Owl 097cf2efa8 Merge branch 'sohl1.2' into aomdc 2018-09-12 06:09:13 +05:00
Night Owl 7985ccc7dc Merge branch 'cmake' into sohl1.2 2018-09-12 06:04:01 +05:00
Jonathan Poncelet 65cb1f54f4 Made library functions hidden by default on Mac/Linux
This resolves an issue where the server library was calling client
library functions in error.
2018-08-07 08:24:04 +01:00
Night Owl d3fed9ebf8 Merge branch 'master' into aomdc 2018-04-14 06:33:58 +05:00
Night Owl 3b59c3c806 Merge branch 'master' into sohl1.2 2018-04-14 05:17:34 +05:00
Roman Chistokhodov 71f55bb119 Add mingw support to CMakeLists.txt. Add crosscompiling instructions to README.md 2018-04-03 21:39:07 +03:00
Night Owl 696b94c74a Merge branch 'master' into aomdc 2018-03-31 18:06:50 +05:00
Night Owl 6fe4259223 Merge branch 'master' into sohl1.2 2018-03-31 17:24:38 +05:00
Alibek Omarov 4af9030156 Append 64 postfix on 64 bit 2018-03-22 15:23:34 +03:00
Night Owl a000cbf8ad Merge recreated "Afraid of Monsters: Director's Cut" source code. 2018-02-28 23:18:52 +05:00
Night Owl abf8c33a89 Merge branch 'master' into sohl1.2 2018-02-12 13:10:16 +05:00
Alibek Omarov 9a02d7116f It's better to use MSVC here instead of WIN32, so it wouldn't break MinGW builds 2017-12-28 02:05:47 +03:00
Alibek Omarov 3dda2ec590 Fix compiling on MSVC2017 2017-12-28 02:02:23 +03:00
Alibek Omarov c128c69ceb Add install() for CMake. 2017-12-19 00:27:56 +03:00
Roman Chistokhodov 30f2409952 Merge branch 'master' into sohl1.2 2017-12-18 23:47:12 +03:00