Commit Graph

5410 Commits

Author SHA1 Message Date
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