Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,864 Commits 151 Branches 18 Tags 2.1 GiB
5c5f33d124
Commit Graph

4921 Commits

Author SHA1 Message Date
BigKhan
f626fdc496 Added Autumn Trees 2024-01-27 21:12:51 +00:00
Christof Petig
ed7fd13a50 fix unit tests 2024-01-27 21:24:24 +01:00
maxicarlos08
d11c58b75b Merge branch 'synis/item-tabcomplete' into 'master' 
Incremental item path autocomplete

See merge request veloren/veloren!4281
 2024-01-27 18:03:21 +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
Syniis
488922ac94 Cleaner code 2024-01-27 16:16:30 +01:00
Syniis
b97e27df9a Allow specifiying prefix for AssetPath command argument 2024-01-27 15:44:03 +01:00
Christof Petig
b407a2b186 Fix the obvious problems, still recipe book isn't hot reloading any more 2024-01-27 15:19:37 +01:00
Syniis
d46dbb9708 Incremental item path autocomplete 2024-01-27 13:41:39 +01:00
Christof Petig
cc93474c2f fix hot reloading of combined manifests 2024-01-27 12:40:34 +01:00
Christof Petig
bab8c713fb simplify cache handling 2024-01-27 12:40:25 +01:00
Maxicarlos08
76627cd544
only use hash cache, fix compression benchmark, fixed be/le bug 2024-01-26 17:48:37 +01:00
Maxicarlos08
c5ddf73dc2
optimize sprites in compressed chunks 2024-01-26 16:26:26 +01:00
Maxicarlos08
e2c2e1bce1
store sprite data separately for compressed chunks 2024-01-26 11:16:06 +01:00
Imbris
fd2e45cfde Merge branch 'crabman/terrain-persistence-crash' into 'master' 
don't remove blocks when applying changes for new chunks

See merge request veloren/veloren!4276
 2024-01-26 02:08:59 +00:00
Maxicarlos08
47a909e94d
fix the *actual* crash 2024-01-26 02:31:21 +01:00
Maxicarlos08
4276dbd628
updated bed sprite height 2024-01-25 19:40:58 +01:00
Isse
ef59e57347 round to nearest integer for compressed weather 2024-01-25 00:35:14 +01:00
maxicarlos08
8d3cd277b9 Merge branch 'jcoxeye/price-entries' into 'master' 
Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231
 2024-01-24 06:57:07 +00: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
b55038a526 rename SharedWeather to CompressedWeather 2024-01-23 21:05:57 +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
49ba880af0 Removed irrelevant test 2024-01-21 22:14:40 +00:00
Joshua Barretto
d836461f8d Use SpriteInteract state for toggling lights 2024-01-21 21:30:08 +00:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 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
do-no-van
8c5759cb5e balance sword abilities 2024-01-21 20:18:19 +00:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Illia Denysenko
cebfb9f508 Merge branch 'timvinc/kill_npc_cmd_option' into 'master' 
Fixes #1922 - Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets'

Closes #1922

See merge request veloren/veloren!4261
 2024-01-21 10:27:09 +00:00
Tim Vincent
cb1a0b9f91 Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets' 2024-01-20 16:39:42 -08:00
Samuel Keiffer
3224bc5147 Merge branch 'crabman/earthsplitter-nerf' into 'master' 
earthsplitter nerf

See merge request veloren/veloren!4264
 2024-01-20 18:30:55 +00:00
Samuel Keiffer
5d6824aace Merge branch 'haniwa' into 'master' 
haniwa

See merge request veloren/veloren!4234
 2024-01-20 17:45:23 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf 2024-01-20 18:32:29 +01:00
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00:00
Joshua Barretto
777d03b361 Categorised more sprites 2024-01-20 10:36:34 +00:00
Joshua Barretto
e5aa8cd3b7 Fix warnings 2024-01-19 20:14:32 +00:00
Joshua Barretto
5260c82c4a Overhauled sprite representation to support many more sprites and attributes 2024-01-19 18:05:56 +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
juliancoffee
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
JCoxeye
941e953348 Merge branch veloren:master into jcoxeye/price-entries 2024-01-15 22:47:06 +00:00
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00: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
d743293e56 clippy & fmt 2024-01-14 21:25:15 +02:00
juliancoffee
1748b5e76f Final(?) step to deprecating item names 2024-01-14 21:25:15 +02: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
aba8ec7558 Implement item localization 
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
  try_all_item_defs() covers only items in asset folder.

