Commit Graph

547 Commits

Author SHA1 Message Date
momo5502
1c6f1ddb32 Update protobuf 2021-07-25 11:24:26 +02:00
Maurice Heumann
09dac2f343
Update README.md 2021-07-23 08:21:10 +02:00
Maurice Heumann
e9bd262a09
Merge pull request #237 from XLabsProject/dependabot/submodules/deps/stb-3a11740
Bump deps/stb from `7023e27` to `3a11740`
2021-07-23 08:13:38 +02:00
Maurice Heumann
e13c7e6ee7
Merge pull request #239 from XLabsProject/dependabot/submodules/deps/lua-439e45a
Bump deps/lua from `dbdc74d` to `439e45a`
2021-07-23 08:13:32 +02:00
dependabot[bot]
7dec513056
Bump deps/lua from dbdc74d to 439e45a
Bumps [deps/lua](https://github.com/lua/lua) from `dbdc74d` to `439e45a`.
- [Release notes](https://github.com/lua/lua/releases)
- [Commits](dbdc74dc55...439e45a2f6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-23 04:12:28 +00:00
dependabot[bot]
b92da85c95
Bump deps/stb from 7023e27 to 3a11740
Bumps [deps/stb](https://github.com/nothings/stb) from `7023e27` to `3a11740`.
- [Release notes](https://github.com/nothings/stb/releases)
- [Commits](7023e273f1...3a1174060a)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-14 04:19:19 +00:00
Maurice Heumann
d0e63e83b2
Merge pull request #235 from XLabsProject/dependabot/submodules/deps/stb-7023e27
Bump deps/stb from `8e51be0` to `7023e27`
2021-07-12 08:18:46 +02:00
dependabot[bot]
7dbcd65201
Bump deps/stb from 8e51be0 to 7023e27
Bumps [deps/stb](https://github.com/nothings/stb) from `8e51be0` to `7023e27`.
- [Release notes](https://github.com/nothings/stb/releases)
- [Commits](8e51be04dc...7023e273f1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 04:19:23 +00:00
momo5502
0282b38ab2 Merge remote-tracking branch 'origin/master' into develop 2021-07-11 15:52:17 +02:00
Maurice Heumann
d40536c636
Merge pull request #234 from XLabsProject/develop
Release v1.1.0
2021-07-11 15:50:38 +02:00
momo5502
914b6afef2 Fix relaunching 2021-07-11 15:34:38 +02:00
momo5502
a9b4956181 Fix splash screen 2021-07-11 15:30:21 +02:00
momo5502
2d87e83125 Apply environment 2021-07-11 15:21:09 +02:00
momo5502
da00c259e4 Fix build 2021-07-11 15:18:56 +02:00
momo5502
d2371f7193 Update submodules 2021-07-11 15:17:59 +02:00
momo5502
7dc94f0531 Prepare for launcher 2021-07-11 15:16:32 +02:00
momo5502
5cd8b711a4 Fix environment 2021-07-11 14:36:01 +02:00
momo5502
5d09bc116b Prepare launcher integration 2021-07-11 12:53:31 +02:00
Maurice Heumann
3b6edc4ad7
Merge pull request #226 from XLabsProject/dependabot/submodules/deps/asmjit-c329fa7
Bump deps/asmjit from `78de7d9` to `c329fa7`
2021-06-25 12:39:24 +02:00
Maurice Heumann
c0eb7fecfc
Merge pull request #225 from XLabsProject/dependabot/submodules/deps/GSL-8a4b9ed
Bump deps/GSL from `b26f6d5` to `8a4b9ed`
2021-06-25 12:39:17 +02:00
Maurice Heumann
921b15a325
Merge pull request #224 from XLabsProject/dependabot/submodules/deps/stb-80c8f6a
Bump deps/stb from `ea2f937` to `80c8f6a`
2021-06-25 12:39:11 +02:00
dependabot[bot]
e1c51dd662
Bump deps/asmjit from 78de7d9 to c329fa7
Bumps [deps/asmjit](https://github.com/asmjit/asmjit) from `78de7d9` to `c329fa7`.
- [Release notes](https://github.com/asmjit/asmjit/releases)
- [Commits](78de7d9c81...c329fa7ce0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-25 04:17:25 +00:00
dependabot[bot]
7df390d852
Bump deps/GSL from b26f6d5 to 8a4b9ed
Bumps [deps/GSL](https://github.com/Microsoft/GSL) from `b26f6d5` to `8a4b9ed`.
- [Release notes](https://github.com/Microsoft/GSL/releases)
- [Commits](b26f6d5ec7...8a4b9ed0bf)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 04:18:56 +00:00
dependabot[bot]
185913b767
Bump deps/stb from ea2f937 to 80c8f6a
Bumps [deps/stb](https://github.com/nothings/stb) from `ea2f937` to `80c8f6a`.
- [Release notes](https://github.com/nothings/stb/releases)
- [Commits](ea2f937a01...80c8f6af03)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-21 04:18:26 +00:00
Maurice Heumann
0a6dfc614a
Merge pull request #222 from XLabsProject/dependabot/submodules/deps/rapidjson-b557259
Bump deps/rapidjson from `17aa824` to `b557259`
2021-06-15 16:31:49 +02:00
dependabot[bot]
703e795e41
Bump deps/rapidjson from 17aa824 to b557259
Bumps [deps/rapidjson](https://github.com/Tencent/rapidjson) from `17aa824` to `b557259`.
- [Release notes](https://github.com/Tencent/rapidjson/releases)
- [Commits](17aa824c92...b557259f88)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 06:56:32 +00:00
Maurice Heumann
091176d85d Verify mapped binary base #221 2021-06-13 08:57:03 +02:00
Maurice Heumann
56633a8dcc Make sure to unprotect tls 2021-06-12 23:09:24 +02:00
Maurice Heumann
1ff9cae0e7 Prevent crashes in exception handler during pre-init phase
Fixes one bug of #221
2021-06-12 19:59:48 +02:00
Maurice Heumann
b6aa23fc37
Merge pull request #217 from Brentdevent/motd
improved motd for zombies
2021-06-09 11:07:18 +02:00
Brentdevent
477be6564f Merge branch 'XLabsProject:develop' into motd 2021-06-07 20:30:14 +02:00
Brentdevent
9e4d140c68 zombies motd fix #155 2021-06-07 13:05:28 +02:00
Maurice Heumann
11097d44d9 Revert "Bump deps/protobuf from 70db61a to 909a0f3"
This reverts commit 8b58dba9dd.
2021-06-07 10:52:31 +02:00
Maurice Heumann
9540235956
Merge pull request #214 from XLabsProject/dependabot/submodules/deps/stb-ea2f937
Bump deps/stb from `c9064e3` to `ea2f937`
2021-06-07 09:54:29 +02:00
Maurice Heumann
bf6fcd08bf
Merge pull request #215 from XLabsProject/dependabot/submodules/deps/libtomcrypt-673f5ce
Bump deps/libtomcrypt from `165c795` to `673f5ce`
2021-06-07 09:54:21 +02:00
Maurice Heumann
5a0a3eaaa9
Merge pull request #216 from XLabsProject/dependabot/submodules/deps/protobuf-909a0f3
Bump deps/protobuf from `70db61a` to `909a0f3`
2021-06-07 09:54:11 +02:00
dependabot[bot]
8b58dba9dd
Bump deps/protobuf from 70db61a to 909a0f3
Bumps [deps/protobuf](https://github.com/google/protobuf) from `70db61a` to `909a0f3`.
- [Release notes](https://github.com/google/protobuf/releases)
- [Commits](70db61a91b...909a0f36a1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 07:51:44 +00:00
dependabot[bot]
1001185185
Bump deps/libtomcrypt from 165c795 to 673f5ce
Bumps [deps/libtomcrypt](https://github.com/libtom/libtomcrypt) from `165c795` to `673f5ce`.
- [Release notes](https://github.com/libtom/libtomcrypt/releases)
- [Commits](165c795b65...673f5ce290)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 07:51:34 +00:00
dependabot[bot]
11aaf5d181
Bump deps/stb from c9064e3 to ea2f937
Bumps [deps/stb](https://github.com/nothings/stb) from `c9064e3` to `ea2f937`.
- [Release notes](https://github.com/nothings/stb/releases)
- [Commits](c9064e3176...ea2f937a01)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 07:51:30 +00:00
Maurice Heumann
d1bd0515c0
Merge pull request #212 from XLabsProject/dependabot/submodules/deps/protobuf-70db61a
Bump deps/protobuf from `b42f237` to `70db61a`
2021-06-05 16:40:58 +02:00
dependabot[bot]
f8558d91a9
Bump deps/protobuf from b42f237 to 70db61a
Bumps [deps/protobuf](https://github.com/google/protobuf) from `b42f237` to `70db61a`.
- [Release notes](https://github.com/google/protobuf/releases)
- [Commits](b42f2376e4...70db61a91b)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-03 07:19:37 +00:00
Maurice Heumann
ae6565bb5a
Merge pull request #210 from XLabsProject/dependabot/submodules/deps/protobuf-b42f237
Bump deps/protobuf from `769826e` to `b42f237`
2021-05-31 14:59:08 +02:00
dependabot[bot]
4b2d63a992
Bump deps/protobuf from 769826e to b42f237
Bumps [deps/protobuf](https://github.com/google/protobuf) from `769826e` to `b42f237`.
- [Release notes](https://github.com/google/protobuf/releases)
- [Commits](769826e338...b42f2376e4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 06:30:02 +00:00
Maurice Heumann
c3c1862d07
Merge pull request #207 from XLabsProject/dependabot/submodules/deps/protobuf-769826e
Bump deps/protobuf from `e635605` to `769826e`
2021-05-27 08:20:48 +02:00
dependabot[bot]
774d71baf4
Bump deps/protobuf from e635605 to 769826e
Bumps [deps/protobuf](https://github.com/google/protobuf) from `e635605` to `769826e`.
- [Release notes](https://github.com/google/protobuf/releases)
- [Commits](e635605003...769826e338)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 06:26:45 +00:00
Maurice Heumann
1e82cf5bff
Merge pull request #205 from mjkzy/discord-stuff-1
(Discord) Fix server's player max + Private Match
2021-05-25 19:52:35 +02:00
m
bb186e048b
use error ig 2021-05-25 12:41:10 -05:00
m
f2e41f8e21 oopsie 2021-05-25 03:14:30 -05:00
m
434842bdc9 fix server player max + private match 2021-05-25 03:12:20 -05:00
Maurice Heumann
c429b22393
Merge pull request #204 from XLabsProject/dependabot/submodules/deps/protobuf-e635605
Bump deps/protobuf from `367e469` to `e635605`
2021-05-25 09:31:07 +02:00