Commit Graph

14083 Commits

Author SHA1 Message Date
68491dde55 Merge branch 'seachapel_rework' into 'master'
seachapel_rework

See merge request veloren/veloren!3856
2023-05-24 18:13:29 +00:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
b1321849bb Merge branch 'tormod/worldgen-refactorings' into 'master'
Refactor various stuff in worldgen

See merge request veloren/veloren!3939
2023-05-24 16:52:51 +00:00
f997f11a66 Merge branch 'lioncat2002/fix_time_command' into 'master'
Fix: the `/time` command has been fixed in accordance to issue #1622

See merge request veloren/veloren!3947
2023-05-24 16:47:36 +00:00
9eb4931822 Fix: the /time command has been fixed in accordance to issue #1622 2023-05-24 16:47:36 +00:00
19342daa8d Merge branch 'maxicarlos08/dura-free-area' into 'master'
Durability free areas

See merge request veloren/veloren!3936
2023-05-23 13:56:32 +00:00
a2ecd0b403 Replace SquareLocationRestriction with Aabr<i32>.
This is a fixup for 1572a5a759
2023-05-23 01:25:36 +02:00
777a69e576 adressed review comments 2023-05-22 23:20:11 +02:00
fbe32a9047 no_dura -> no_durability 2023-05-22 22:38:48 +02:00
713f5afdfa update changelog 2023-05-22 22:38:48 +02:00
8ed311c5a9 made tests work 2023-05-22 22:38:47 +02:00
174f75dc63 durability free areas 2023-05-22 22:38:47 +02:00
af080016ab Get rid of the old and clunky loc_suitable_for_site function. 2023-05-22 16:35:12 +02:00
a58b589c1a Consolidate SiteKind impl. 2023-05-22 16:26:30 +02:00
2397209b5d Add proximity test. 2023-05-22 00:58:53 +02:00
1572a5a759 Add location hint optimization. 2023-05-22 00:58:53 +02:00
057c502218 Factor out town attribute calculation. 2023-05-22 00:58:53 +02:00
d607ea1683 Git ignore local bash history. 2023-05-22 00:58:53 +02:00
1555797675 Merge branch 'thanosfisherman/loudness_adjustments' into 'master'
adjusted eq and loudness to align with the majority of tracks

See merge request veloren/veloren!3941
2023-05-21 21:54:30 +00:00
8dad923c3a adjusted eq and loudness to align with the majority of tracks 2023-05-21 21:54:29 +00:00
3cd2154ce1 Merge branch 'zesterer/obstacle-fixes' into 'master'
Prevent explosion damage going through walls

See merge request veloren/veloren!3946
2023-05-21 21:30:50 +00:00
2219797142 Merge branch 'zesterer/shader-block-kinds' into 'master'
Added support for block kinds in shaders

See merge request veloren/veloren!3932
2023-05-21 17:19:51 +00:00
2d9e800422 Fixed doc comment 2023-05-21 17:51:17 +01:00
b730766106 Prevent explosion damage going through walls 2023-05-21 15:30:18 +01:00
796dce81af Merge branch 'vasco-buff' into 'master'
Italian translation

See merge request veloren/veloren!3945
2023-05-21 09:42:14 +00:00
c6ab618d2e Italian translation 2023-05-20 11:49:07 +02:00
00b2bcb7b4 Merge branch 'zesterer/one-way-walls' into 'master'
One-way walls

See merge request veloren/veloren!3943
2023-05-19 17:55:13 +00:00
f5b24a5953 Removed redundant hit code 2023-05-19 16:54:14 +01:00
423e6f0348 Adjusted particle offset 2023-05-19 15:05:18 +01:00
2893f400f8 Better particle lighting 2023-05-19 14:58:59 +01:00
4961ca2f6d Fixed particle effect UB 2023-05-19 14:46:22 +01:00
c73848b932 Fixed minor issues with walls, better particles 2023-05-19 14:25:49 +01:00
b0556588b8 Actually use orientation when deciding on wall direction 2023-05-19 13:30:49 +01:00
c94d6c502a Added one-way wall sprites 2023-05-19 13:24:45 +01:00
d5ca004d2b Merge branch 'vasco-adlet' into 'master'
Italian translation

See merge request veloren/veloren!3934
2023-05-19 09:35:30 +00:00
eda84a6569 Merge branch 'taoist/charms' into 'master'
taoist/charms

See merge request veloren/veloren!3890
2023-05-19 03:07:44 +00:00
f18297ec75 taoist/charms 2023-05-19 03:07:44 +00:00
a634da2d07 Addressed review comments 2023-05-17 22:22:54 +01:00
8b835a91d0 Merge branch 'zesterer/fixes' into 'master'
Various non-humanoid fixes and tweaks

See merge request veloren/veloren!3935
2023-05-16 23:52:09 +00:00
a0ffeb7252 Clippy fixes 2023-05-17 00:23:14 +01:00
8e9314d32b Fixed mount offsets for more quarupeds 2023-05-16 21:57:18 +01:00
306c3e1423 Fixed masses, mount offsets and mountability for quad_low 2023-05-16 21:48:09 +01:00
3238863c26 Good bird_large mount offsets 2023-05-16 21:10:53 +01:00
cfdf184c4c Fix non-humanoid pathfinding and movement in water 2023-05-16 20:48:50 +01:00
a0ad6fc779 Merge branch 'zesterer/agent-config' into 'master'
Fix pet idle movement, add a way to configure agent behaviour through manifests

See merge request veloren/veloren!3933
2023-05-16 17:52:04 +00:00
52b5967914 Fix pet idle movement, add a way to configure agent behaviour through manifests 2023-05-16 18:51:46 +01:00
295e7003af Italian translation 2023-05-16 17:50:56 +02:00
8e03f87881 Addressed review comments 2023-05-16 10:08:25 +01:00
aeb72bcf22 Added support for block kinds in shaders 2023-05-15 17:31:21 +01:00
3afeca67c5 Merge branch 'zesterer/fixes' into 'master'
Various minor UX improvements based on player feedback

See merge request veloren/veloren!3931
2023-05-14 21:52:13 +00:00