Commit Graph

763 Commits

Author SHA1 Message Date
Maurice Heumann
6d18534a6d
Merge pull request #369 from diamante0018/develop
Port over changes from S1x
2022-04-26 21:14:01 +02:00
FutureRave
7f0b485208
Update utils 2022-04-26 19:39:50 +01:00
FutureRave
6dc57cc3ed
Update Protobuf 2022-04-26 19:29:15 +01:00
Maurice Heumann
4b42128b4a
Merge pull request #358 from XLabsProject/dependabot/submodules/deps/zlib-ec3df00
Bump deps/zlib from `2014a99` to `ec3df00`
2022-04-19 20:11:27 +02:00
Maurice Heumann
fe2ade0002
Merge pull request #363 from XLabsProject/dependabot/submodules/deps/rapidjson-fcb23c2
Bump deps/rapidjson from `8261c1d` to `fcb23c2`
2022-04-19 20:11:20 +02:00
Maurice Heumann
8e616c6345
Merge pull request #357 from XLabsProject/dependabot/submodules/deps/libtommath-5108f12
Bump deps/libtommath from `66de864` to `5108f12`
2022-04-19 20:10:25 +02:00
Maurice Heumann
217d8d55c7
Merge pull request #367 from XLabsProject/dependabot/submodules/deps/sol2-6409634
Bump deps/sol2 from `50b62c9` to `6409634`
2022-04-19 20:10:12 +02:00
Maurice Heumann
7f2dd04c19
Merge pull request #366 from XLabsProject/dependabot/submodules/deps/asmjit-a4cb51b
Bump deps/asmjit from `21a31b8` to `a4cb51b`
2022-04-19 20:10:02 +02:00
Maurice Heumann
0d267dc73d
Merge pull request #368 from XLabsProject/dependabot/submodules/deps/GSL-2bfd495
Bump deps/GSL from `3837236` to `2bfd495`
2022-04-19 20:09:47 +02:00
dependabot[bot]
00f37add1a
Bump deps/GSL from 3837236 to 2bfd495
Bumps [deps/GSL](https://github.com/Microsoft/GSL) from `3837236` to `2bfd495`.
- [Release notes](https://github.com/Microsoft/GSL/releases)
- [Commits](383723676c...2bfd495080)

---
updated-dependencies:
- dependency-name: deps/GSL
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-15 04:13:14 +00:00
dependabot[bot]
d8d9214739
Bump deps/sol2 from 50b62c9 to 6409634
Bumps [deps/sol2](https://github.com/ThePhD/sol2) from `50b62c9` to `6409634`.
- [Release notes](https://github.com/ThePhD/sol2/releases)
- [Commits](50b62c9346...6409634846)

---
updated-dependencies:
- dependency-name: deps/sol2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-14 04:12:05 +00:00
dependabot[bot]
3ad9c168ad
Bump deps/asmjit from 21a31b8 to a4cb51b
Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `21a31b8` to `a4cb51b`.
- [Release notes](https://github.com/asmjit/asmjit/releases)
- [Commits](21a31b8a33...a4cb51b532)

---
updated-dependencies:
- dependency-name: deps/asmjit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 04:13:38 +00:00
Maurice Heumann
4bffbedd6c
Merge pull request #364 from fedddddd/scoreboard-ping
Show numerical ping in scoreboard
2022-04-10 10:08:53 +02:00
Maurice Heumann
dd48865e82
Merge pull request #365 from diamante0018/develop
Use ex from cppref for converting strings up/lower
2022-04-09 22:35:16 +02:00
Diavolo
3507eb6999
Use ex from cppref for converting strings up/lower 2022-04-09 21:13:00 +02:00
Federico Cecchetto
60d864366c Show numerical ping in scoreboard 2022-04-08 18:48:27 +02:00
dependabot[bot]
177c7a9881
Bump deps/rapidjson from 8261c1d to fcb23c2
Bumps [deps/rapidjson](https://github.com/Tencent/rapidjson) from `8261c1d` to `fcb23c2`.
- [Release notes](https://github.com/Tencent/rapidjson/releases)
- [Commits](8261c1ddf4...fcb23c2dbf)

---
updated-dependencies:
- dependency-name: deps/rapidjson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-06 04:33:24 +00:00
dependabot[bot]
ddbe158e13
Bump deps/zlib from 2014a99 to ec3df00
Bumps [deps/zlib](https://github.com/madler/zlib) from `2014a99` to `ec3df00`.
- [Release notes](https://github.com/madler/zlib/releases)
- [Commits](2014a993ad...ec3df00224)

---
updated-dependencies:
- dependency-name: deps/zlib
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-31 04:12:18 +00:00
dependabot[bot]
db75f631c3
Bump deps/libtommath from 66de864 to 5108f12
Bumps [deps/libtommath](https://github.com/libtom/libtommath) from `66de864` to `5108f12`.
- [Release notes](https://github.com/libtom/libtommath/releases)
- [Commits](66de86426e...5108f12350)

---
updated-dependencies:
- dependency-name: deps/libtommath
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-29 04:13:21 +00:00
Maurice Heumann
44b372f967
Merge pull request #350 from diamante0018/better-strip
[Utils] Refactor strip function
2022-03-26 09:40:01 +01:00
Maurice Heumann
f3146ca708
Merge pull request #352 from diamante0018/develop
[Utils] Further cleanup
2022-03-26 09:39:30 +01:00
FutureRave
16c7e3a9ed
Improve readability 2022-03-24 10:54:11 +00:00
FutureRave
d7c63b2f8e
Remove reduntant inline specifier 2022-03-23 13:00:59 +00:00
FutureRave
26abb3a352 Merge branch 'develop' of https://github.com/diamante0018/s1x-client into develop 2022-03-23 12:11:21 +00:00
FutureRave
81a8200d22
Remove unnecessary const_cast 2022-03-23 12:11:12 +00:00
Maurice Heumann
ed362d07e6
Merge pull request #346 from skkuull/develop
fix stats
2022-03-23 13:01:04 +01:00
Maurice Heumann
8680aa31c1
Merge pull request #349 from diamante0018/develop
Add sustain ammo dvar
2022-03-23 12:58:37 +01:00
Maurice Heumann
59919b4536
Merge pull request #351 from XLabsProject/dependabot/submodules/deps/GSL-3837236
Bump deps/GSL from `4377f6e` to `3837236`
2022-03-23 12:56:21 +01:00
dependabot[bot]
9c79c81aed
Bump deps/GSL from 4377f6e to 3837236
Bumps [deps/GSL](https://github.com/Microsoft/GSL) from `4377f6e` to `3837236`.
- [Release notes](https://github.com/Microsoft/GSL/releases)
- [Commits](4377f6e603...383723676c)

---
updated-dependencies:
- dependency-name: deps/GSL
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-23 04:11:27 +00:00
FutureRave
92bd54aed7
[Utils] Refactor strip function 2022-03-22 15:13:50 +00:00
Edo
31b178937c
Accidental paste 2022-03-22 14:49:44 +00:00
Skull Merlin
69853cc0c3
Update stats.cpp 2022-03-22 17:43:15 +03:00
FutureRave
d11d97932b
Add sustain ammo Dvar 2022-03-22 11:48:53 +00:00
Maurice Heumann
9db8598adf
Merge pull request #345 from XLabsProject/dependabot/submodules/deps/libtomcrypt-06a81ae
Bump deps/libtomcrypt from `673f5ce` to `06a81ae`
2022-03-22 06:22:28 +01:00
Maurice Heumann
cca8a0f570
Merge pull request #348 from XLabsProject/dependabot/submodules/deps/asmjit-21a31b8
Bump deps/asmjit from `6efd4d5` to `21a31b8`
2022-03-22 06:22:17 +01:00
dependabot[bot]
be07d38129
Bump deps/asmjit from 6efd4d5 to 21a31b8
Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `6efd4d5` to `21a31b8`.
- [Release notes](https://github.com/asmjit/asmjit/releases)
- [Commits](6efd4d563d...21a31b8a33)

---
updated-dependencies:
- dependency-name: deps/asmjit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 04:16:26 +00:00
Skull Merlin
17caafece3 fix stats 2022-03-18 22:16:34 +02:00
dependabot[bot]
f95c215805
Bump deps/libtomcrypt from 673f5ce to 06a81ae
Bumps [deps/libtomcrypt](https://github.com/libtom/libtomcrypt) from `673f5ce` to `06a81ae`.
- [Release notes](https://github.com/libtom/libtomcrypt/releases)
- [Commits](673f5ce290...06a81aeb22)

---
updated-dependencies:
- dependency-name: deps/libtomcrypt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-17 04:13:16 +00:00
Maurice Heumann
84f405b1a0
Merge pull request #342 from XLabsProject/master
Merge release v2.0.3
2022-03-15 21:13:47 +01:00
Maurice Heumann
53647766a7
Merge pull request #341 from XLabsProject/develop
Release v2.0.3
2022-03-15 21:12:21 +01:00
Maurice Heumann
5aadada0eb
Merge pull request #340 from FragsAreUs/develop
Fixes issue of players not able to load into zm
2022-03-15 21:09:28 +01:00
FragsAreUs
a9fab46a26 Fixes issue of players not able to load into zm 2022-03-15 16:01:48 -04:00
Maurice Heumann
fb38114ba4
Merge pull request #337 from XLabsProject/dependabot/submodules/deps/libtommath-66de864
Bump deps/libtommath from `04e9d1e` to `66de864`
2022-03-15 07:32:39 +01:00
Maurice Heumann
90ed083a9e
Merge pull request #339 from XLabsProject/master
Merge release v2.0.2
2022-03-15 07:32:30 +01:00
Maurice Heumann
e0a68bfd52
Merge pull request #338 from XLabsProject/develop
Release v2.0.2
2022-03-15 07:31:18 +01:00
Maurice Heumann
0e3208fe6c
Merge pull request #336 from FragsAreUs/develop
fix server list lua not loading
2022-03-15 07:12:56 +01:00
dependabot[bot]
78086e71a8
Bump deps/libtommath from 04e9d1e to 66de864
Bumps [deps/libtommath](https://github.com/libtom/libtommath) from `04e9d1e` to `66de864`.
- [Release notes](https://github.com/libtom/libtommath/releases)
- [Commits](04e9d1e7a0...66de86426e)

---
updated-dependencies:
- dependency-name: deps/libtommath
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 04:12:19 +00:00
FragsAreUs
e0ba10a6f4 fix server list not loading
changed require to include this change was also needed for when fed did the new fps and ping overlay in lua
2022-03-14 16:25:38 -04:00
Maurice Heumann
2699575d5a
Merge pull request #334 from mjkzy/server-list
Replace "Find Game" with "Server List"
2022-03-14 19:18:57 +01:00
Maurice Heumann
46a896bff3
Merge pull request #335 from mjkzy/stats-menu
optional unlock all via Stats menu
2022-03-14 19:01:35 +01:00