Commit Graph

229 Commits

Author SHA1 Message Date
Andrey Akhmichin 8a954374ec Merge branch 'sohl1.2' into echoes 2021-09-17 23:29:56 +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 3503619bdd Merge https://github.com/ValveSoftware/halflife/pull/3099. 2021-07-07 00:41:17 +05:00
Andrey Akhmichin 6e7653eec1 Move M_PI definition to header. 2021-06-20 13:49:04 +05:00
Andrey Akhmichin 97399f70b2 Merge branch 'sohl1.2' into echoes 2021-06-20 04:47:49 +05:00
Andrey Akhmichin 50f6cf4a40 Fix compilation. 2021-06-20 04:47:09 +05:00
Andrey Akhmichin 5c5232119e Merge branch 'sohl1.2' into echoes 2021-06-20 04:30:05 +05:00
Andrey Akhmichin 314d096c1f Merge branch 'master' into sohl1.2 2021-06-20 04:26:46 +05:00
Andrey Akhmichin a541a9699c #ifdef->#if. 2021-06-20 03:53:07 +05:00
Bohdan Shulyar fd6f48175f
Comment unused variables (#184)
* Comment unused variables

* Comment out dead code
2021-06-18 13:00:09 +05:00
Bohdan Shulyar 662af50306
Bump minimum CMake version (lower versions are deprecated) (#182) 2021-06-18 07:41:38 +05:00
Bohdan Shulyar d95080281f
Fix implicit conversion (#180) 2021-06-18 07:40:38 +05:00
Andrey Akhmichin 0ad0c28f79 #ifdef->#if. 2021-06-16 11:15:20 +05:00
Andrey Akhmichin 0733d914a9 Merge branch 'sohl1.2' into echoes 2021-06-16 11:13:03 +05:00
Andrey Akhmichin 9e9c587484 Merge branch 'master' into sohl1.2 2021-06-16 02:20:54 +05:00
Andrey Akhmichin da5efc7146 Get rid of project files for MSVC 98. 2021-06-14 01:39:55 +05:00
Roman Chistokhodov 3f6ab0b2fd
Fix Goldsource build (#176) 2021-06-08 02:05:47 +05:00
Andrey Akhmichin 0dd90846fe #ifdef->#if 2021-06-07 05:05:58 +05:00
Andrey Akhmichin 3eef99268b Merge branch 'sohl1.2' into echoes 2021-06-06 19:24:21 +05:00
Andrey Akhmichin 3fd9768048 Merge branch 'master' into sohl1.2 2021-06-06 18:59:49 +05:00
Roman Chistokhodov 397286021c Try fixing occasional bug with missing mp5 reload animation when holding primary attack after clip was depleted 2021-06-06 01:17:08 +05:00
Andrey Akhmichin 2c7e07ef49 Fix egon beam color. Same as https://github.com/ValveSoftware/halflife/issues/3033. 2021-06-05 20:13:07 +05:00
Alibek Omarov e4dd9192cc client: fix scoreboard not setting IN_SCORE bit in usercmd 2021-06-01 17:38:24 +03:00
Andrey Akhmichin 93630eae23 Fix player model angles.
Same as https://github.com/ValveSoftware/halflife/issues/3075.
2021-04-04 22:30:49 +05:00
Andrey Akhmichin 5dd184da23 Fix memory leaks when parsing files. 2021-03-26 04:08:05 +05:00
nekonomicon a0a30049fd
Merge pull request #152 from FreeSlave/gauss-color
Gauss color depends on its charge
2021-02-10 18:39:59 +00:00
Roman Chistokhodov 06f046430d Fix occasional double playing of reload animations 2021-02-10 20:30:01 +03:00
Roman Chistokhodov 0a29ec49c8 Gauss color depends on its charge 2021-02-10 20:25:30 +03:00
Andrey Akhmichin 724fcb856b Merge branch 'master' into sohl1.2 2020-11-22 20:22:32 +05:00
Andrey Akhmichin 6984e9c25a Merge branch 'master' into echoes 2020-11-22 18:06:21 +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
Agent Agrimar efe13c3d04 client: wscript: 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 8e4ded4017 wscript: update yet again. 2020-08-09 03:29:46 +05:00
Andrey Akhmichin 13a74e547f Merge branch 'master' into echoes 2020-08-08 21:14:50 +05:00
Andrey Akhmichin 0bbb5badda Merge branch 'master' into sohl1.2 2020-08-08 20:56:06 +05:00
Andrey Akhmichin 2254a16b7b client: wscript: update. 2020-08-02 20:23:29 +05:00
Andrey Akhmichin 42b9bef64a Merge branch 'master' into sohl1.2 2020-08-02 00:05:58 +05:00
Andrey Akhmichin 2156175454 Merge branch 'master' into echoes 2020-08-01 22:32:08 +05:00
Andrey Akhmichin f20b7259f3 wscript: reorder sources list. 2020-08-01 20:26:28 +05:00
Andrey Akhmichin 0324eb0431 Fix possible memory leak. 2020-07-25 09:28:02 +05:00
Andrey Akhmichin 0aecf06741 Remove GPL-licensed headers. 2020-04-22 13:12:23 +05:00
Andrey Akhmichin 608bb56985 Merge branch 'master' into echoes 2020-04-01 13:15:35 +05:00
Andrey Akhmichin 6af5c3f472 Safe _snprintf usage. 2020-04-01 13:14:14 +05:00
Andrey Akhmichin a538979d15 Update Android.mk. 2020-04-01 12:39:50 +05:00
Andrey Akhmichin 54812924d6 Update CMakeLists.txt. 2020-04-01 12:31:09 +05:00
Andrey Akhmichin caa77f1853 Merge branch 'master' into echoes 2020-04-01 12:18:33 +05:00
Roman Chistokhodov 3e1e8961bf Stop gauss pulse sound on overcharge 2020-03-31 20:46:37 +03:00
Andrey Akhmichin 912284e7eb Merge branch 'master' into echoes 2020-03-31 21:13:42 +05:00
mittorn c6d793231c wscript: do not set install_path on dos target, set build task names to "server" and "client" 2020-02-12 15:40:06 +07:00