Commit Graph

3137 Commits

Author SHA1 Message Date
Dmitry Kashitsyn
45916d1794
Fix accidental jump cancellation during dispatch of NpcActivity::Goto
`AgentData::jump_if` cancels `InputKind::Jump` if condition
is not met. Even if the jump itself was issued elsewhere.
This prevented merchants and travelers from reaching target site
if somewhere along the path jump is required.

This is exactly what happens during dispatch of `NpcActivity::Goto`.
Original implementation contained `traverse` followed by `jump_if`
for flying NPCs which cancelled pending `InputKind::Jump` issued
by `traverse`.

This fix extends jump condition inside traverse by
including `traversal_config.can_fly`.
2024-04-02 22:16:12 +05:00
flo
f8f2684810 easter_and_april_fools_stuff 2024-04-01 06:46:43 +00:00
Marcel Märtens
35afd20b63 Change the version number to 0.16 2024-03-30 00:10:54 +01:00
crabman
8c7f99371b
New default singleplayer world 2024-03-28 09:33:42 +00:00
crabman
c589bc5ca0
friendly fire and pvp at desert arenas! 2024-03-26 11:34:07 +00:00
crabman
4d67e808e1
address review comments 2024-03-26 11:34:07 +00:00
crabman
8dd7e3e0d5
/aura command 2024-03-25 19:56:08 +00:00
crabman
af4f147fda
FriendlyFire and ForcePvP auras 2024-03-25 19:56:08 +00:00
Joshua Barretto
3c846d4d17 Merge branch 'zesterer/shader-improvements' into 'master'
Shader improvements

See merge request veloren/veloren!4290
2024-03-22 18:40:45 +00:00
Marcel
fbca6d852b Merge branch 'juliancoffee/remove-general-st' into 'master'
Remove health, energy and roll skills

See merge request veloren/veloren!4382
2024-03-20 22:12:47 +00:00
juliancoffee
c7cc287e89 Respond to review
- Add changelog
- Remove unused code
2024-03-20 23:12:35 +02:00
juliancoffee
55ae460d1d Remove health/energy increase skills 2024-03-20 23:08:45 +02:00
juliancoffee
1e6e595a87 Comment-out health/energy skills 2024-03-20 23:08:45 +02:00
Marcel Märtens
941b204681 update some dependencies manually 2024-03-20 09:36:58 +01:00
Isse
daa78a75ac register plugins before worldgen and support spots in plugins 2024-03-14 21:57:50 +01:00
Isse
eccdc18eb7 fix ci-clippy2 2024-03-14 00:46:18 +01:00
Isse
ed25ea98ce store plugin data in memory 2024-03-14 00:46:18 +01:00
Christof Petig
029f3e2a1f remove merge artifact 2024-03-14 00:46:18 +01:00
Christof Petig
12e9b491a4 fix clippy in non-plugin feature 2024-03-14 00:46:18 +01:00
Christof Petig
3e0ca7d6d4 Load missing plugins from the server
individual commits combined here:
send active plugins
compute plugin sha hash
single position for defining Hash type
request plugins from the server
Server sending the plugin to the client
store received plugin in file and use it
handle plugin data at the right place
pass config_dir to client init
load local plugins
operational plugin caching
simplify the interface
clippy suggestions
remove artifacts
fix compilation of test world
ChangeLog entry
code quality fixes
improve readability
adapt to multiple systems
2024-03-14 00:46:18 +01:00
Ben Wallis
d70086a239 Merge branch 'xvar/character-index' into 'master'
Added database index to character.player_uuid column

See merge request veloren/veloren!4369
2024-03-12 11:44:42 +00:00
Ben Wallis
2d73cef1ab Added database index to character.player_uuid column 2024-03-08 09:33:43 +00:00
crabman
d58f7f0931
address review comments 2024-03-06 20:44:06 +01:00
crabman
504e45ebdb
allow entity -> chunk anchor chains 2024-03-06 20:24:03 +01:00
crabman
40fed95760
allow pet definitions in entity configurations 2024-03-06 20:24:03 +01:00
Illia Denysenko
840e95f21c Merge branch 'juliancoffee/glider-ability' into 'master'
Vroom Glider

