Commit Graph

8655 Commits

Author SHA1 Message Date
cb845f86ba cleanup error codes 2021-05-10 12:59:44 +02:00
869a922b2d Add Quin support, as this is not yet very much tested it needs to be activated in the settings of SERVER and CLIENT.
Server:
 provide a certificate file and key file via the settings. When provided it will then listen on TCP and QUIC, if not provided it will be TCP only.
 The certificate must be known by the client, so you might get problems with self-signed certificates.
 ```ron
 quic_files: Some((
     cert: "/home/user/veloren_cert.pem",
     key: "/home/user/veloren_key.key",
 )),
 ```

Client:
 activate the voxygen settin `use_quic: true` to try to connect to the quic backend of a server.
2021-05-10 12:59:13 +02:00
2015f34985 Merge branch 'sharp/modtools' into 'master'
Added non-admin moderators and timed bans.

See merge request veloren/veloren!2276
2021-05-10 04:54:06 +00:00
3f8d2f95be Added non-admin moderators and timed bans.
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator).  Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).

To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions).  Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.

As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
2021-05-09 21:19:16 -07:00
f0cc0b57ed Merge branch 'aweinstock/mindflayerfixes-202105' into 'master'
Mindflayer AI improvments

See merge request veloren/veloren!2285
2021-05-10 02:54:21 +00:00
4259de3b26 Merge branch 'aws107/roll-to-remove-burning' into 'master'
Implement #1105: Rolling removes burning debuff

Closes #1105

See merge request veloren/veloren!2271
2021-05-10 02:40:08 +00:00
f7bc0cd429 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
86724bee0a Merge branch 'juliancoffee/downgrage_git2' into 'master'
Downgrade git2 to compile on windows

See merge request veloren/veloren!2284
2021-05-09 23:14:45 +00:00
6ac0f6fdd9 Change agent's condition field back to a bool (from bitflags) and add a separate int_counter field. 2021-05-09 18:09:53 -04:00
7103467d1a Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
d2cba0f4e5 remove ssh feature from git2 2021-05-10 00:49:45 +03:00
99840a8569 Merge branch 'juliancoffee/miniboss_quick_fix' into 'master'
Miniboss Loot quickfix

See merge request veloren/veloren!2279
2021-05-09 21:29:35 +00:00
3dab8786f1 Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
6cfd9c24b3 Downgrade git2 to compile on windows 2021-05-10 00:09:33 +03:00
0ea10ff950 Merge branch 'juliancoffee/improve_spawn_cmd_ux' into 'master'
improve /spawn cmd UX

See merge request veloren/veloren!2283
2021-05-09 20:22:29 +00:00
173abedfca update CHANGELOG 2021-05-09 20:43:13 +03:00
4ac795c982 Add species to /spawn auto-complete 2021-05-09 20:43:13 +03:00
9cfe2911e5 Only load images as PNG 2021-05-09 19:02:48 +02:00
53adfabfd0 Merge branch 'juliancoffee/decouple_localization_checks' into 'master'
Extract voxygen/src/i18n.rs  to crate

See merge request veloren/veloren!2244
2021-05-09 16:47:25 +00:00
85e879a549 style convention 2021-05-09 19:05:01 +03:00
7bec0bc529 add authors 2021-05-09 13:12:26 +03:00
ab2ee20ba3 Fix tests
1) Use more correct way to look for `assets` dir
2) Rename veloren_common::assets to veloren_common_assets in doc-tests
2021-05-09 13:12:26 +03:00
d4fd0d6b96 Search for assets in workspace root 2021-05-09 13:12:26 +03:00
ce68d0268e Fix paths and adding tests 2021-05-09 13:12:26 +03:00
04de189427 rename i18n/src/i18n.rs to i18n/src/data.rs 2021-05-09 13:12:26 +03:00
5bd4dcc167 Extract common/src/assets.rs to own crate
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
2021-05-09 13:12:26 +03:00
45af1a8446 Make fields more private 2021-05-09 13:12:26 +03:00
79ab181125 remove unneeded imports 2021-05-09 13:12:26 +03:00
696136fffc Use hashbrown 2021-05-09 13:12:26 +03:00
53314e8961 Remove unused dependencies 2021-05-09 13:12:26 +03:00
333754b2e6 Extract voxygen/src/i18n.rs into own crate
- New crate (i18n), currently under voxygen directory
- Updated CI to run localization test from i18n, not from voxygen
2021-05-09 13:12:26 +03:00
b4bd196837 use hashbrown instead of std::collections 2021-05-09 13:12:26 +03:00
1ab817b4ba Update instuction for using binary 2021-05-09 13:12:26 +03:00
2d9f4d4a95 Add comments 2021-05-09 13:12:25 +03:00
684f7f6e0a Integrate verification from i18n_check 2021-05-09 13:12:25 +03:00
0611b166ed Integrate changes and improving code style
- Integrate voxygen/i18n-check to voxygnen/src/i18n.rs
- Make `cargo clippy` happy
2021-05-09 13:12:25 +03:00
6bc6f6bbba Extract localization test to binary
- Implement `--all` option
- Implement `--lang <code>` option
- Implement `--verify` command
2021-05-09 13:12:25 +03:00
e5613603e4 Merge branch 'aweinstock/small-fixes' into 'master'
Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE.

See merge request veloren/veloren!2277
2021-05-09 09:58:44 +00:00
d161d63184 Merge branch 'pfau/tiny_ui_fix' into 'master'
Better inactive/active audio slider logic

See merge request veloren/veloren!2278
2021-05-09 09:51:42 +00:00
0aa2c129b8 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
1580fbe339 Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE. 2021-05-08 17:49:51 -04:00
7a0f4f1dec Merge branch 'aweinstock/heightmap_visualization' into 'master'
Add heightmap visualization to world/examples.

See merge request veloren/veloren!2246
2021-05-08 16:02:11 +00:00
7e85e35ff9 Merge branch 'aweinstock/fix-bow-20210507' into 'master'
Make projectiles function properly if they hit a wall in the same tick as an entity.

See merge request veloren/veloren!2275
2021-05-08 15:47:12 +00:00
274655c45f Merge branch 'juliancoffee/preset_cmd' into 'master'
/skill_preset command

See merge request veloren/veloren!2274
2021-05-08 15:47:10 +00:00
ac1b01c636 /skill_preset command 2021-05-08 15:47:09 +00:00
bb2c5ce5d3 Add max-convolution to heightmap visualization, and specify required-features for it to make CI work. 2021-05-08 11:19:37 -04:00
be8a509ef2 Make projectiles function properly if they hit a wall in the same tick as an entity. 2021-05-07 23:20:57 -04:00
32ae8420fe Fix #1105: Move server event so it does not emit constantly during build up 2021-05-07 15:40:11 -07:00
0e6f9a5599 Implement #1105: Rolling removes burning debuff 2021-05-07 15:38:41 -07:00
3ab4ace814 Merge branch 'snowram/craftmats-ron-fix' into 'master'
Fixes object manifest

See merge request veloren/veloren!2273
2021-05-07 21:06:37 +00:00