Commit Graph

13771 Commits

Author SHA1 Message Date
Sam
4c67691e45 Initial speleothems 2023-05-13 09:30:17 -04:00
Sam
6f70882ffe Placeholder igloos (someone with aesthetics fix please) 2023-05-13 09:30:17 -04:00
James Melkonian
c0676a008f Add rib cage to tunnel entrance 2023-05-13 09:30:17 -04:00
Sam
a87548e8b2 Tunnel entrance 2023-05-13 09:30:16 -04:00
Sam
bd222cb1eb Walls correctly sample and handle cliffs 2023-05-13 09:30:16 -04:00
Sam
dd1d5d1c29 Wall, in progress 2023-05-13 09:30:15 -04:00
Sam
c90159840c Tunnel tweaks 2023-05-13 09:30:15 -04:00
IsseW
731195f864 Sampled caverns 2023-05-13 09:30:15 -04:00
Sam
abf3546e64 Adlets can now carve tunnels and caverns 2023-05-13 09:30:14 -04:00
Sam
76f4db6f70 Tweaked positioning of adlet sites 2023-05-13 09:30:14 -04:00
jshipsey
da3c2369e5 initial setup 2023-05-13 09:30:13 -04:00
Joshua Barretto
eb7d712093 Merge branch 'zesterer/in-soviet-russia-pet-mount-you' into 'master'
Allow pet birds to sit on the player's shoulder

See merge request veloren/veloren!3930
2023-05-13 12:14:21 +00:00
Joshua Barretto
ec5e3fe716 Avoid re-fetching system data on every link persist 2023-05-13 12:31:19 +01:00
Joshua Barretto
451e586aac Made mounting biped_large work, for the hell of it 2023-05-12 22:11:06 +01:00
Joshua Barretto
76fb68cf86 Updated changelog 2023-05-12 21:26:06 +01:00
Joshua Barretto
2aca9db4ac Prevent mounted pets stealing targetting, allowed sitting on chairs with a pet on your shoulder 2023-05-12 21:18:32 +01:00
Joshua Barretto
9e9889eed6 Allowed bird pets to mount their owners when nearby 2023-05-12 21:03:44 +01:00
Joshua Barretto
d110cf55f9 Merge branch 'zesterer/balancing' into 'master'
Fixed various balance/UX complaints

See merge request veloren/veloren!3928
2023-05-12 16:35:38 +00:00
Joshua Barretto
4253833aaf Add photorealistic experimental shader 2023-05-12 14:02:23 +01:00
Joshua Barretto
1924c67033 Adjusted night ambience 2023-05-12 13:47:01 +01:00
Joshua Barretto
b506fe3110 Minor price tweaks 2023-05-12 13:28:11 +01:00
Joshua Barretto
25441df7af Made antlions less absurd 2023-05-12 12:34:55 +01:00
Imbris
db860de517 Merge branch 'imbris/update-some' into 'master'
Try to update some things (including tokio)

See merge request veloren/veloren!3919
2023-05-10 21:52:50 +00:00
Imbris
5af9761d84 Update fd-lock, parking_lot, and parking_lot_core 2023-05-10 12:43:51 -04:00
Imbris
d87ed2937b Update tokio 2023-05-10 12:43:50 -04:00
Marcel
80e7f26b9b Merge branch 'xMAC94x/use_workspace_dependencies' into 'master'
use workspace dependencies to make our life easier maintaining them :)

See merge request veloren/veloren!3924
2023-05-10 16:34:22 +00:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Marcel
5ade37e0a5 Merge branch 'tygyh/Update-swedish-translations' into 'master'
Tygyh/update swedish translations

See merge request veloren/veloren!3922
2023-05-10 15:25:12 +00:00
Jonathan Berglin
448b06ca0a Tygyh/update swedish translations 2023-05-10 15:25:12 +00:00
Marcel
1592847ce0 Merge branch 'xMAC94x/fix_windows' into 'master'
fix windows lib ci copy

See merge request veloren/veloren!3926
2023-05-10 15:16:32 +00:00
Marcel Märtens
fd681ea041 fix windows lib ci copy 2023-05-10 16:38:46 +02:00
Isse
2bc63d22ae Merge branch 'isse/sittable-sprites' into 'master'
Sprites on airships, and mountable sprites

See merge request veloren/veloren!3886
2023-05-10 13:55:51 +00:00
Isse
9fa4c7217e more info on todo comment and allow clippy lint 2023-05-10 15:22:35 +02:00
Marcel
dc55701c20 Merge branch 'vasco/far-far-again' into 'master'
Italian translation

See merge request veloren/veloren!3923
2023-05-10 10:31:17 +00:00
Francesco Vasco
9508fd05bb Italian translation 2023-05-10 08:17:13 +02:00
Joshua Barretto
5d464ba035 Merge branch 'maxicarlos08/terrain-persistance-perf' into 'master'
Performance improvements for persisted terrain

See merge request veloren/veloren!3914
2023-05-09 21:52:03 +00:00
maxicarlos08
5c4c47b517
Use LRU cache for caching presistent chunks instead of time-based cache 2023-05-09 20:06:53 +02:00
maxicarlos08
4e136e2961
Performance improvements for persisted terrain
- Only save terrain to disk if it actually has been modified
 - Keep a 10 minute cache with recently unloaded persistent chunks
2023-05-09 20:06:53 +02:00
Isse
1617c180ef small changes 2023-05-09 19:55:52 +02:00
Isse
bcc8c55b5e change 'force from mount' to 'force from volume' in commands 2023-05-09 19:43:10 +02:00
Isse
6219b52f87 rename Vox trait to FilledVox, and change is_empty to is_filled 2023-05-09 19:43:10 +02:00
Isse
7dde25df39 fix rebase oopsie 2023-05-09 19:43:10 +02:00
Isse
1d60d72c01 format line 2023-05-09 19:43:10 +02:00
Isse
87b2f0fd26 don't apply move state velocity if volume riding, don't mount sprites on interact 2023-05-09 19:43:10 +02:00
Isse
a0ed18c3db add doc comments 2023-05-09 19:43:10 +02:00
Isse
61ecd2c178 various small fixes 2023-05-09 19:43:10 +02:00
Isse
f6f332af6a send full matrix to shader 2023-05-09 19:43:10 +02:00
Isse
c4cffff92f apply shader changes from zesterer 2023-05-09 19:43:10 +02:00
Isse
b4c3868dd4 different translation key for mounting Helm 2023-05-09 19:43:10 +02:00
Isse
8fa46139f5 add to changelog 2023-05-09 19:43:10 +02:00