Commit Graph

16539 Commits

Author SHA1 Message Date
2b4e8c3b7d fix after kira 2024-11-07 20:50:49 +01:00
904ee1ca24 a lil splash 2024-11-07 20:50:49 +01:00
4db9d7893f Good waterfall 2024-11-07 20:50:49 +01:00
7aadeb5cb7 Some waterfall particles 2024-11-07 20:50:49 +01:00
193cf134a7 Merge branch 'sam/view-recipes' into 'master'
Toggle to show all recipes

See merge request veloren/veloren!4601
2024-11-07 19:21:25 +00:00
0290521e99 Merge branch 'crab/accurate-lightning-delay' into 'master'
Base lightning sfx delay on the speed of sound

See merge request veloren/veloren!4639
2024-11-07 17:45:49 +00:00
e26bfb66f6 changelog entry 2024-11-07 18:43:35 +01:00
221a1618f2 add tooltip 2024-11-07 18:43:01 +01:00
55d62513c6 Add indicator that recipe is missing 2024-11-07 18:43:01 +01:00
ffa860df99 Add show all recipes icon to crafting window 2024-11-07 18:43:01 +01:00
Sam
757e032ea2 Toggle to show all recipes 2024-11-07 18:43:01 +01:00
dbfc06fdf9 Merge branch 'isse/save-the-plants' into 'master'
Npcs can catch you stealing

See merge request veloren/veloren!4637
2024-11-07 17:36:28 +00:00
41f09e679d Base lightning sfx delay on the speed of sound 2024-11-07 17:07:18 +00:00
4693ad18b3 rename the sprite category Resources to Resource so all categories are singular 2024-11-07 11:44:54 +01:00
e8b6d2c087 fix more typos 2024-11-07 01:18:42 +01:00
c2bff5a860 fix typo 2024-11-07 01:14:41 +01:00
286a56d17e fix and changelog 2024-11-07 01:01:44 +01:00
1a8934a6a0 angy, don't steal :c 2024-11-07 00:52:26 +01:00
4123ea657a Owned sprites 2024-11-06 23:02:34 +01:00
7366652246 Merge branch 'hgrebnednav/fix_mod_badge_alignment' into 'master'
Fix mod badge location in group and faction chats

See merge request veloren/veloren!4636
2024-11-06 21:00:43 +00:00
668cb82f47 Fix mod badge location in group and faction chats 2024-11-06 21:26:12 +01:00
7b68c784af Merge branch 'DaforLynx/transition-to-kira' into 'master'
Switch from Rodio to Kira

See merge request veloren/veloren!4627
2024-11-06 19:50:45 +00:00
c376e7c109 Switch from Rodio to Kira 2024-11-06 19:50:44 +00:00
10850c0731 Merge branch 'do-no-van/riposte-fix' into 'master'
riposte fix

See merge request veloren/veloren!4526
2024-11-06 18:08:49 +00:00
c8c6cd79c8 changelog entry 2024-11-06 10:04:30 -05:00
13046c18f8 increase riposte/retaliate whiff recovery 2024-11-05 08:51:43 -05:00
8f61c18c5a change whiff_recovery_modifier to whiffed_recover_duration 2024-11-05 08:51:43 -05:00
ed9ef355d6 give RiposteMelee recovery on whiff 2024-11-05 08:51:43 -05:00
flo
833606bd67 Merge branch 'legacy_dungeon_dismantle' into 'master'
legacy_dungeon_dismantle

See merge request veloren/veloren!4613
2024-11-05 08:15:43 +00:00
flo
84164dc0dd legacy_dungeon_dismantle 2024-11-05 08:15:43 +00:00
flo
55bb878d60 Merge branch 'unii/updated-sprites' into 'master'
Sprite model updates

See merge request veloren/veloren!4635
2024-11-04 19:41:26 +00:00
flo
cbb89657d6 Merge branch 'enable_cactid' into 'master'
enable_cactid

See merge request veloren/veloren!4631
2024-11-04 19:27:37 +00:00
flo
a536313da6 enable_cactid 2024-11-04 19:27:36 +00:00
ceb8aec7ce Implement Mortar and Pestle model by Supa 2024-11-04 13:26:44 -03:00
181527955b Offset adjustments 2024-11-04 12:44:58 -03:00
b68cbfdb22 Sprite model updates 2024-11-04 11:47:18 -03:00
flo
f5e5a394df Merge branch 'necti/iron-tempest-fix' into 'master'
adding mutli target to iron tempest

See merge request veloren/veloren!4633
2024-11-04 12:03:44 +00:00
56f9c674b7 adding mutli target to iron tempest 2024-11-04 11:15:59 +00:00
2dd493e3bc Merge branch 'zesterer/ip-banning' into 'master'
Initial implementation of IP banning

See merge request veloren/veloren!3363
2024-11-02 22:46:51 +00:00
2cf497dce6 changelog entry 2024-11-02 22:05:43 +00:00
91b8484e06 address review comments 2024-11-02 21:54:25 +00:00
d2237b0ab3 Localize results from IP banning, truncate the last bits of IPv6 addresses 2024-11-02 13:23:00 +00:00
570e28f0a7 clippy fixes 2024-11-02 01:56:12 +00:00
73133f6f8b Use single threaded for loop for network events. 2024-11-02 01:42:30 +00:00
da858b58b5 fix command completion test 2024-11-02 01:39:31 +00:00
96ff48be51 fmt 2024-11-02 01:38:47 +00:00
33846a02b6 Formatting 2024-11-02 01:36:31 +00:00
0c9128c47d Update comment on behavior of ban overrites when there is a linked IP ban 2024-11-02 01:36:23 +00:00
3236c56dd9 Decide not to include username_when_performed for ban entries since we plan to convert to a database at some point which means this would not be a directly readable text file.
This does add a usename to the ip ban error type which is retrieved from the associated uuid ban when possible.
2024-11-02 01:34:27 +00:00
529a8497bb Remove ability to unban ips using the username when banned (we should keep this in the history though, in case it is useful later) 2024-11-02 01:34:25 +00:00