Commit Graph

8338 Commits

Author SHA1 Message Date
62da0c6231 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
fb2cd3fd45 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
1549173396 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
39369e090f 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
ee94fc53ac 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
3c863c9a9a dont run CI on master on mirror 2021-05-11 08:54:10 +02:00
01642460f0 Merge branch 'sam/clay-golem' into 'master'
Clay Golem Rework

See merge request veloren/veloren!2264
2021-05-11 01:36:13 +00:00
44b7ea9424 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
93f982df7b Changed particles to a switch statement. 2021-05-10 19:58:32 -05:00
Sam
73e6827eb5 Changelog 2021-05-10 18:57:33 -05:00
Sam
cefa9d1ff3 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
8b0a2a0199 anims 2021-05-10 18:54:03 -05:00
Sam
510c1980da Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
0cc94c41ee Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
5107cb45fb Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
6913266765 Added kit for testing. 2021-05-10 18:53:50 -05:00
Sam
ed830e6935 Added haniwa sentries to level 3 dungeons. 2021-05-10 18:53:50 -05:00
Sam
a7495801d9 AI tweaks. 2021-05-10 18:53:49 -05:00
Sam
138d09e207 Balance tweaks. 2021-05-10 18:53:49 -05:00
6cb67b85da Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
f39d5e34bf Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
1f73bad862 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
57e4966e98 Golem AI 2021-05-10 18:53:43 -05:00
Sam
083d3d2a6c Clay golem attacks done. 2021-05-10 18:53:01 -05:00
c9fdc639f7 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
3cd279df3d Refactor i18n analysis code and improve UX of testing binary 2021-05-10 22:13:00 +00:00
1cb8174c8b DO no longer sponsors us in 2021 2021-05-10 23:29:13 +02:00
e4ffbeba86 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
a1c2a7161b Fix 1h-axes 2021-05-10 20:44:09 +00:00
99dd89ac60 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
7013fef862 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
4f9863e388 Prevented low FPS from limiting chunk loading performance 2021-05-10 14:23:37 +01:00
e20f74a5f1 remove ViewDistance from Client::new() and fix tests 2021-05-10 12:59:49 +02:00
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