See merge request veloren/veloren!4282
2024-03-06 13:13:49 +00:00
Imbris
301fc15b47 Logging to identify issue where the server gets in a state where the character list doesn't load for new clients 2024-03-05 21:05:04 -05:00
crabman
feecd6ea2b
Dynamic merging of dropped items 2024-03-05 20:59:32 +00:00
flo
327c195374 cursekeeper_tweaks 2024-03-03 17:50:46 +00:00
juliancoffee
18a26731d3 Add glider aux abilities 2024-03-03 17:56:09 +02:00
juliancoffee
3ad227545a Remove char_state from active_auxiliary_key 2024-03-03 17:56:09 +02:00
juliancoffee
4dcf6215d2 Route character state to Diary UI 2024-03-03 17:56:09 +02:00
juliancoffee
3eee002fa3 Made behaviour during GlideWield more clean 2024-03-02 22:51:47 +02:00
juliancoffee
29ca171256 Spread out /make_npc starting velocities 2024-03-01 21:59:08 +02:00
juliancoffee
60d47326bd Implement reliable gliding AI
- Wield glider when falling, but do nothing else
- Safe auto glide when in gliding state
- Agent unwield glider if on ground
2024-03-01 21:59:08 +02:00
crabman
c50f1047f7
Added allow_players flag to Transform character state 2024-02-28 22:06:57 +00:00
crabman
a14c2f054c
addressed review comments 2024-02-28 22:03:35 +00:00
crabman
b9a3fa1edc
transform server event 2024-02-28 22:03:34 +00:00
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master'
terracotta_small_tweaks

See merge request veloren/veloren!4332
2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
Samuel Keiffer
94f6c3350c Merge branch 'danielkenji83/block-based-on-poise' into 'master'
Block based on poise

See merge request veloren/veloren!4283
2024-02-21 16:53:24 +00:00
flo
605cb0837f phoenix_tweaks 2024-02-18 19:11:34 +00:00
danielkenji83
1c504ea060 Rebase fix 2024-02-17 01:07:55 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
crabman
1daa2ce3db Merge branch 'entity-delete-fix' into 'master'
Fix a few event system and death related bugs