Required assets will go in next commit
 2024-01-14 21:25:15 +02:00
juliancoffee
18e507315f Add ItemDesc::l10n method 
- Add ItemL10n struct that is similar to ItemImgs except it holds i18n
  description and not items. ItemDesc::l10n uses this struct to provide
  common_i18n::Content for both names and descriptions.
  So far it only used in voxygen, but it can be used by rtsim in
  dialogues.
- Introduced new deprecation, ItemKind::Ingredient, because it uses
  item.name().
  It's not deleted, because it's used in inventory sorting, and our
  inventory sorting is, for some reason, server-side.
- Crafting UI also still uses deprecated item.name(), because again,
  sorting. It's probably will be easier to handle, because it's UI
  sorting and we can use localized names here, but still, it's a thing
  to discuss.
- Moved Item::describe() to voxygen/hud/util.

The most important thing to note is we don't want to completely delete
deprecated .name() and .description() along with corresponding fields
in ItemDef because ItemDef is now "public" API, exposed in plugins and I
don't want to break plugins before we actually implement i18n for them.
Otherwise, it would be basically impossible to use items in plugins.

What's left is actually fully implementing ItemDesc::l10n, create
item_l10n.ron and add fallback on current .name() and .description()
implementation.
 2024-01-14 21:25:15 +02:00
juliancoffee
8263154a7e Discourage random i18n and prettify get_content 
- Add the comment that recommends avoiding all `get_variation` methods.
- Add the comment that recommends avoiding Content with random i18n.
- Improve `get_content` docs.
 2024-01-14 21:25:15 +02:00
juliancoffee
1347a31108 Deprecation step of Item::name/description 
- Mark Item::name() and Item::description() deprecated, along with
  corresponding ItemDesc methods.
- Dummify dialogue code that uses items, as it's not used anyway. In the
  future it should use common_i18n::Content.
- Allow usage of deprecated .name() for Inventory ordering, for now.
- Allow usage of deprecated .name() for Inventory ordering for
  merchants, for now.
 2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
juliancoffee
9264fe77b1 Add veloren-common-i18n 
- Move common::comp::chat::Content to its own place
 2024-01-14 21:25:15 +02:00
Samuel Keiffer
b4ae34cd7c Merge branch 'crabman/unstack-buffs' into 'master' 
Don't stack buffs of the same kind with equal attributes

See merge request veloren/veloren!4251
 2024-01-14 17:54:16 +00:00
Maxicarlos08
3a7bb698fc
handle overlap and queueing correctly 2024-01-13 19:53:02 +01:00
Maxicarlos08
da08376e9a
Don't stack buffs of the same kind with equal attributes 2024-01-13 18:58:44 +01:00
JCoxeye
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00: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
juliancoffee
18742bc7fb Fix veloren-server compilation 
As veloren-server enables plugin feature automatically, it results in
veloren-common-state inherit this feature, which enables
common/state/plugin/mod.rs which asks for common::assets function that
is enabled only if plugin feature is enabled, but because
veloren-common-state doesn't depend on common::assets, this feature is
kind of lost half-way.

This commit fixes this by adding explicit optional dependency on
common-assets in common-state that is enabled by plugin feature.
 2024-01-08 20:13:17 +02:00
juliancoffee
f4939220cc Add BuffKind::differentiate 2024-01-08 20:13:17 +02:00
juliancoffee
5514df330b Add BuffDescriptor enum 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
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
6d57169875 review fixes 2024-01-04 00:01:08 -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
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions 2024-01-02 23:42:14 +01:00
Samuel Keiffer
5bd089c56d Merge branch 'sam/remove-combo-melee' into 'master' 
Deprecated combo melee character state

See merge request veloren/veloren!4233
 2023-12-29 17:29:44 +00:00
DaforLynx
0b62898060 Audio fixes and new music 2023-12-29 00:25:08 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
JCoxeye
0f46eeaa78 Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs 2023-12-27 07:59:03 -05:00
flo
8e76aaceb8 make_crustaceans_tameable 2023-12-26 19:55:21 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master' 
Christmas theme revival

