Commit Graph

174 Commits

Author SHA1 Message Date
m
086a54987d
change the checks for main menu 2021-03-13 22:24:22 -06:00
m
e2e1a9b2de
assign temp values for partySize + state 2021-03-13 10:03:59 -06:00
m
a2ab4a01d7
add discord presence 2021-03-13 09:55:43 -06:00
Maurice Heumann
315c159a1b
Merge pull request #33 from Joelrau/develop
Allow kbam while gamepad is enabled & Logger stuff
2021-03-13 10:50:31 +01:00
quaK
9292c857aa Add more logging stuff 2021-03-13 00:58:24 +02:00
quaK
3b238d8363 Allow kbam input when gamepad is enabled 2021-03-13 00:57:47 +02:00
momo5502
37f8409d82 Fix possible UAF 2021-03-11 20:45:46 +01:00
Maurice Heumann
6158fc5279
Merge pull request #30 from XLabsProject/feature/demonware
Feature/demonware
2021-03-09 19:32:12 +01:00
momo5502
9bc0d526ce More cleanup 2021-03-09 19:22:26 +01:00
momo5502
a240a93d85 Fix compile issue 2021-03-09 19:18:18 +01:00
momo5502
bbcf0d2529 Rename unknown service 2021-03-09 19:12:11 +01:00
momo5502
6ba4e274e2 Allow offline play
This fixes #19
2021-03-09 18:59:24 +01:00
momo5502
d4ca18258c Prepare umbrella emulation 2021-03-09 18:01:43 +01:00
momo5502
b10fd2d139 Cleanup 2021-03-09 18:01:31 +01:00
Maurice Heumann
c9fdef395e
Merge pull request #29 from XLabsProject/dependabot/submodules/deps/GSL-ef0ffef
Bump deps/GSL from `84aeb59` to `ef0ffef`
2021-03-09 17:31:44 +01:00
dependabot-preview[bot]
ada6aea849
Bump deps/GSL from 84aeb59 to ef0ffef
Bumps [deps/GSL](https://github.com/Microsoft/GSL) from `84aeb59` to `ef0ffef`.
- [Release notes](https://github.com/Microsoft/GSL/releases)
- [Commits](84aeb59f26...ef0ffefe52)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-08 07:22:40 +00:00
momo5502
59ed54b4e6 Merge remote-tracking branch 'origin/develop' into feature/demonware 2021-03-07 20:52:26 +01:00
momo5502
0f20fea57c Update submodules 2021-03-07 20:52:08 +01:00
momo5502
4597a0c356 Merge remote-tracking branch 'origin/feature/demonware' into develop 2021-03-07 20:41:45 +01:00
momo5502
f84204b065 Format code 2021-03-07 20:41:16 +01:00
Maurice Heumann
6e2c2d3a41
Merge pull request #28 from XLabsProject/feature/demonware
Feature/demonware
2021-03-07 20:06:41 +01:00
momo5502
d72d20c6be Merge remote-tracking branch 'origin/develop' into feature/demonware 2021-03-07 19:54:54 +01:00
momo5502
e46982700c Fix tlsdll collision with IW6x
This fixes #27
2021-03-07 19:54:06 +01:00
momo5502
61974c18db Cleanup includes 2021-03-07 11:16:56 +01:00
Maurice Heumann
62f5122004
Merge pull request #26 from XLabsProject/feature/demonware
Feature/demonware
2021-03-05 20:56:16 +01:00
momo5502
ac7652a075 Implement stun server emulation 2021-03-05 20:46:32 +01:00
momo5502
8cd1d4cf8a Implement server registry 2021-03-05 19:37:38 +01:00
momo5502
d30184acb7 Merge remote-tracking branch 'origin/develop' into feature/demonware 2021-03-03 20:39:33 +01:00
Maurice Heumann
260cfe21b8
Merge pull request #24 from Joelrau/develop
Unlock everything and re-enable virtuallobby
2021-03-03 20:37:48 +01:00
quaK
058c485dac Add stats component 2021-03-03 14:31:19 +02:00
quaK
796a8931a0 Unlock variants and enable virtuallobby 2021-03-03 14:31:10 +02:00
momo5502
3b6d08137f Use existing base64 coder 2021-03-02 21:36:10 +01:00
Maurice Heumann
113c455db3 Merge remote-tracking branch 'origin/develop' into feature/demonware 2021-03-02 21:07:38 +01:00
Maurice Heumann
3397d0435b Support building on pull requests 2021-03-02 21:06:12 +01:00
momo5502
c01550c17a More cleanup and refactoring 2021-03-02 20:44:48 +01:00
Maurice Heumann
006ed9a64d
Merge pull request #23 from XLabsProject/dependabot/submodules/deps/rapidjson-1c2c8e0
Bump deps/rapidjson from `b1a4d91` to `1c2c8e0`
2021-03-02 20:22:22 +01:00
dependabot-preview[bot]
4fb3cec596
Bump deps/rapidjson from b1a4d91 to 1c2c8e0
Bumps [deps/rapidjson](https://github.com/Tencent/rapidjson) from `b1a4d91` to `1c2c8e0`.
- [Release notes](https://github.com/Tencent/rapidjson/releases)
- [Commits](b1a4d91a53...1c2c8e085a)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-02 07:05:18 +00:00
Maurice Heumann
ac709d54af
Merge pull request #22 from XLabsProject/feature/demonware
Merge current demonware refactoring progress
2021-03-01 21:20:43 +01:00
momo5502
5a288c69e3 Cleanup warnings 2021-03-01 21:07:15 +01:00
momo5502
25051135e9 Cleanup branch 2021-03-01 20:56:16 +01:00
momo5502
2c20ae3b18 Stabilize external console 2021-03-01 20:53:14 +01:00
momo5502
19161a4e5c More demonware cleanup 2021-03-01 20:53:01 +01:00
momo5502
ffd475840c Use rapidjson for JSON encoding 2021-03-01 20:22:38 +01:00
Maurice Heumann
09ad05bc8a Switch to new server bases 2021-03-01 19:19:08 +01:00
momo5502
8479bdfbf7 Remove nlomann json 2021-02-26 17:12:44 +01:00
momo5502
33f32be35c Remove leftover code 2021-02-26 16:54:05 +01:00
momo5502
7058ed19e5 Prepare tcp server base 2021-02-26 16:53:07 +01:00
momo5502
ebd614aaf7 Merge remote-tracking branch 'origin/develop' into feature/demonware 2021-02-26 16:52:09 +01:00
Maurice Heumann
115f3db750
Merge pull request #21 from XLabsProject/dependabot/submodules/deps/GSL-ef0ffef
Bump deps/GSL from `84aeb59` to `ef0ffef`
2021-02-25 11:13:46 +01:00
quaK
533a007d45 Minor fixes 2021-02-25 10:03:54 +02:00