Commit Graph

13786 Commits

Author SHA1 Message Date
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
Sam
95347e8a60 Spear magic 2023-05-13 09:30:53 -04:00
flo666
c8bb0050ad adlet npc work 2023-05-13 09:30:53 -04:00
Sam
9fbc759ccd Creature distribution 2023-05-13 09:30:52 -04:00
Sam
2e9f1edef3 Adlet AI 2023-05-13 09:30:52 -04:00
flo666
ef5fe63bc2 tursus npc - add 2 abilities 2023-05-13 09:30:52 -04:00
Sam
680d987e11 Adlet hunter AI 2023-05-13 09:30:51 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
715a0b7b20 rebase 2023-05-13 09:30:50 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
Sam
3557f93f1e Initial cookfires and rock and bone huts 2023-05-13 09:30:19 -04:00
Sam
60f0505e8a Initial tannery and animal pen 2023-05-13 09:30:19 -04:00
Sam
cda910468a Initial yeti pit 2023-05-13 09:30:18 -04:00
Sam
1115877f5f Initial central bonfire 2023-05-13 09:30:18 -04:00
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