See merge request veloren/veloren!4209
 2023-12-20 17:02:01 +00:00
flo
0a42a51810 Merge branch 'poise_resilience_buffs' into 'master' 
poise_resilience_buffs_for_dagon_and_wyverns

See merge request veloren/veloren!4207
 2023-12-17 20:12:13 +00:00
flo
6f5e385d2a poise_resilience_buffs_for_dagon_and_wyverns 2023-12-17 20:12:13 +00:00
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8 fix doctest 2023-12-16 14:40:26 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +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
Isse
eb2395a401 walk fixes 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
HEIEnthusiast
7d7937df36 , 2023-11-28 13:42:24 -04:00
HEIEnthusiast
2497c04a63 Code quality fix :( 2023-11-28 12:11:34 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
Maxicarlos08
2da97747e5
Addressed review comments 2023-11-27 21:29:13 +01:00
maxicarlos08
d05586f08a
fix small precision bug 2023-11-27 21:28:12 +01:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee 2023-11-27 21:28:12 +01:00
HEIEnthusiast
b6c67a7f41 Made handle_jump use it's own jump_modifier stat 2023-11-27 16:15:29 -04:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
Py bit
e0de63dbf8 Update buff.rs 2023-11-27 12:25:23 +00:00
Py bit
16b873590b Update buff.rs 2023-11-27 12:02:54 +00:00
Py bit
0074be2339 Update buff.rs 2023-11-27 11:39:30 +00:00
HEIEnthusiast
783cfdc719 Merge branch 'master' into More-potions 2023-11-27 07:00:48 -04:00
HEIEnthusiast
59c3162c49 Merge branch 'master' of https://gitlab.com/veloren/dev/veloren 
12 commits behind master fix
 2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
Isse
69e827dfda Merge branch 'isse/very-cool-commands' into 'master' 
Target any entity with commands, and a few new commands.

See merge request veloren/veloren!4192
 2023-11-26 15:13:45 +00:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
a151a6f550 tether length argument 2023-11-23 22:22:34 +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
maxicarlos08
4456643867
Don't use attacker orientation for calculating melee precision 2023-11-23 00:55:17 +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
maxicarlos08
a5199a966a
Include required serde feature for enum-map in veloren-common 
This previously broke torvus builds, but worked fine for builds here
since veloren-rtsim enabled the serde feature.
 2023-11-16 21:47:44 +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
Sam
13148bd436 Changed how max precision was calculated to make it more compact. 2023-11-14 18:16:42 -05:00
Sam
fb3d0208b9 Changelog 2023-11-14 18:10:51 -05:00
Sam
49756ac37c Headshots from above are less precise, headshots from below are no longer precise. 2023-11-14 18:07:02 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
f47b61d446 Adjusted precision multipliers. 2023-11-14 18:07:00 -05:00
Sam
6814ce8134 Addressed review comments. 2023-11-14 18:07:00 -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
Sam
e37f085114 Changed terrain check to use beam position instead of entity position. 2023-11-11 15:17:59 -05:00
Christof Petig
d193e03a03 Merge branch 'christof/kits_in_plugins' into 'master' 
support adding kits, presets and resource experience by plugins

See merge request veloren/veloren!4173
 2023-11-07 23:06:17 +00:00
Christof Petig
e7e4c20445 fix test and code quality 2023-11-07 22:54:19 +01:00
Christof Petig
2fbdf42360 support adding kits, presets and resource experience by plugins 2023-11-07 20:24:13 +01:00
maxicarlos08
17094ad569
remove_previous -> enforced_limit 2023-11-03 07:51:54 +01:00
maxicarlos08
601056ecbd
Add new SelfBuff buff category 2023-11-02 07:44:30 +01:00
maxicarlos08
d3f4b854fc
Disable selfbuff stacking 2023-11-01 21:50:50 +01:00
Christof Petig
4ba80c0e73 fix voxygen compilation without plugins, part 2 2023-10-25 00:05:35 +02:00
Christof Petig
c354fe1b1d conditionally turn off more code (fixes unit test) 2023-10-25 00:05:35 +02:00
Christof Petig
e114c8b6f3 remove unneeded concatenate implementation 2023-10-25 00:05:35 +02:00
Christof Petig
7c4057d7d8 simplify, how can you not love clippy 2023-10-25 00:05:35 +02:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Christof Petig
fc81d6ecd5 fix compilation of voxygen without plugins 2023-10-23 21:47:26 +02:00
Joshua Barretto
22b537a4e5 Fixed CI and incorrect vel 2023-10-21 14:58:13 +01:00
Joshua Barretto
3057d67a1c Factored out friction_factor code 2023-10-21 13:51:42 +01:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
879a28fbb6 Fixed warnings 2023-10-21 13:51:41 +01:00
Joshua Barretto
a5ec81a2ab Better tether pattern, account for mass 2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258 Finished adding tether graphics 2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48 Began adding tether visuals 2023-10-21 13:49:04 +01:00
Joshua Barretto
1ac1c900c9 Improved commands, fixed tether orientation 2023-10-21 13:49:04 +01:00
Joshua Barretto
2d4278e94a Made carriage lighter 2023-10-21 13:49:04 +01:00
Joshua Barretto
a2253b7a33 Fix crash 2023-10-21 13:49:04 +01:00
Joshua Barretto
a01739af20 Better tethering physics 2023-10-21 13:49:04 +01:00
Joshua Barretto
5a41d7e33e Added cart, notion of rolling resistance (hacky) 2023-10-21 13:49:04 +01:00
Joshua Barretto
9aa757cd09 Added basic tethering 2023-10-21 13:49:04 +01:00
Imbris
0413a3e111 Small asset code improvements 
* Replace manual Clone impl with derive
* Take advantage of hashbrown's Equivalent trait to simplify using a
  non-allocating key
 2023-10-19 12:02:49 -04:00
Christof Petig
252771c411 replace read_at with the more portable workaround 2023-10-18 22:31:25 +02:00
Joshua Barretto
d1158abd6f Merge branch 'zesterer/better-lod' into 'master' 
Testing better LoD voxelisation techniques

See merge request veloren/veloren!4144
 2023-10-18 19:47:02 +00:00
Marcel Märtens
9e5bd1e463 add a log for each person accessing the chat api 2023-10-18 13:05:22 +02:00
Joshua Barretto
321cc030ad Better LoD giant trees 2023-10-18 09:58:00 +01:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
22f8433d22 address imbris suggestions in this new version 2023-10-17 21:07:24 +02:00
Christof Petig
621334d69b clippy fix and tar_source simplification 2023-10-17 21:07:24 +02:00
Christof Petig
64dec7efe2 fix compilation without plugins feature, fixes unit tests 2023-10-17 21:07:24 +02:00
Christof Petig
60336a1c56 improve duplicate error message 2023-10-17 21:07:24 +02:00
Christof Petig
61b7a1ff17 report errors other than not found when combining assets 2023-10-17 21:07:24 +02:00
Christof Petig
8dce52221b separate combined cache and fs cache 2023-10-17 21:07:23 +02:00
Christof Petig
baccdeb22f move plugin list into source 2023-10-17 21:07:23 +02:00
Christof Petig
3a6d94bd3c register_tar with the cache object 2023-10-17 21:07:23 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Justin Shipsey
0d5017932d Merge branch 'zesterer/backpack-fixes' into 'master' 
Added wielding for wallrunning

See merge request veloren/veloren!4133
 2023-10-16 20:00:06 +00:00
Isse
b862a7aa22 Merge branch 'isse/fix-div0' into 'master' 
Fix divide by zero in state::apply_terrain_changes_internal

See merge request veloren/veloren!4140
 2023-10-16 11:35:17 +00:00
Joshua Barretto
285a0b2b01 Fixed potential panic when adding dead pet 2023-10-16 09:53:15 +00:00
Isse
678dffeb9f use into_iter 2023-10-15 23:10:14 +02:00
Isse
3a61fb15b2 fix divide by zero in state::apply_terrain_changes_internal 2023-10-15 23:00:36 +02:00
flo
912002bd0c Merge branch 'fix_dreadhorn_hitbox' into 'master' 
fix_dreadhorn_hitbox

See merge request veloren/veloren!4139
 2023-10-15 19:27:14 +00:00
flo666
c8122797d4 fix_dreadhorn_hitbox 2023-10-15 20:50:47 +02:00
Samuel Keiffer
e1767ab3ad Merge branch 'sam/bezier-beam' into 'master' 
Converted beam system from spherical shell wedges to quadratic beziers

See merge request veloren/veloren!4137
 2023-10-15 15:42:02 +00:00
Sam
ef5e37a64d Converted beam system from spherical shell wedges to quadratic beziers 2023-10-14 21:46:28 -04:00
Imbris
185ccea579 Merge branch 'imbris/dynlib-overwrite-fix' into 'master' 
Don't overwrite loaded dynlib

See merge request veloren/veloren!4135
 2023-10-14 21:05:47 +00:00
Imbris
fd8a37d141 Don't overwrite loaded dynlib 2023-10-14 16:25:55 -04:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Joshua Barretto
e293de5bae Added wielding for wallrunning 2023-10-14 12:27:08 +01:00
Joshua Barretto
a1349d8176 Added foot motion when turning on the spot 2023-10-13 15:16:47 +01:00
Joshua Barretto
8088e4d691 Corrected weighting for backpacks 2023-10-13 14:45:28 +01:00
Joshua Barretto
9dd5cd24d1 Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons 2023-10-13 11:57:49 +01:00
Joshua Barretto
0f2d4c261a Merge branch 'zesterer/better-anims' into 'master' 
Improving some animations

See merge request veloren/veloren!4127
 2023-10-12 20:18:11 +00:00
Joshua Barretto
0b1ffb6695 Fixed footstep timings 2023-10-12 20:31:10 +01:00
Joshua Barretto
d5565c4a41 Added strafe-like rolling 2023-10-12 12:34:08 +01:00
Isse
472b996c8e Merge branch 'isse/shader-fp-fixes' into 'master' 
Shader floating point fixes

See merge request veloren/veloren!4120
 2023-10-11 23:04:33 +00:00
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Isse
d638215b88 rename TrueTime to ProgramTime and don't share it 2023-10-07 19:53:55 +02:00
Isse
a152e4dfb4 time-proof usages of tick 2023-10-07 19:53:55 +02:00
Isse
6b31ffea3e attempt to fix timeout with high timescale 2023-10-07 19:53:55 +02:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh" 
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
 2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
540f0d10f2 cargo clippy after toolchain-update 2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
flo666
445c49bd4b
large_bird: incr. sight_dist, decr. travel_speed, decr. flying_alt in attack 2023-10-02 22:44:41 +02:00
Maxicarlos08
58a379ee47
limit range of npc interactions 2023-10-02 22:44:32 +02:00
Imbris
91a7cf796d Merge branch 'imbris/specs-refactor' into 'master' 
Adjust for changes in specs safety refactor

See merge request veloren/veloren!4113
 2023-09-26 14:01:28 +00:00
Laura
f4d48d2689 New Arena building and visit site for NPCs 2023-09-26 12:29:14 +00:00
Imbris
9c398cb06d djust for changes in specs safety refactor 2023-09-24 23:46:59 -04:00
Marcel
5d311e13bd Merge branch 'crabman/localize-commands' into 'master' 
Localize server side commands

See merge request veloren/veloren!4110
 2023-09-22 14:50:43 +00:00
Imbris
cd98dd5245 Remove unused deps flagged by cargo-machete 2023-09-21 22:59:50 -04:00
Maxicarlos08
fd42b3f767
localize commands 2023-09-20 23:29:24 +02:00
Maxicarlos08
bc9219d2b7
moved comment 2023-09-20 17:05:04 +02:00
Maxicarlos08
dccbfc4595
Soft loot protection 2023-09-20 17:02:25 +02:00
Isse
f4ca60cbb6 Map selector and generation UI 2023-09-17 17:11:19 +00:00
Imbris
afe97f4d67 Make sure we use one version of tracy-client!!!!! 2023-09-15 16:32:59 -04:00
Marcel
c25e8536ab Merge branch 'xMAC94x/update_uuid_authc' into 'master' 
update uuid via authc

See merge request veloren/veloren!4093
 2023-09-13 08:47:27 +00:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode 2023-09-06 17:47:16 +02:00
Maxicarlos08
ec92b2c33b
Fix group chat leak 2023-09-03 21:25:44 +02:00
flo
78b2443edc Merge branch 'qsto/bosses_loot_overhaul' into 'master' 
Bosses loot overhaul

See merge request veloren/veloren!4072
 2023-08-30 12:08:52 +00:00
Isse
804e24adef Merge branch 'isse/fix-airships' into 'master' 
Fix rtsim airships

See merge request veloren/veloren!4064
 2023-08-29 12:56:25 +00:00
Isse
06d7548dc6 Fix rtsim airships 2023-08-29 12:56:25 +00:00
Marcel Märtens
d54ed537ac update uuid via authc 2023-08-28 20:09:17 +02:00
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02:00
Marcel Märtens
96bf6309d2 small updates to dependencies 2023-08-27 19:17:04 +02:00
Marcel Märtens
3346a3bc1f some manual dependency updates 2023-08-27 19:17:01 +02:00
Christof Petig
b20ff5144c determine location names when loading character list 2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master' 
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
 2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event 2023-08-19 11:44:58 +02:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666) 2023-08-17 22:47:35 +02:00
