Marcel Märtens
2ea5fd876b
cleanup error codes
2021-05-10 12:59:44 +02:00
Marcel Märtens
b443e4dd31
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
Joshua Yanovski
0cf0f59fa7
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
Joshua Yanovski
e7587c4d9d
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
Samuel Keiffer
a86c3af42b
Merge branch 'aweinstock/mindflayerfixes-202105' into 'master'
...
Mindflayer AI improvments
See merge request veloren/veloren!2285
2021-05-10 02:54:21 +00:00
Samuel Keiffer
6c9a2663ba
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
Avi Weinstock
abcb6f34a3
Remove the dependency of the new mindflayer AI on action_state.timer
.
2021-05-09 21:16:57 -04:00
Marcel
c1fc375543
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
Avi Weinstock
1ae105125d
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
Avi Weinstock
1dfcdce1c0
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
juliancoffee
93b3d12478
remove ssh feature from git2
2021-05-10 00:49:45 +03:00
Samuel Keiffer
9168ddac75
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
Illia Denysenko
cb2412148b
Miniboss Loot quickfix
2021-05-09 21:29:35 +00:00
juliancoffee
5e598964b1
Downgrade git2 to compile on windows
2021-05-10 00:09:33 +03:00
Joshua Yanovski
7ee2d9dfa3
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
juliancoffee
2881034426
update CHANGELOG
2021-05-09 20:43:13 +03:00
juliancoffee
d3be89f5eb
Add species to /spawn auto-complete
2021-05-09 20:43:13 +03:00
Benoît du Garreau
2718fdb1ca
Only load images as PNG
2021-05-09 19:02:48 +02:00
Marcel
587b48871d
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
juliancoffee
3d011098b8
style convention
2021-05-09 19:05:01 +03:00
juliancoffee
2035c041f9
add authors
2021-05-09 13:12:26 +03:00
juliancoffee
359a46d6f2
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
juliancoffee
9af0b6dd12
Search for assets in workspace root
2021-05-09 13:12:26 +03:00
juliancoffee
279d57658d
Fix paths and adding tests
2021-05-09 13:12:26 +03:00
juliancoffee
0a63b10f4c
rename i18n/src/i18n.rs to i18n/src/data.rs
2021-05-09 13:12:26 +03:00
juliancoffee
735e8ab4ec
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
juliancoffee
0784c2a76a
Make fields more private
2021-05-09 13:12:26 +03:00
juliancoffee
c511028290
remove unneeded imports
2021-05-09 13:12:26 +03:00
juliancoffee
911bf974f3
Use hashbrown
2021-05-09 13:12:26 +03:00
juliancoffee
89b6111064
Remove unused dependencies
2021-05-09 13:12:26 +03:00
juliancoffee
5573fc33b9
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
juliancoffee
50e992ed0d
use hashbrown instead of std::collections
2021-05-09 13:12:26 +03:00
juliancoffee
622101d3b1
Update instuction for using binary
2021-05-09 13:12:26 +03:00
juliancoffee
fd387bda7c
Add comments
2021-05-09 13:12:25 +03:00
juliancoffee
5f32b37768
Integrate verification from i18n_check
2021-05-09 13:12:25 +03:00
juliancoffee
f42e8aa147
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
juliancoffee
57cddb3ee3
Extract localization test to binary
...
- Implement `--all` option
- Implement `--lang <code>` option
- Implement `--verify` command
2021-05-09 13:12:25 +03:00
Monty Marz
9f0ca486f7
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
Monty Marz
335b4c5420
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
Monty Marz
a17bb0ad73
Better inactive/active audio slider logic
2021-05-09 09:51:41 +00:00
Avi Weinstock
0f424ec95a
Distinguish NAMETAG_MERCHANT_RANGE from NAMETAG_GROUP_RANGE.
2021-05-08 17:49:51 -04:00
Marcel
eb3cc2fd22
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
Marcel
2ea69a6180
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
Marcel
39843860fb
Merge branch 'juliancoffee/preset_cmd' into 'master'
...
/skill_preset command
See merge request veloren/veloren!2274
2021-05-08 15:47:10 +00:00
Illia Denysenko
1c22a2b3fd
/skill_preset command
2021-05-08 15:47:09 +00:00
Avi Weinstock
560c58663e
Add max-convolution to heightmap visualization, and specify required-features
for it to make CI work.
2021-05-08 11:19:37 -04:00
Avi Weinstock
7ec7540be4
Make projectiles function properly if they hit a wall in the same tick as an entity.
2021-05-07 23:20:57 -04:00
Adam Strauss
a5b7e34bf8
Fix #1105 : Move server event so it does not emit constantly during build up
2021-05-07 15:40:11 -07:00
Adam Strauss
3d17fde537
Implement #1105 : Rolling removes burning debuff
2021-05-07 15:38:41 -07:00
Snowram
ad3a63fc80
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