Commit Graph

893 Commits

Author SHA1 Message Date
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
m
17f5e2b35c unlock DLC classes 2022-03-14 10:19:12 -05:00
m
ecc247fe51 remove dupe code, format, fix no value returned 2022-03-14 10:17:21 -05:00
m
6c9cee1f47 only use in frontend 2022-03-11 17:20:07 -06:00
m
e5905e96c1 Replace "Find Game" with "Server List" 2022-03-11 16:30:57 -06:00
m
5210a93224 format 2022-03-11 16:28:55 -06:00
m
afbde29d4b optional unlock all via Stats menu 2022-03-11 04:45:42 -06:00
Maurice Heumann
83637cc3d1
Merge pull request #332 from fedddddd/develop_
Check msg size in command handling
2022-03-11 07:43:27 +01:00
Federico Cecchetto
26eeea68e9 Check msg size in command handling 2022-03-10 22:12:56 +01:00
Maurice Heumann
f589892589
Merge pull request #329 from XLabsProject/dependabot/submodules/deps/rapidjson-8261c1d
Bump deps/rapidjson from `e4bde97` to `8261c1d`
2022-03-10 19:12:53 +01:00
Maurice Heumann
14c988389e
Merge pull request #330 from fedddddd/lui-fps-counter
Fix scripts not getting loaded from xlabs folder
2022-03-10 05:33:42 +01:00
Federico Cecchetto
0efad73186 Fix scripts not getting loaded from xlabs folder 2022-03-10 00:24:30 +01:00
dependabot[bot]
9f7ed874ec
Bump deps/rapidjson from e4bde97 to 8261c1d
Bumps [deps/rapidjson](https://github.com/Tencent/rapidjson) from `e4bde97` to `8261c1d`.
- [Release notes](https://github.com/Tencent/rapidjson/releases)
- [Commits](e4bde97744...8261c1ddf4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-09 04:19:09 +00:00
Maurice Heumann
8688234cf8
Merge pull request #328 from fedddddd/ranked
Ranked dedis
2022-03-07 08:12:58 +01:00
Federico Cecchetto
1ac59e7390 Ranked dedis 2022-03-06 21:53:51 +01:00
Maurice Heumann
ad530c6f35
Merge pull request #326 from fedddddd/lui-fps-counter
Better ping & fps counter
2022-03-06 13:11:22 +01:00
Federico Cecchetto
26640a977f Better ping & fps counter 2022-03-05 18:29:33 +01:00
Maurice Heumann
815786e3bf
Merge pull request #325 from diamante0018/develop
[bots] Replace obscure ternary operator with std::min
2022-03-02 11:54:21 +01:00
FutureRave
95faf2374e
Replace obscure ternary operator with std::min 2022-03-01 23:40:35 +00:00
Maurice Heumann
ae509101b1
Merge pull request #322 from XLabsProject/dependabot/submodules/deps/asmjit-6efd4d5
Bump deps/asmjit from `a4e1e88` to `6efd4d5`
2022-03-01 21:23:21 +01:00
Maurice Heumann
c7c66f6ec7
Merge pull request #323 from fedddddd/lui-scripting-fix
LUI scripting fixes
2022-03-01 21:22:54 +01:00