Marcel
09646a9830 Merge branch 'tibbon1/update_num_derive_0_4_0' into 'master' 
num_derive 0.3 -> 0.4.0

See merge request veloren/veloren!4053
 2023-08-17 16:42:31 +00:00
Maxicarlos08
e5e26149ed
review 2023-08-17 11:16:20 +02:00
Maxicarlos08
8c77356ec1
reduced large cacti sizes 2023-08-16 20:19:35 +02:00
flo
a2b1097df8 wyvern_tweaks 2023-08-16 09:22:04 +00:00
flo
21bf0a5572 Merge branch 'pirate_hideout_site' into 'master' 
site pirate_hideout

See merge request veloren/veloren!4057
 2023-08-16 06:59:59 +00:00
flo
fba1976dee site pirate_hideout 2023-08-16 06:59:58 +00:00
Imbris
e8361d5abf Merge branch 'imbris/sync-toggle' into 'master' 
Add field to Presence to control when an entity is synced to other clients

See merge request veloren/veloren!3972
 2023-08-16 00:10:35 +00:00
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation 2023-08-15 12:24:49 +02:00
Maxicarlos08
0929a3c76c
use same timings for both portals 2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
Maxicarlos08
26ada89bb9
portal event -> change body and teleport to 2023-08-15 12:24:49 +02:00
Maxicarlos08
8fe5f2e708
addressed review comments 2023-08-15 12:24:49 +02:00
Maxicarlos08
e5fe64ccf6
pre-review cleanups 2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles 2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update 2023-08-15 12:24:48 +02:00
Maxicarlos08
0f2db68498
added portals 2023-08-15 12:24:17 +02:00
Joshua Barretto
38c986fa59 Merge branch 'TelepathicWalrus/stay_follow_pets' into 'master' 
Add stay/follow option for pets

