Commit Graph

14499 Commits

Author SHA1 Message Date
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
Joshua Barretto
2842d6fef8 Merge branch 'crabman/airship-fix2' into 'master'
Airship fix attempt #5

See merge request veloren/veloren!4142
2023-10-16 17:52:57 +00:00
Maxicarlos08
0da10c1dfc
Run terrain persistence before /reload_chunks 2023-10-16 18:39:41 +02:00
Maxicarlos08
3605e49a00
changelog entry 2023-10-16 16:54:53 +02:00
Maxicarlos08
c8350d0654
airship fix attempt #521 2023-10-16 16:53:33 +02: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
afb79bf67a Merge branch 'zesterer/fix-pet-panic' into 'master'
Fixed potential panic when adding dead pet

See merge request veloren/veloren!4141
2023-10-16 10:30:35 +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
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
Isse
82ac022ae2 Merge branch 'isse/fix-puddle-details' into 'master'
Fix puddle details

See merge request veloren/veloren!4136
2023-10-14 23:25:49 +00:00
Isse
b6c234b26e fix puddle details 2023-10-15 00:48:37 +02: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
Joshua Barretto
c327d0cc85 Better wielded rolling 2023-10-14 21:35:54 +01:00
Imbris
fd8a37d141 Don't overwrite loaded dynlib 2023-10-14 16:25:55 -04:00
Imbris
aaa4740cd0 Merge branch 'RaulWCosta/linearize_light_colors_on_cpu' into 'master'
Linearize light colors on the CPU

Closes #1437

See merge request veloren/veloren!4134
2023-10-14 18:10:36 +00: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
Isse
546811b4a1 Merge branch 'fix-low-reflection' into 'master'
Fix reflection mode low

See merge request veloren/veloren!4132
2023-10-14 09:04:06 +00:00
Isse
d620206f37 fix reflection mode low 2023-10-14 09:52:46 +02: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
Justin Shipsey
f93c50a0b1 Merge branch 'slipped/tower' into 'master'
airship dock

See merge request veloren/veloren!4129
2023-10-13 20:35:10 +00: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
jshipsey
0d1b9ee4f6 rotation, better bottom bits 2023-10-13 15:39:28 -04: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
8088e4d691 Corrected weighting for backpacks 2023-10-13 14:45:28 +01:00
Joshua Barretto
f8c24666eb Fixed strafing 2023-10-13 14:44:37 +01:00
Marcel
72691a76e5 Merge branch 'crabman/macos-lto-test' into 'master'
Enable thin lto for macos

See merge request veloren/veloren!4130
2023-10-13 13:17:58 +00:00
Joshua Barretto
7f922d8a27 Improved running animation of several skeletons 2023-10-13 14:07:49 +01:00
maxicarlos08
cee3ee46c7
added explanatory comment 2023-10-13 14:35:16 +02:00
maxicarlos08
d8785d3297
enable thin lto for macos 2023-10-13 14:35:16 +02:00