Isse
497cb13e50
always use players weather, and fix weather fr this time
2024-01-23 23:18:14 +01:00
Joshua Barretto
4a89d88e9b
Added default sprite attribute state
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
e231b8f9c1
Apply watcher properties more sensibly
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
Samuel Keiffer
9998dbd587
Merge branch 'sam/expose-charms' into 'master'
...
Charms now have crafting recipes.
See merge request veloren/veloren!4179
2024-01-21 17:39:37 +00:00
Isse
0755f339a2
Merge branch 'woeful/1923-wrong-digging-tooltip' into 'master'
...
Fixes #1923 - Pickaxe tooltip wrong for digging
Closes #1923
See merge request veloren/veloren!4263
2024-01-21 14:21:46 +00:00
Maxicarlos08
0b1f8dc29a
add charm buff icons
2024-01-21 15:05:31 +01:00
maxicarlos08
83a24acc1e
Add charm animation
2024-01-21 15:00:06 +01:00
Marcel
7ecf0487f1
Merge branch 'chat-bits' into 'master'
...
Allow either Enter or Return for sending a message.
See merge request veloren/veloren!4247
2024-01-21 10:46:53 +00: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
Woeful_Wolf
3cb5132ab9
Simplified match, use filter and cargo fmt suggestions
2024-01-20 20:40:16 +02: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
Woeful_Wolf
25e4e09ab4
Fixes #1923 - Pickaxe tooltip wrong for digging
2024-01-20 19:08:41 +02:00
Benoît du Garreau
b6ffb3a146
Update assets_manager to v0.11
2024-01-20 15:46:16 +00:00
Joshua Barretto
88a4d0898f
Merge branch 'making-things-sprite' into 'master'
...
Overhauled sprite representation to support many more sprites and attributes
See merge request veloren/veloren!4259
2024-01-20 11:16:18 +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
Maxicarlos08
e9d61c2d34
fix rule button panic
2024-01-19 16:44:43 +01:00
Joshua Barretto
b1c7c2946f
Merge branch 'juliancoffee/item-i18n-followup' into 'master'
...
Add test that checks that all items have en i18n
See merge request veloren/veloren!4255
2024-01-16 22:36:18 +00:00
juliancoffee
ab8a7147b4
Add test that checks that all items have en i18n
2024-01-16 23:07:36 +02: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
64debe2f0b
Remove unnecessary conversion
2024-01-16 17:47:24 +00:00
juliancoffee
d3fcade857
Rename ItemL10n to ItemI18n
2024-01-16 19:14:14 +02:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
...
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
juliancoffee
db569513f3
review
2024-01-16 13:07:53 +02:00
Joshua Barretto
751df7801f
Render airship sprites in char select
2024-01-15 22:51:54 +00:00
Joshua Barretto
d51b5c5bea
Add airship to char select
2024-01-15 22:35:42 +00:00
Joshua Barretto
3420e7a227
Appease clippy
2024-01-15 19:07:19 +00:00
Joshua Barretto
5bc60f2436
Add LoD zone data to char select screen
2024-01-15 19:07:19 +00:00
Joshua Barretto
43d935a150
Render render LoD terrain on char select, remove old backdrop figure
2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +01:00
Joshua Barretto
e4dbe50f39
Tick client when in server info menu
2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server
2024-01-15 00:02:43 +01:00
juliancoffee
1748b5e76f
Final(?) step to deprecating item names
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
75013cc04a
Make sfx.ron use ItemKey
2024-01-14 21:25:15 +02:00
Darren Salt
140f7a0871
Allow either Enter or Return for sending a message.
2024-01-08 11:10:32 +00: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
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
Imbris
fc28629148
Convert to rgb earlier in screenshot process.
...
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00
Imbris
35fc92f872
Merge branch 'screenshot' into 'master'
...
Don't include an alpha channel when creating a screenshot file.
See merge request veloren/veloren!4222
2024-01-01 21:41:41 +00: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
Sam
8ee054a462
Fix tests
2023-12-29 11:50:18 -05: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
flo
c123bdaef5
various_small_fixes
2023-12-27 07:30:22 +00:00
Darren Salt
4156dd56f3
Don't include an alpha channel when creating a screenshot file.
2023-12-21 17:14:07 +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
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
dd8850770e
remove variation debugging output
2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279
PRNG experiments
2023-12-15 17:27:15 +01:00
Isse
ba02d083da
Merge branch 'isse/walk-toggle' into 'master'
...
Roleplay stuff
See merge request veloren/veloren!4171
2023-12-12 19:59:58 +00:00
Isse
96a3c81cbb
fix captain dismounting and don't panic in RandomField::choose
2023-12-12 20:14:39 +01:00
Joshua Barretto
fbd72f7400
Better walking animation
2023-12-07 20:08:40 +01:00
Isse
b60ebd4131
don't show red text when walking
2023-12-07 20:08:03 +01:00
Isse
2097a499c7
cancel walking on some inputs
2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a
tavern rtsim
2023-12-07 20:08:03 +01:00
Isse
4fa52db71d
more work on tavern
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
Isse
5320f83462
configurable walking speed
2023-12-07 20:08:02 +01:00
Hrom
de42ffdfd8
fixed perforate icon not displaying
2023-12-06 23:38:22 +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
Py bit
53600a941d
Update mod.rs
2023-11-29 17:03:17 +00:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee
2023-11-27 21:28:12 +01:00
HEIEnthusiast
bb2adfb2e5
Removed strength and regeneration potions
2023-11-27 15:16:44 -04: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
Maxicarlos08
c689708ec9
fix stat UI bug while trading
2023-11-26 20:22:59 +01:00
HEIEnthusiast
0bb74f9efe
Added swiftness and regeneration potions
2023-11-26 10:54:02 -04:00
Isse
31f67a97b3
clippy fix
2023-11-23 12:06:58 +01:00
Isse
88a7e1de86
better tab completion for uid
2023-11-23 11:08:21 +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
51c67d7394
client shorthands
2023-11-22 23:40:13 +01:00
Isse
1071fd0bca
entity targets
2023-11-22 22:40:56 +01: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
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Sam
6814ce8134
Addressed review comments.
2023-11-14 18:07:00 -05:00
Sam
01d1e15be3
Fixed UI crash
2023-11-14 18:06:59 -05:00
Sam
62464dbe11
Removed crit chance stat
2023-11-14 18:06:58 -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
Isse
48d95e7699
SnowGlitter experimental shader
2023-11-02 12:53:34 +01:00
Christof Petig
f73f52605f
Support recipes and item images from plugins
2023-10-25 00:05:35 +02:00
Joshua Barretto
22b537a4e5
Fixed CI and incorrect vel
2023-10-21 14:58:13 +01:00
Joshua Barretto
ac7f6872db
Fixed typo
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
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
5a41d7e33e
Added cart, notion of rolling resistance (hacky)
2023-10-21 13:49:04 +01:00
DaforLynx
fd28f10dff
Address comment by zesterer
2023-10-20 10:12:22 -07:00
jshipsey
1b8265803e
comments addressed
2023-10-19 11:23:55 -04:00
jshipsey
d27c73ddb1
fmt
2023-10-19 00:17:50 -04:00
DaforLynx
350257c572
Fix lava sounds not playing, some adjustments to frequency
2023-10-19 00:14:14 -04:00
jshipsey
cf425a09c8
setup
2023-10-19 00:14:12 -04:00
Joshua Barretto
e81516a154
Log shader warnings
2023-10-18 21:50:40 +01:00
Joshua Barretto
cb2de226a2
Fixed tracing span ordering issue
2023-10-18 19:56:19 +01:00
Joshua Barretto
ba763f2da5
Make no terrain pop the default
2023-10-18 09:58:00 +01:00
Joshua Barretto
bf92d0287b
Skip animating figures outside of the frustum
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
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
Isse
3a61fb15b2
fix divide by zero in state::apply_terrain_changes_internal
2023-10-15 23:00:36 +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
Joshua Barretto
e6ca99cbb4
Fixed rolling limbs
2023-10-15 15:53:34 +01:00
Joshua Barretto
eec60a3277
Improved walking animations
2023-10-15 15:33:51 +01:00
Joshua Barretto
b21ccbf480
Reduced shoulder bopping
2023-10-15 12:21:20 +01:00
Sam
ef5e37a64d
Converted beam system from spherical shell wedges to quadratic beziers
2023-10-14 21:46:28 -04:00
Joshua Barretto
c327d0cc85
Better wielded rolling
2023-10-14 21:35:54 +01:00
Raul Wagner Costa
46cf1f1914
Linearize light colors on the CPU
2023-10-14 18:10:35 +00:00
Joshua Barretto
748cde14be
Factored out common lantern animation
2023-10-14 15:46:20 +01:00
Joshua Barretto
30ecc997ea
Factor tool back animation code out
2023-10-14 15:06:08 +01:00
Joshua Barretto
03f698034b
Nicer running
2023-10-14 14:27:01 +01:00
Joshua Barretto
e293de5bae
Added wielding for wallrunning
2023-10-14 12:27:08 +01:00
Joshua Barretto
32b0b33abe
Merge branch 'zesterer/backpack-fixes' into 'master'
...
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
See merge request veloren/veloren!4131
2023-10-13 22:21:53 +00:00
Joshua Barretto
64cb9b099d
Better rolling
2023-10-13 22:35:34 +01:00
Joshua Barretto
510b5eaf98
Fixed vanishing legs
2023-10-13 21:55:40 +01:00
Joshua Barretto
6dc5a5b366
Made bird legs more reasonable
2023-10-13 21:25:39 +01:00
Joshua Barretto
921c1cc0d9
Fixed glidewield
2023-10-13 21:09:33 +01:00
Joshua Barretto
f29e7846f2
Better backward strafing
2023-10-13 20:22:39 +01:00
Joshua Barretto
adf77c48df
Fixed glider shoulders
2023-10-13 19:44:55 +01:00
Joshua Barretto
93632c59af
Somewhat balanced racial running speeds
2023-10-13 19:28:21 +01:00
Joshua Barretto
46b8533681
Better hand movement during strafe
2023-10-13 19:09:48 +01:00
Joshua Barretto
755ce65357
Revert quadmed change
2023-10-13 18:56:18 +01:00
Joshua Barretto
825c59d8d7
Much improved strafing
2023-10-13 17:11:01 +01:00
Joshua Barretto
a1349d8176
Added foot motion when turning on the spot
2023-10-13 15:16:47 +01:00
Joshua Barretto
f8c24666eb
Fixed strafing
2023-10-13 14:44:37 +01:00
Joshua Barretto
7f922d8a27
Improved running animation of several skeletons
2023-10-13 14:07:49 +01:00
Isse
e0c67c470b
Merge branch 'isse/small-fixes' into 'master'
...
Client local time, used for fluid shaders
See merge request veloren/veloren!4128
2023-10-13 12:17:51 +00:00
Isse
56175c2730
rename client_time to local_time
2023-10-13 13:17:52 +02: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
d1d4d527c7
Fixed test
2023-10-12 20:37:53 +01:00
Joshua Barretto
0b1ffb6695
Fixed footstep timings
2023-10-12 20:31:10 +01:00
Joshua Barretto
245855bf5c
Remove redundant code, fix riding
2023-10-12 19:00:51 +01:00
Joshua Barretto
dc6c5190f2
Correct shoulder orientation when holding lantern
2023-10-12 18:13:46 +01:00
Joshua Barretto
1d33d7e4c4
Fixed lantern holding logic
2023-10-12 18:08:24 +01:00
Joshua Barretto
eab9e0e047
Shift feet due to run tilt
2023-10-12 17:57:02 +01:00
Joshua Barretto
dac228d733
Account for tilting for foot orientation
2023-10-12 17:43:29 +01:00
Joshua Barretto
ecc2991ef5
Vary animation speed based on humanoid scale
2023-10-12 17:27:22 +01:00
Joshua Barretto
a895243cb2
Fixed shoulder pads for new running animation
2023-10-12 17:01:57 +01:00
Joshua Barretto
4439d1e3fe
Improved riding animation
2023-10-12 16:39:32 +01:00
Joshua Barretto
2880dd7af4
Minor improvements to running
2023-10-12 16:18:53 +01:00
Joshua Barretto
2d68a93a78
Improved existing weapon wielding animations
2023-10-12 15:12:35 +01:00
Joshua Barretto
148069b4ad
Fixed rolling angles
2023-10-12 15:12:23 +01:00
Joshua Barretto
1c6aa4a53e
Improved wielding animation
2023-10-12 14:18:54 +01:00
Joshua Barretto
d52f3af727
Better gliding
2023-10-12 12:34:17 +01:00
Joshua Barretto
d5565c4a41
Added strafe-like rolling
2023-10-12 12:34:08 +01:00
Joshua Barretto
ad580ab33c
Better head movement
2023-10-12 01:28:21 +01:00
Isse
68857d5af7
fix client without singleplayer feature
2023-10-12 01:47:30 +02:00
Isse
72db9b61b3
client local time
2023-10-12 01:46:12 +02:00
Joshua Barretto
7c170ce246
Improved running animation
2023-10-12 00:07:48 +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
Isse
4967eebb0b
change time of day repeat to 1000 days
2023-10-11 23:12:54 +02:00
maxicarlos08
8a5f237e9c
Frost gigas tweaks
2023-10-08 11:35:01 +00:00
Isse
7d37646dac
renames and comments
2023-10-07 19:53:55 +02:00
Isse
bc436e2c9f
make particles only use 1 float for inst time again
2023-10-07 19:53:55 +02:00
Isse
a152e4dfb4
time-proof usages of tick
2023-10-07 19:53:55 +02:00
Isse
b11aac2b5b
use look dir for spectator
2023-10-07 19:53:55 +02:00
Isse
6d4be9bd01
time proof time of day in shaders
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
Maxicarlos08
a3be68930e
review comments
2023-10-02 23:23:42 +02:00
Maxicarlos08
7734b653e7
replace all uses of Arc<> with references
2023-10-02 16:52:41 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup
2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status
2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen
2023-09-29 23:30:14 +02:00
Imbris
9c398cb06d
djust for changes in specs safety refactor
2023-09-24 23:46:59 -04:00
Imbris
cd98dd5245
Remove unused deps flagged by cargo-machete
2023-09-21 22:59:50 -04:00
Maxicarlos08
3f6d23ad7f
remove unwrap from controller modifier handler
2023-09-18 18:34:57 +02:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Imbris
34ee35c524
Prefer locking the cursor when grabbing it (if that option is supported)
...
over just confining it to the window.
This prevents the cursor from moving around when controlling the camera.
2023-09-10 16:51:31 -04:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode
2023-09-06 17:47:16 +02:00
Xiretza
06111612a3
voxygen: better translation of buff-death messages
...
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.
Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.
```
function getbuff --argument langfile buff
grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end
set buffs burning bleeding curse crippled frozen mysterious
function replacebuffs --argument langfile entity
set slug 'hud-chat-died_of_'$entity'_buff_msg'
for buff in $buffs[-1..1]
set bstr (getbuff $langfile $buff)
or continue
sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
end
sed -i -E 's/('$slug' \=).*/\1/' $langfile
end
function dofile --argument langfile
sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
for entity in pvp npc nonexistent
replacebuffs $langfile $entity
end
sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
sed -i -e /hud-outcome-/d $langfile
sed -i -e '/#.*outcomes/d' $langfile
end
for langfile in assets/voxygen/i18n/*/hud/chat.ftl
echo doing $langfile
dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
Xiretza
9ef2875db7
voxygen: avoid unnecessary allocation
...
Cow::to_string() goes through &str even for an Owned variant,
Cow::into_owned() passes Owned variants through as-is. As it happens,
the values here are always Owned (see comment in try_msg_ctx()
implementation).
2023-08-29 17:09:31 +00:00
Thomas S
4d21fbaea5
add fr translations
2023-08-29 10:14:48 +00:00
Marcel
f6b1d39cf4
Merge branch 'xMAC94x/update_dependencies' into 'master'
...
xmac94x/update dependencies
See merge request veloren/veloren!4090
2023-08-28 17:08:55 +00:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles
2023-08-27 19:40:49 +02:00
Marcel Märtens
b4216ec634
get rid of old criterion
2023-08-27 19:17:04 +02:00
Imbris
de34726fa7
Merge branch 'imbris/winit-update-v2' into 'master'
...
Update winit to 0.28
See merge request veloren/veloren!4088
2023-08-27 15:10:00 +00:00
Imbris
eec1b5853e
Remove unused cpal version
...
Also it turns out directories-next is in use for something that we need
2023-08-23 00:47:31 -04:00
Imbris
f5445774de
Update winit to 0.28
...
Hopefully works better on wayland!
2023-08-23 00:45:36 -04: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
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Maxicarlos08
e5e26149ed
review
2023-08-17 11:16:20 +02: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
6a4a6bab9f
dance dance
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
bb2034ca92
portal particles
2023-08-15 12:24:48 +02:00
Maxicarlos08
13dbf679c5
review
2023-08-15 11:10:54 +02:00
Michal Sroczynski
b7c56c9057
Hud fix
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
6a080c242c
Add server side check to stop stay when mounted
...
Add filter to allow telling other pets to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code
...
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
TelepathicWalrus
25f1f8f6cb
Changed to .filter and .min_by_key for iterator
2023-08-15 11:10:53 +02:00
TelepathicWalrus
5894913ede
Changed mod.rs to use CachedSpatialGrid
2023-08-15 11:10:53 +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
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Youser Nayme
5ef300c72c
Add keybinding for zooming the camera
2023-08-10 16:55:09 +00:00
Isse
58b541490b
Merge branch 'fix_sea_wyvern_head_offset' into 'master'
...
fix sea wyvern head offset
See merge request veloren/veloren!4059
2023-08-09 12:44:27 +00:00
Isse
b3899d6966
Merge branch 'isse/usable-shovel' into 'master'
...
Usable shovel
See merge request veloren/veloren!4060
2023-08-08 18:45:10 +00:00
Isse
ba1cee4fd2
more animation
2023-08-06 21:39:38 +02:00
DaforLynx
16f53d33ed
Play sfx on successful repair
2023-08-05 18:49:49 +00:00
Isse
98385b3b15
animation
2023-08-04 13:59:22 +02:00
flo666
607af6f227
shovel sfx & particles
2023-08-03 21:52:55 +02:00
Isse
b06960ce1c
fix interaction_text
2023-08-03 20:56:26 +02:00
Isse
d890190af4
add animations
2023-08-03 19:45:23 +02:00
Isse
5e225d7f35
add to changelog
2023-08-03 19:38:31 +02:00
Isse
a39923e4d6
digging shovel
2023-08-03 19:32:09 +02:00
flo666
9bd5003d31
fix sea wyvern head offset
2023-08-03 19:25:55 +02:00
flo
57fe2c4adb
spawn wyverns
2023-08-02 07:55:10 +00:00
Joshua Barretto
bcbfbbb274
Merge branch 'jimmy/controller-layers' into 'master'
...
controller layers
See merge request veloren/veloren!3988
2023-07-31 16:20:01 +00:00
JimmyDdotEXE
996bbeb983
add doc comments to LayerEntry and GameLayerEntries structs
2023-07-30 13:34:23 -04:00
JimmyDdotEXE
18d74e6a8e
replace conditional LayerEntry construction during input check
2023-07-30 13:19:46 -04:00
DaforLynx
32f3437fb0
Combat music toggle
2023-07-30 08:10:36 +00:00
Sam
e3ad16ef47
Addressed review comments
2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf
Addressed testing feedback
2023-07-29 19:04:10 -04:00
Sam
30bafec247
Icons
2023-07-29 19:04:08 -04:00
Monty Marz
a4bfa1d242
skills_bg
2023-07-29 19:04:08 -04:00
Sam
9fa556b165
Axe AI
2023-07-29 19:04:07 -04:00
Sam
dd616f85a9
Changelog and appease CI
2023-07-29 19:04:07 -04:00
Sam
68181e9b5b
Axe skill tree
2023-07-29 19:04:06 -04:00
Sam
93ddb36c0a
Axe skill icons
2023-07-29 19:04:06 -04:00
Sam
834a811def
Buff icons
2023-07-29 19:04:05 -04:00
Sam
27f590352f
Capsize
2023-07-29 19:04:04 -04:00
Sam
976ecaa0b6
Bulkhead
2023-07-29 19:04:04 -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
c62626cec1
Plunder
2023-07-29 19:04:02 -04:00
Sam
820f8dca94
Sunder
2023-07-29 19:04:02 -04:00
Sam
daea14f8e5
Skull bash
2023-07-29 19:04:01 -04:00
Sam
42e804578e
Riptide
2023-07-29 19:04:01 -04:00
Sam
41f69d28ac
Lacerate
2023-07-29 19:04:00 -04:00
Sam
35a05329fc
Fracture
2023-07-29 19:04:00 -04:00
Sam
a2deac19ee
Furor
2023-07-29 19:03:59 -04:00
Sam
1548db3760
Fierce raze
2023-07-29 19:03:59 -04:00
Sam
4b398fb1cf
Bloodfeast
2023-07-29 19:03:58 -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
38fb7b8cd5
Rake
2023-07-29 18:53:49 -04:00
Sam
ff15780c22
Maelstrom
2023-07-29 18:53:48 -04:00
Sam
0e771c9082
Execute
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
3bdde16881
Brutal swing
2023-07-29 18:53:45 -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
Isse
91da702d66
lesser spacing with amount
2023-07-28 18:08:18 +02:00
Avi Weinstock
4669b4ab52
Show item amounts in item tooltips.
2023-07-28 11:47:05 -04:00
JimmyDdotEXE
77fb2150d9
addressed code quality issues noted by pipeline
2023-07-23 21:13:06 -04:00
JimmyDdotEXE
8fd30ea55b
left and right bumpers as layer buttons on controller
2023-07-23 21:13:05 -04:00
Samuel Keiffer
9f2ece3199
Merge branch 'remove-coin-counter' into 'master'
...
Remove coin counter at the bottom of inventories.
See merge request veloren/veloren!3998
2023-07-23 17:29:23 +00:00
Michał
29a1a7050b
Loot, foods and salvage tweaks
2023-07-19 14:16:20 +00:00
Marcel Märtens
31da906f84
update mumble-link and remove a old path to migrate pre-2020 voxygen saves to the new save location
...
With this change people with older version need to run a version from 2021-2022 before updating to this change and start singleplayer once.
Get rid of old rust dependencies
2023-07-17 10:50:53 +02:00
Avi Weinstock
2c7a9d1a7a
Use SI prefixes as suffixes for shortening item quantities shown in slots, to prevent the quantity associated with large stacks from overflowing into adjacent grid cells.
2023-07-14 11:02:37 -04:00
Avi Weinstock
7f06607899
Remove coin counter at the bottom of inventories.
2023-07-14 11:02:37 -04:00
flo
b556befe73
coastal_town
2023-07-12 23:02:40 +00:00
Monty Marz
102945b9e7
Dungeon rework initial patch
2023-07-09 20:03:09 +00:00
Marcel
6d966eede2
Merge branch 'RunRobDog/Spawn-Entities-tab' into 'master'
...
RunRobDog/spawn entities tab
See merge request veloren/veloren!3877
2023-07-06 11:37:42 +00:00
Hugo Famechon
a648c68233
Sort items in inventory by quantity
2023-07-05 19:07:16 +00:00
Samuel Keiffer
dab040baa4
Merge branch 'trade-thirdconfirm' into 'master'
...
Added additional confirmation when trading for nothing.
See merge request veloren/veloren!3997
2023-07-03 23:45:59 +00:00
RunRobDog
1630660094
format
2023-07-01 21:40:07 +02:00
Marcel Märtens
e3f8046691
Change the version number to 0.15
2023-06-30 16:31:00 +02:00
Joshua Barretto
ffabace13d
Fixed bloom sample UV, added Cinematic shader
2023-06-28 12:21:16 +01:00
Avi Weinstock
ced6880168
Added additional confirmation when trading for nothing.
2023-06-26 10:39:30 -04:00
Monty Marz
138e7bf0a2
Merge branch 'mkatsenelson/focused_chat_border' into 'master'
...
add focus chat borders with avarage opacity of chat and input text color
See merge request veloren/veloren!3984
2023-06-16 08:29:39 +00:00
mkatsenelson
7d39d3e30e
changing margin from 3px to 2px size
2023-06-15 09:31:36 +03:00
