Commit Graph

4388 Commits

Author SHA1 Message Date
e3a3e2209d Merge branch 'develop' into steammodtypo 2023-09-08 23:20:57 +02:00
30f7829c6e Merge pull request #41 from maiyuzhe/maiyuzhe-codol-patch-1
Update ZoneBuilder.cpp for building CoDOL Maps
2023-09-08 23:20:46 +02:00
9a8c3cd65d Fix typo in steam mod 2023-08-31 12:36:16 +02:00
585074d033 Moved fixes into Zones.cpp
Fixes that were previously being done through compiling with zonebuilder are now done when the map dumps.  No longer dealing with the heroOnlyLights, only mp_abandon_sh_mk seems to have that problem and that map is done.
2023-08-30 03:59:21 +00:00
896fd49cf7 Removed code 2023-08-30 03:55:35 +00:00
eb1fc62aca Merge branch 'develop' into maiyuzhe-codol-patch-1 2023-08-29 23:53:25 -04:00
01a1567173 Merge pull request #44 from diamante0018/develop
fix(serverlist): remove macro that stops the master from working
2023-08-29 22:35:12 +02:00
b6c1089b1a fix(serverlist): remove macro that stops the master from working 2023-08-29 22:18:38 +02:00
b0bb9e7843 Update ZoneBuilder.cpp 2023-08-29 20:06:11 +00:00
f2e373a793 Update ZoneBuilder.cpp for building CoDOL Maps
AssetHandler::ModifyAsset checks the zone version and then applies a patch, this won't work with maps compiled with zonebuilder because the ff version is the same as other iw4 zones.  Therefore the sortkey needs to be fixed when the map gets built instead of at runtime.
2023-08-29 00:12:56 +00:00
adee95a9de Merge pull request #35 from iw4x/dependabot/submodules/deps/libtomcrypt-b96e96c
Bump deps/libtomcrypt from `93f5348` to `b96e96c`
2023-08-29 00:26:38 +02:00
0c72017d64 Merge pull request #34 from iw4x/dependabot/submodules/deps/zlib-79a0e44
Bump deps/zlib from `48c3741` to `79a0e44`
2023-08-29 00:26:31 +02:00
1898e22ea1 Merge pull request #33 from iw4x/dependabot/submodules/deps/rapidjson-476ffa2
Bump deps/rapidjson from `973dc9c` to `476ffa2`
2023-08-29 00:26:23 +02:00
5c90bcd7cb Merge pull request #14 from iw4x/dependabot/submodules/deps/libtommath-3746c58
Bump deps/libtommath from `c6a00c2` to `3746c58`
2023-08-29 00:25:32 +02:00
13cdbc0432 Merge pull request #20 from iw4x/dependabot/submodules/deps/pdcurses-5c62af0
Bump deps/pdcurses from `0eb254a` to `5c62af0`
2023-08-29 00:25:24 +02:00
6ebe64df12 Merge pull request #22 from iw4x/dependabot/submodules/deps/GSL-4300304
Bump deps/GSL from `afaaa71` to `4300304`
2023-08-29 00:25:17 +02:00
4261252824 Merge pull request #38 from diamante0018/rcon
rcon with rsa cryptography
2023-08-29 00:25:04 +02:00
d5becf4955 Merge branch 'develop' into rcon 2023-08-29 00:20:44 +02:00
a3263be77d Merge pull request #37 from diamante0018/master-server
feat: go back to a main master server, node as fallback
2023-08-29 00:19:33 +02:00
762c32d100 Merge pull request #39 from diamante0018/bot
feature(bots): if bots.txt is empty use AW names
2023-08-29 00:17:23 +02:00
5f49941d30 Merge branch 'develop' of https://github.com/iw4x/iw4x-client into diamante/rcon 2023-08-29 00:10:25 +02:00
ea7cc4bfaa Merge branch 'develop' of https://github.com/iw4x/iw4x-client into diamante/master-server 2023-08-29 00:09:46 +02:00
a7b5a578b4 Merge branch 'develop' of https://github.com/iw4x/iw4x-client into diamante/bot 2023-08-29 00:05:29 +02:00
65d8a7994c Fix signed/unsigned boogaloo 2023-08-28 23:56:35 +02:00
6a220f446d fix release 2023-08-28 20:19:58 +02:00
5b197a756a feature(bots): if bots.txt is empty use my names 2023-08-28 19:52:39 +02:00
b55ff8675e rcon with rsa cryptography 2023-08-28 19:50:19 +02:00
f6ca5a92de feat: go back to a main master server, node as fallback 2023-08-28 19:33:10 +02:00
d660035040 Bump deps/libtomcrypt from 93f5348 to b96e96c
Bumps [deps/libtomcrypt](https://github.com/libtom/libtomcrypt) from `93f5348` to `b96e96c`.
- [Release notes](https://github.com/libtom/libtomcrypt/releases)
- [Commits](93f5348c47...b96e96cf8b)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-24 10:02:13 +00:00
2f09bce08e Bump deps/zlib from 48c3741 to 79a0e44
Bumps [deps/zlib](https://github.com/madler/zlib) from `48c3741` to `79a0e44`.
- [Release notes](https://github.com/madler/zlib/releases)
- [Commits](48c3741002...79a0e447a0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-21 09:52:43 +00:00
776e5578d0 Bump deps/rapidjson from 973dc9c to 476ffa2
Bumps [deps/rapidjson](https://github.com/Tencent/rapidjson) from `973dc9c` to `476ffa2`.
- [Release notes](https://github.com/Tencent/rapidjson/releases)
- [Commits](973dc9c06d...476ffa2fd2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-21 09:52:39 +00:00
395e531d8d Fix up some structs sign 2023-08-19 18:09:42 +02:00
1800341b95 BG_WeaponRecoilMultiplier 2023-08-19 18:09:20 +02:00
353c36cf46 DrawDebugClipmap 2023-08-19 18:09:05 +02:00
4d2dcd426a Added dumptechset command - removed header function that did not exist anymore 2023-08-19 18:08:47 +02:00
582b85958e Bump IW4OF 2023-08-05 15:17:49 +02:00
1466b27c4b Merge pull request #23 from diamante0018/develop
fix(node): make node system responsive
2023-07-27 18:04:25 +02:00
208b68f218 fix(node): make node system responsive 2023-07-27 17:55:35 +02:00
7365808e9a Bump deps/GSL from afaaa71 to 4300304
Bumps [deps/GSL](https://github.com/microsoft/GSL) from `afaaa71` to `4300304`.
- [Release notes](https://github.com/microsoft/GSL/releases)
- [Commits](afaaa71bce...4300304ef2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-27 09:36:21 +00:00
8425354ab1 Bumped IW4OF 2023-07-25 12:52:19 +02:00
bbe9c2c1eb Fixed a hack into a better hack, but it should still be removed when we have a chance to 2023-07-25 12:51:16 +02:00
99cf31514a Bump IW4OF 2023-07-24 20:50:09 +02:00
d006d1ffa4 Bump deps/pdcurses from 0eb254a to 5c62af0
Bumps [deps/pdcurses](https://github.com/wmcbrine/PDCurses) from `0eb254a` to `5c62af0`.
- [Release notes](https://github.com/wmcbrine/PDCurses/releases)
- [Commits](0eb254ae43...5c62af03e9)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-13 10:02:40 +00:00
7dd0ebcfb8 Bump deps/libtommath from c6a00c2 to 3746c58
Bumps [deps/libtommath](https://github.com/libtom/libtommath) from `c6a00c2` to `3746c58`.
- [Release notes](https://github.com/libtom/libtommath/releases)
- [Commits](c6a00c26ca...3746c58f29)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-23 10:14:49 +00:00
4b1aade899 Merge branch 'diamante_develop' into develop
# Conflicts:
#	.gitmodules
2023-06-22 19:23:13 +02:00
057d6307cb Redirect git iw4of submodule to /iw4x 2023-06-22 19:07:43 +02:00
008775d1b4 fix(utils): typo 2023-06-22 11:19:25 +02:00
4d7d51fb29 maint(node): literally a one line fix I can't do without 2023-06-22 00:30:34 +02:00
6fd4ec54cc fix(utils): fix RSA function 2023-06-21 22:12:38 +02:00
da34ecbba7 maint(utils): clean up RSA code 2023-06-21 21:50:41 +02:00