Marcel
be56cd2a87
Revert "Merge branch 'sharp/revert-quinn' into 'master'"
...
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
Joshua Yanovski
20eccf597b
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
...
This reverts commit 04d8ddf25ed6b1ae8dd97846c5c4b9af4ab399b8, reversing
changes made to 9dcf7a9d26f7d60020c5707fea3ed8ac5596d3dc.
2021-05-17 08:32:12 -07:00
Marcel
48208b711d
Merge branch 'xMAC94x/quic_enablement' into 'master'
...
Add a configuration Option to opt-in Quic backend
See merge request veloren/veloren!2268
2021-05-17 12:02:55 +00:00
holychowders
21867f8a85
Make NPCs Aware of Sound - See Issue #913
2021-05-15 19:36:27 +00:00
Marcel
8218fdd329
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
b38c9e593b
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Snowram
c594e500e0
Clean unused mount offset
2021-05-14 00:11:46 +02:00
Snowram
6fb06af1c5
Anims export a transform for mounts
2021-05-14 00:11:37 +02:00
Snowram
d3b171f608
Expose the mounting bone to the mounter anims
2021-05-14 00:11:28 +02:00
Snowram
a01add2e2c
Collar can make QuadMeds mountable, state + offsets
2021-05-14 00:11:15 +02:00
James Melkonian
cdbf023645
Campfires can set things on fire and water puts it out
2021-05-13 05:34:51 +00:00
Marcel
b044253d52
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
Joshua Yanovski
e457c3547d
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
James Melkonian
fb2cd3fd45
Make merchants /tell instead of /say
2021-05-11 17:26:22 +00:00
Sam
cefa9d1ff3
Fixed offsets for laser and rocket attacks of clay golem.
2021-05-10 18:54:04 -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
ed830e6935
Added haniwa sentries to level 3 dungeons.
2021-05-10 18:53:50 -05:00
Snowram
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
Marcel Märtens
cb845f86ba
cleanup error codes
2021-05-10 12:59:44 +02:00
Joshua Yanovski
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
Joshua Yanovski
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
Samuel Keiffer
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
Samuel Keiffer
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
Avi Weinstock
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
Avi Weinstock
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
juliancoffee
4ac795c982
Add species to /spawn auto-complete
2021-05-09 20:43:13 +03:00
Benoît du Garreau
9cfe2911e5
Only load images as PNG
2021-05-09 19:02:48 +02:00
juliancoffee
85e879a549
style convention
2021-05-09 19:05:01 +03:00
juliancoffee
7bec0bc529
add authors
2021-05-09 13:12:26 +03:00
juliancoffee
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
juliancoffee
d4fd0d6b96
Search for assets in workspace root
2021-05-09 13:12:26 +03:00
juliancoffee
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
Marcel
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
Illia Denysenko
ac1b01c636
/skill_preset command
2021-05-08 15:47:09 +00:00
Avi Weinstock
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
Adam Strauss
32ae8420fe
Fix #1105 : Move server event so it does not emit constantly during build up
2021-05-07 15:40:11 -07:00
Adam Strauss
0e6f9a5599
Implement #1105 : Rolling removes burning debuff
2021-05-07 15:38:41 -07:00
Snowram
9d4d6a066a
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Samuel Keiffer
67eff3d351
Merge branch 'aweinstock/damage-types' into 'master'
...
Add `DamageKind`, and make piercing damage partially ignore damage resistence.
See merge request veloren/veloren!2262
2021-05-06 22:22:49 +00:00
Avi Weinstock
ff83cf752b
Add DamageKind, and make piercing damage partially ignore damage resistence.
...
- Tweak bow/staff M1 stats.
2021-05-06 17:39:06 -04:00
James Melkonian
d849bf7d29
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
Benoît du Garreau
724fbadf9e
Guess image format from file extension
2021-05-06 17:49:25 +02:00
Marcel
8e4fb87500
Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master'
...
instead of manually trying to sync disconnect metrics we now pass a Reason to...
See merge request veloren/veloren!2259
2021-05-06 11:32:37 +00:00
Marcel Märtens
ab33b8cc3d
instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect.
...
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
2021-05-06 11:43:10 +02:00
