Commit Graph

9145 Commits

Author SHA1 Message Date
Marcel
607f8b289b Merge branch 'alphyr/guess_image_format' into 'master'
Guess image format from file extension

See merge request veloren/veloren!2260
2021-05-12 18:41:22 +00:00
Marcel
276dd2f26c Merge branch 'tui/newline_in_trace' into 'master'
enable TUI to actually handle newline character.

See merge request veloren/veloren!2282
2021-05-12 18:05:50 +00:00
Marcel Märtens
a65ef892ca use split_inclusive instead 2021-05-12 18:40:12 +02:00
Marcel Märtens
863e11d5e3 enable TUI to actually handle newline character.
but we are not sure if NEWLINEs are wanted in logs as it could cause problems with automated parsing.
2021-05-12 18:40:08 +02:00
Marcel
3a437f2bda Merge branch 'xMAC94x/mirror_collab' into 'master'
dont run CI on master on mirror

See merge request veloren/veloren!2291
2021-05-12 13:05:28 +00:00
Joshua Yanovski
45367b192f Merge branch 'sharp/skip-sprite-mesh' into 'master'
Don't remesh chunk vertex data on sprite update.

See merge request veloren/veloren!2294
2021-05-11 20:39:04 +00:00
Joshua Yanovski
3869cdf1d2 Don't remesh chunk vertex data on sprite update.
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
2021-05-11 12:58:15 -07:00
Marcel
7e1f32c283 Merge branch 'james/merchant-tell' into 'master'
Make merchants /tell instead of /say

See merge request veloren/veloren!2293
2021-05-11 17:26:22 +00:00
James Melkonian
f76b61ac17 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
Joshua Yanovski
20911e8995 Merge branch 'sharp/docker-stdin-tty' into 'master'
More fixes to stdin input.

See merge request veloren/veloren!2292
2021-05-11 12:12:24 +00:00
Joshua Yanovski
33494c0e29 More fixes to stdin input.
Adding tty makes sure docker attach won't be accidentally detached
by ctrl-C (there are better ways of doing this but this one works
for now)

shell-words more closely emulates Bash's tokenizer rules (but without
doing things like environment variable expansion) which allows us to use
multiline strings as reasons, etc.  Unfortunately entering newlines
still won't work the way we've written things since shell-words does not
right now give enough information to incrementally build up a valid
string, just says there was a tokenizing error; but maybe in the future
we can fix that.
2021-05-11 04:15:59 -07:00
Marcel
3f4ff839bb Merge branch 'sharp/docker-stdin-open' into 'master'
Open stdin when using Veloren with docker.

See merge request veloren/veloren!2288
2021-05-11 09:29:31 +00:00
Marcel Märtens
a064cf4ca5 dont run CI on master on mirror 2021-05-11 08:54:10 +02:00
Joshua Yanovski
81bba1393a Merge branch 'sam/clay-golem' into 'master'
Clay Golem Rework

See merge request veloren/veloren!2264
2021-05-11 01:36:13 +00:00
Joshua Yanovski
edc9c37482 Merge branch 'xMAC94x/remove-sponsorship' into 'master'
DO no longer sponsors us in 2021

See merge request veloren/veloren!2290
2021-05-11 01:19:05 +00:00
Sam
7acd953923 Changed particles to a switch statement. 2021-05-10 19:58:32 -05:00
Sam
cd5096fe73 Changelog 2021-05-10 18:57:33 -05:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
jshipsey
770d07ac90 anims 2021-05-10 18:54:03 -05:00
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
d14fd59711 Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
a497ac0353 Added kit for testing. 2021-05-10 18:53:50 -05:00
Sam
9bbdc26089 Added haniwa sentries to level 3 dungeons. 2021-05-10 18:53:50 -05:00
Sam
58e5b1fdf5 AI tweaks. 2021-05-10 18:53:49 -05:00
Sam
4e5a456b18 Balance tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Marcel
217462805d Merge branch 'juliancoffee/improve_i18n_check' into 'master'
Refactor i18n analysis code and improve UX of testing binary

See merge request veloren/veloren!2289
2021-05-10 22:13:01 +00:00
Illia Denysenko
f626d27955 Refactor i18n analysis code and improve UX of testing binary 2021-05-10 22:13:00 +00:00
Marcel Märtens
b4de3fcda1 DO no longer sponsors us in 2021 2021-05-10 23:29:13 +02:00
Snowram
43593bc4c9 Merge branch 'pfau/fix-1h-axes' into 'master'
Fix 1h-axes

See merge request veloren/veloren!2287
2021-05-10 20:44:10 +00:00
Monty Marz
fab3794bf3 Fix 1h-axes 2021-05-10 20:44:09 +00:00
Joshua Yanovski
51911417ee Open stdin when using Veloren with docker.
This allows entering CLI commands like `help`, `admin add`, and
`shutdown` directly using `docker attach`, rather than needing to run
server-cli commands separately or perform a manual reboot or interrupt.
2021-05-10 11:44:04 -07:00
Joshua Barretto
47e21ae226 Merge branch 'zesterer/small-fixes' into 'master'
Prevented low FPS from limiting chunk loading performance

See merge request veloren/veloren!2286
2021-05-10 14:05:07 +00:00
Joshua Barretto
1478daecbc Prevented low FPS from limiting chunk loading performance 2021-05-10 14:23:37 +01:00
Marcel Märtens
9e357dfa0c remove ViewDistance from Client::new() and fix tests 2021-05-10 12:59:49 +02:00
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