See merge request veloren/veloren!3906
 2023-08-15 10:19:58 +00:00
flo
9a50a2452e treant_sapling: disable flee 2023-08-15 09:53:28 +00:00
Maxicarlos08
13dbf679c5
review 2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable 
Added server side owner and distance checks
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState 
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function 
Clean code
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
6f0997705f
Clean code 2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Imbris
aba0c23bc7 Make sync_me based of PresenceKind rather than being an independent 
field.
 2023-08-11 20:09:55 -04:00
Imbris
ecb27deeae When sync_me is false avoid: 
* Logging a warning when deleting the entity and it is not in any
  Region.
* Searching every single region for an entity that is in none of them.

Also:
* Add workaround for bug in specs where deleting any entity clears the
  components before checking that the generation is correct (surprised
  that we haven't encounted bugs from this yet).
* Properly update `tracked_entities` inside `RegionMap` when deleting
  an entity. Previously, we just relied on this being updated in
  `RegionMap::tick` by the absence of the `Pos` component at that index.
  However, this means if a new entity is created at that index after
  deletion and before calling `RegionMap::tick`, then this can be
  interpreted as an entity moving between regions rather than one being
  deleted and another created. It seems like this could lead to
  synchronization bugs like not creating the new entity on the client
  (although I haven't noticed this before, I think maybe we use newly
  inserted `Uid`s to detect new entities rather than the region system?).
  I think it could at least lead to sending redundant messages to
  synchronize the new entity.
 2023-08-11 20:09:55 -04:00
Imbris
997babca18 Always sync components for a client's entity even if it has no position 
or has sync_me false in `Presence`.
 2023-08-11 20:09:55 -04:00
Imbris
ba7d7481d7 Move RegionMap insertion into ecs and ticking from common into server 
Since it now needs Presence component to be available and we don't use
the RegionMap on the client.
 2023-08-11 20:09:55 -04:00
Imbris
a01f75b38d Add sync_me parameter to Presence that must be set to true for 
entities with the `Presence` component to be synced to other clients.
 2023-08-11 20:09:55 -04:00
Michal Sroczynski
3a6c3ac669 Small adjustments 2023-08-11 14:09:31 +02:00
Michal Sroczynski
c8feb568ba Bosses loot overhaul p1 2023-08-11 09:47:13 +02:00
flo666
db6ebcd685 remove shovel outcome trigger from combomelee state 2023-08-03 23:00:32 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
David Fisher
a5d597516e num_derive 0.3 -> 0.4.0 
because: num_derive was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates num_derive to 0.4.0

Tests appear to pass locally, pending CI run for confirmation.

Changes between 0.3 and 0.4.0:
https://github.com/rust-num/num-derive/compare/num-derive-0.3.0...num-derive-0.4.0
 2023-07-31 10:28:36 -04:00
David Fisher
7751ef611c approx 0.4.0 -> 0.5.1 
because: approx was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates approx to 0.5.1

Tests appear to pass.

Changes between 0.4.0 and 0.5.1:
https://github.com/brendanzab/approx/compare/v0.4.0...v0.5.1
 2023-07-31 08:22:52 -04:00
Sam
d2cbcbe698 Changelog and rebase fixes 2023-07-29 19:12:54 -04:00
Sam
4bc6d9a6dc Added documentation 2023-07-29 19:04:44 -04:00
Sam
e3ad16ef47 Addressed review comments 2023-07-29 19:04:11 -04:00
Sam
9f86cafc5c Self buffs clear on tab swaps 2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf Addressed testing feedback 2023-07-29 19:04:10 -04:00
Sam
4fd1626e5f Address review comments 2023-07-29 19:04:10 -04:00
Sam
df0244c5e7 Balancing feedback 2023-07-29 19:04:09 -04:00
Sam
dd616f85a9 Changelog and appease CI 2023-07-29 19:04:07 -04:00
Sam
98f33f0633 Keelhaul 2023-07-29 19:04:03 -04:00
Sam
188be17b95 Defiance 2023-07-29 19:04:03 -04:00
Sam
820f8dca94 Sunder 2023-07-29 19:04:02 -04:00
Sam
9a6cb01da3 Fracture now scales with combo and consumes only half of combo 2023-07-29 19:04:01 -04:00
Sam
a2deac19ee Furor 2023-07-29 19:03:59 -04:00
Sam
1cc99c9c4a Fixes to animations and making ability that the animation system thinks is being used more correct 2023-07-29 19:03:56 -04:00
Sam
ff15780c22 Maelstrom 2023-07-29 18:53:48 -04:00
Sam
6f31067b1a Adrenaline rush 2023-07-29 18:53:47 -04:00
Sam
4a690840e4 Savage sense 2023-07-29 18:53:47 -04:00
Sam
8c66bf8f70 Rising tide 2023-07-29 18:53:46 -04:00
Sam
af0a9ca3a4 Berserk 2023-07-29 18:53:46 -04:00
Sam
8ff7ee2819 Cleave 2023-07-29 18:53:45 -04:00
Sam
3e8b2b283a Triple chop 2023-07-29 18:53:44 -04:00
Sam
80ab9c26ec Initial setup 2023-07-29 18:53:38 -04:00
Avi Weinstock
15e75ebfbf Merge branch 'itemtooltip-quantity' into 'master' 
Show item amounts in item tooltips.

See merge request veloren/veloren!4047
 2023-07-28 23:00:51 +00:00
Neras
e72a8f2fcc Nerasw/defensive stance tweaks 2023-07-28 21:29:32 +00:00