Ben Wallis
811712316b
main/offhand weapon swap check refactor
2021-05-16 21:53:30 +01:00
Sam
ad0c247838
Removed special case for equipping a weapon that is no longer needed.
2021-05-15 15:16:39 -05:00
Sam
5cc6168553
Unequipping a mainhand weapon now moves offhand weapon into mainhand.
2021-05-15 15:16:39 -05:00
Sam
19926a2322
Swapping weapon sets is now functional. (Though very hacky?)
2021-05-15 15:16:39 -05:00
Sam
23cc3d671b
Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?)
2021-05-15 15:16:38 -05:00
Sam
6b153bcf47
Enforced certain invariants in how an item was equipped into the loadout:
...
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
- a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
- 2h weapons can never be equipped in an offhand slot
Fixed some tests
2021-05-15 15:16:38 -05:00
Sam
9173dca03f
Added equip slots for other weapons.
2021-05-15 15:16:37 -05:00
holychowders
d5f3ba77d4
Make NPCs Aware of Sound - See Issue #913
2021-05-15 19:36:27 +00:00
Marcel
7d5ca0e7bf
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
8745fb803a
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Snowram
b063ec5a8f
Clean unused mount offset
2021-05-14 00:11:46 +02:00
Snowram
486fbf940e
Anims export a transform for mounts
2021-05-14 00:11:37 +02:00
Snowram
026ba616ff
Expose the mounting bone to the mounter anims
2021-05-14 00:11:28 +02:00
Snowram
e4f3064b8a
Collar can make QuadMeds mountable, state + offsets
2021-05-14 00:11:15 +02:00
James Melkonian
4d4bc132f4
Campfires can set things on fire and water puts it out
2021-05-13 05:34:51 +00:00
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
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
James Melkonian
f76b61ac17
Make merchants /tell instead of /say
2021-05-11 17:26:22 +00:00
Sam
7f6c6c5603
Fixed offsets for laser and rocket attacks of clay golem.
2021-05-10 18:54:04 -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
9bbdc26089
Added haniwa sentries to level 3 dungeons.
2021-05-10 18:53:50 -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
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
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
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
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
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
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
Illia Denysenko
1c22a2b3fd
/skill_preset command
2021-05-08 15:47:09 +00: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
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Samuel Keiffer
a2999ce96f
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
e4cda4309e
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
346eb48a27
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
