Commit Graph

13934 Commits

Author SHA1 Message Date
flo
16d58c6b4e plant creatures 2023-06-03 13:59:52 +00:00
Joshua Barretto
f7688462a1 Merge branch 'tormod/worldgen-refactorings' into 'master'
Make sure location hint calculation is only done once

See merge request veloren/veloren!3967
2023-06-02 13:46:56 +00:00
Tormod G. Hellen
4f2548fe78
Pass SiteKind by reference. 2023-06-02 15:04:16 +02:00
Tormod G. Hellen
1d0329cfa7
Make sure location hint calculation is only done once.
Location hint calculation is expensive and should not be done
in a hot loop.

This is a fixup for 1572a5a759.
2023-06-02 15:04:09 +02:00
Joshua Barretto
e71eee0cd2 Merge branch 'zesterer/damage-fixes' into 'master'
Make items vanish after 5 minutes

See merge request veloren/veloren!3963
2023-06-01 14:49:00 +00:00
Joshua Barretto
6bb65bd9ec Updated changelog 2023-06-01 14:52:03 +01:00
Joshua Barretto
ec3a7d1898 Make items vanish after 5 minutes 2023-06-01 14:51:19 +01:00
Joshua Barretto
bcc6b84e48 Merge branch 'zesterer/damage-fixes' into 'master'
Fixed weird fall damage application

See merge request veloren/veloren!3962
2023-06-01 13:42:29 +00:00
Joshua Barretto
3a383050d5 Apply fall damage even after a block-hop 2023-06-01 14:14:28 +01:00
Isse
3fa724b90f Merge branch 'remove-print' into 'master'
Remove print

See merge request veloren/veloren!3961
2023-06-01 13:12:03 +00:00
Isse
174dac9206 Remove print 2023-06-01 13:12:03 +00:00
Joshua Barretto
f00f96636c Fixed weird fall damage application 2023-06-01 14:08:13 +01:00
Isse
65c0e224a6 Merge branch 'bump-rtsim' into 'master'
Bump rtsim version for frost gigas

See merge request veloren/veloren!3960
2023-06-01 07:10:27 +00:00
Isse
a4f2a74427 Bump rtsim version for frost gigas 2023-06-01 07:10:27 +00:00
Marcel
cda21beedb Merge branch 'doiska/i18n-pt_br' into 'master'
Add all missing pt_br translations

See merge request veloren/veloren!3959
2023-05-31 21:19:23 +00:00
Pedro H
25c3fe3657 Add all missing pt_br translations 2023-05-31 21:19:23 +00:00
Joshua Barretto
21075638bd Merge branch 'zesterer/experimental-shaders' into 'master'
More experimental shaders

See merge request veloren/veloren!3958
2023-05-31 18:51:31 +00:00
Joshua Barretto
2064ad5d80 Added color dither 2023-05-31 19:10:09 +01:00
Joshua Barretto
2a9e43b847 Draw distinction between bilinear filtering and nearest neighbour 2023-05-31 18:26:53 +01:00
Joshua Barretto
b2051767ff More experimental shaders 2023-05-31 17:07:22 +01:00
Isse
a1e0351c23 Merge branch 'frost_gigas_spawn' into 'master'
spawn frost gigas

See merge request veloren/veloren!3948
2023-05-31 12:31:55 +00:00
flo
40832456f2 spawn frost gigas 2023-05-31 12:31:54 +00:00
Marcel
c36e3693be Merge branch 'walpo/update-readme' into 'master'
Update README.md

See merge request veloren/veloren!3951
2023-05-29 10:00:57 +00:00
walpo
2801456b16 Update README.md 2023-05-29 10:00:57 +00:00
Marcel
0135b17588 Merge branch 'xMAC94x/anonymize_ip_addr' into 'master'
remove the complete ip address from the logs in case they are gonna made public.

See merge request veloren/veloren!3952
2023-05-28 11:34:06 +00:00
Marcel Märtens
53151a67bf remove the complete ip address from the logs in case they are gonna made public.
First we though about hashing it together with the username, but we dont have the username. hope that removing 50% of the information is enough to identify 2 addresses as equal or different without knowing the exact address
2023-05-27 14:30:40 +02:00
Marcel
b5c4b435ff Merge branch 'vasco-steam' into 'master'
Italian translation

See merge request veloren/veloren!3949
2023-05-26 15:01:05 +00:00
Marcel
5b7005f8f4 Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3929
2023-05-26 15:01:01 +00:00
Jonathan Berglin
fc4e1c8a87 Update swedish translations 2023-05-26 15:01:00 +00:00
Joshua Barretto
0f25de1dfe Merge branch 'zesterer/various-fixes' into 'master'
Rebalanced masses, dimensions, swim thrusts, and made various improvements to...

See merge request veloren/veloren!3938
2023-05-26 11:41:50 +00:00
Joshua Barretto
96b84dcbaa Transform surface normal to account for voxel entity orientation 2023-05-25 15:18:42 +01:00
Joshua Barretto
4fa799e7c7 Fixed volume mount orientation 2023-05-25 03:16:27 +01:00
Joshua Barretto
9127d6cbf2 Account for surface normal when calculating collision damage 2023-05-25 01:21:44 +01:00
Joshua Barretto
b086b43a88 Better wheeled ship movement 2023-05-25 00:28:36 +01:00
Joshua Barretto
8e85ff98a6 Better turning 2023-05-25 00:28:36 +01:00
Joshua Barretto
f986e0793d Better orientation, axels 2023-05-25 00:28:35 +01:00
Joshua Barretto
6a2796dc17 Everything damage 2023-05-25 00:28:35 +01:00
Joshua Barretto
8a8a5526f1 Added carriage 2023-05-25 00:28:28 +01:00
Joshua Barretto
623ab099b8 Fix ground_vel parameter 2023-05-25 00:25:28 +01:00
Joshua Barretto
dbcbd43b8f Added body kind argument to /airship and /ship 2023-05-25 00:25:28 +01:00
Joshua Barretto
a09dbf0396 Cleaned up and documented voxel collider code 2023-05-25 00:25:28 +01:00
Joshua Barretto
04687aa0b2 An underwater thing 2023-05-25 00:25:28 +01:00
Joshua Barretto
465a62a072 Correct for orientation movement on voxel entities 2023-05-25 00:25:28 +01:00
Joshua Barretto
610d1d8497 Simplified replacement drag logic, special-case volume entities to improve movement 2023-05-25 00:25:28 +01:00
Joshua Barretto
7b4bb2de99 Use non-physical mode for liquid drag 2023-05-25 00:25:28 +01:00
Joshua Barretto
c2d04501fe Better skiff 2023-05-25 00:25:28 +01:00
Joshua Barretto
3c1cfe574d Added skiff 2023-05-25 00:25:28 +01:00
Joshua Barretto
74d4fc8e64 Added sprites to ship models 2023-05-25 00:25:28 +01:00
Joshua Barretto
dfbd9e8132 Rebalanced ships 2023-05-25 00:25:27 +01:00
Joshua Barretto
b6a7401cd9 Balanced quad_low swim thrust 2023-05-25 00:25:27 +01:00