See merge request veloren/veloren!4323
2024-02-13 18:09:17 +00:00
crabman
4f4e560e72
register group_manip and information event systems 2024-02-13 18:24:56 +01:00
evgenkot
f4ce05a657 I18n move stats 2024-02-13 17:01:27 +05:00
crabman
e225da7a75
disallow trading dead entities 2024-02-12 23:55:05 +01:00
crabman
8285162967
Fix a few cases where return was incorectly used in event systems 2024-02-12 23:49:52 +01:00
crabman
aaa1bd2af9
Correctly delete entities (including those that don't drop items!) 2024-02-12 23:35:21 +01:00
evgenkot
eee330c9e9 I18n loot_scroller correct name 2024-02-12 21:24:57 +05:00
crabman
62a73e5c14
remove dbg statement 2024-02-10 17:34:56 +01:00
Christof Petig
f56e1d84b5 Use wasmtime to execute wasm components as veloren plugins 2024-02-10 09:35:04 +00:00
Joshua Barretto
9f48a855c4 Improved cloud scale 2024-02-09 22:03:30 +00:00
Isse
857d924979 add missing event handlers, use common_ecs::System 2024-02-07 12:21:04 +01:00
Isse
e94c21daa6 try to optimize a bit 2024-02-07 11:00:18 +01:00
Isse
8a9fdd1805 add todo comment 2024-02-07 10:46:39 +01:00
Isse
b891bb038a create event dispatcher at start 2024-02-07 10:38:37 +01:00
Isse
63a7ecd5d7 clippy fixes 2024-02-07 10:38:37 +01:00
Isse
d75889ed75 don't insert event busses on client 2024-02-07 10:38:37 +01:00
Isse
e651b9b2ac initial setup and convert entity_manipulation 2024-02-07 10:38:37 +01:00
juliancoffee
bfff41dc97 Rever alignment and group manipulation 2024-02-06 15:58:40 +02:00
juliancoffee
4067cd783a Clean up presence/persistence logic for /into_npc 2024-02-06 15:43:46 +02:00
juliancoffee
d6a17366f1 fmt 2024-02-06 15:43:46 +02:00
juliancoffee
0caa54bf5b Convert into Possessor for /into_npc 2024-02-06 15:43:45 +02:00
juliancoffee
7e2f219de1 Rename /be_npc to /into_npc 2024-02-06 15:43:45 +02:00
juliancoffee
70b5c2927d Add /alignment command 2024-02-06 15:43:45 +02:00
juliancoffee
8889407660 Add /be_npc command 2024-02-06 15:43:45 +02:00
Marcel Märtens
6ebbb89d4d update toolchain to nightly-2024-01-17 2024-02-05 19:51:50 +01:00
juliancoffee
7b5d9e1eac More direct comments 2024-02-04 18:37:15 +02:00
juliancoffee
5aa88ac223 Store the gender in CharacterInfo 2024-02-03 18:58:46 +02:00
juliancoffee
aecdadca14 Improving documentation 2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
Sam
d4e2095d40 Fix character creation error 2024-02-02 20:07:01 -05:00
Sam
26b1561bca Changed to using a separte pseudo container in the database for overflow items 2024-02-02 20:07:01 -05:00
Sam
ccb997cc96 Added check for multiple items being stored with the same overflow position. 2024-02-02 20:07:00 -05:00
Sam
394e798d04 Addressed review comments 2024-02-02 20:07:00 -05:00
Sam
8d1df956d6 Addressed review comments 2024-02-02 20:06:58 -05:00
Sam
d01997ca56 Overflow slots as slots 2024-02-02 20:06:55 -05:00
Sam
93ca630a13 Automatically overflows items to 'overflow slots' that are inaccessible if items cannot be inserted in persistence on character load. 2024-02-02 20:06:05 -05:00
Christof Petig
eaba303670 Merge branch 'christof/hot-reload-fix' into 'master'
Fix hot reloading for plugin combined manifests

See merge request veloren/veloren!4280
2024-01-28 20:02:02 +00:00
Isse
2023786f5e Merge branch 'isse/optimize-weather' into 'master'
Optimize weather

See merge request veloren/veloren!4270
2024-01-27 17:20:53 +00:00
Christof Petig
cc93474c2f fix hot reloading of combined manifests 2024-01-27 12:40:34 +01:00
Maxicarlos08
f759fd5059
don't remove blocks when applying changes for new chunks 2024-01-26 00:57:21 +01:00
Isse
61a568ab53 weather/tick.rs fixes 2024-01-25 00:40:04 +01:00
Isse
5e37697f0c add comment about lightning 2024-01-23 23:20:10 +01:00
Isse
497cb13e50 always use players weather, and fix weather fr this time 2024-01-23 23:18:14 +01:00
Isse
8f15dedc3b fix weather_zone command, and only send local wind once every 30 ticks 2024-01-23 22:21:33 +01:00
Isse
268215b301 make weather not block main thread, and lessen the amount of data shared with client. 2024-01-22 19:53:36 +01:00
Joshua Barretto
92a8bc2806 Merge branch 'zesterer/toggle-light-sprites' into 'master'
Added the ability to toggle light sources on and off

See merge request veloren/veloren!4267
2024-01-22 09:39:31 +00:00
Joshua Barretto
d836461f8d Use SpriteInteract state for toggling lights 2024-01-21 21:30:08 +00:00
Joshua Barretto
ad8965fdd7 Don't use distinct event system for handling sprite interactions 2024-01-21 21:30:08 +00:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
do-no-van
646c57501f make fortitude scale of difference from maximum health 2024-01-21 20:18:19 +00:00
Illia Denysenko
727d32c104 Merge branch 'master' into 'master'
Prevent time until next battlemode change from being displayed as negative

See merge request veloren/veloren!4205
2024-01-21 13:35:09 +00:00
Keegan-JW
77d6492dbf Prevent time until next battlemode change from being displayed as negative 2024-01-21 13:35:09 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Joshua Barretto
a852298010 Merge branch 'zesterer/better-char-select-scene' into 'master'
Render render LoD terrain on char select, remove old backdrop figure

See merge request veloren/veloren!4254
2024-01-16 18:51:04 +00:00
Isse
4f084506c0 Merge branch 'juliancoffee/item-i18n' into 'master'
Add Item i18n

Closes #903

See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00:00
Maxicarlos08
d814296676
review fixes 2024-01-15 17:55:16 +01:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
Joshua Barretto
3d9ab445d9
Added rules field to server description 2024-01-15 00:02:42 +01:00
juliancoffee
b8e6840bf6 Enhance /kit all
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
  anymore
2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
juliancoffee
296f70c1b2 Unify /buff_complex and /buff
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40 Add /buff_complex command 2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175 Warn about complex buffs when using /buff 2024-01-08 20:13:17 +02:00
Imbris
03e46de748 Merge branch 'imbris/construct-dispatcher-once' into 'master'
Only construct specs::Dispatcher once

See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
Imbris
6eedea7821 review fixes #2 2024-01-04 19:55:17 -05:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
807bd758b7 cargo fmt 2024-01-04 00:30:21 -05:00
Imbris
6c6b9181a5 Only construct specs::Dispatcher once
* use version of shred that has an added SendDispatcher so we can
  construct the dispatcher and send it between threads (only State to
  remain sendable)
* move closure for adding systems from State::tick to the creation
  functions
* this does mean some voxygen systems always run instead of just in the
  session state, but that should not cause issues and we can always
  configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Maxicarlos08
37b562aaf6
Clippyyy 2024-01-02 23:42:14 +01:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions 2024-01-02 23:42:14 +01:00
Maxicarlos08
004be6395f
Don't dismount if we're a steering entity 2024-01-02 23:42:14 +01:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
flo
8e76aaceb8 make_crustaceans_tameable 2023-12-26 19:55:21 +00:00
Christof Petig
c0b56671ec hang wreaths at the fireplace 2023-12-14 23:29:32 +01:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +01:00
Isse
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Isse
8569f30336 review fixes 2023-12-12 19:41:40 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
HEIEnthusiast
b742d2987b Migration for burning potion 2023-12-05 15:54:12 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
Maxicarlos08
1cf733597d
Don't allow bypassing loot protection with curious potion 2023-11-27 18:54:20 +01:00
Isse
a4caa2bc26 use Result::or for Either::from_str 2023-11-26 15:37:14 +01:00
Isse
a151a6f550 tether length argument 2023-11-23 22:22:34 +01:00
Isse
2500fa2b42 Command error on trying to spawn a pet for an anchored entity 2023-11-23 20:52:20 +01:00
Isse
4d8bcf0a92 only preprocess for entity target argument 2023-11-23 11:04:30 +01:00
Isse
5a3e6316a5 fix tethering 2023-11-23 01:01:31 +01:00
Isse
34edfdb7a2 link related commands 2023-11-22 23:10:32 +01:00
Isse
1071fd0bca entity targets 2023-11-22 22:40:56 +01:00
Isse
456c0ad3e8 Merge branch 'isse/rtsim-vehicles' into 'master'
Unify RTSim vehicles and NPCs

See merge request veloren/veloren!4168
2023-11-22 14:53:58 +00:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Isse
e0e7fe499d despawn with volume mount 2023-11-15 11:58:26 +01:00
Isse
7856aac713 Remove dead code and factor out into Dir::random_2d 2023-11-15 11:58:26 +01:00
Isse
e0dbba0279 clippy fixes 2023-11-15 11:58:26 +01:00
Isse
7fd255ec6c bug fixes and airships land at airship stations 2023-11-15 11:58:26 +01:00
Isse
1f195fd848 Make vehicles npcs and npc uid used in rtsim commands 2023-11-15 11:58:26 +01:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
d3b3bca621 Added precision 2023-11-14 18:06:59 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Samuel Keiffer
fdb28ec2dd Merge branch 'sam/buff-maps' into 'master'
Changed buffs from using hash maps to an enum map and a slot map.

See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Sam
a4df3f8ad5 Split action state into two sets of state, one each for combat and behavior. 2023-11-12 12:45:03 -05:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00