Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,358 Commits 151 Branches 18 Tags 2.1 GiB
2a9a63a60e
Commit Graph

13358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
ab5561df61 Removed redundant things 2023-04-02 01:09:12 +01:00
Monty Marz
33e643fbfd fmt 2023-04-02 01:21:10 +02:00
Samuel Keiffer
f2419e2920 Merge branch 'sam/fix-modular-craft' into 'master' 
Fix modular output item showing an item for disallowed combinations

See merge request veloren/veloren!3852
 2023-04-01 23:01:05 +00:00
Monty Marz
d1f6db9da6 different site name col 2023-04-02 00:55:21 +02:00
Sam
6849f9fc21 Fix function name typo 2023-04-01 18:11:16 -04:00
Joshua Barretto
33ebb0a4a3 Make clippy happy 2023-04-01 22:55:45 +01:00
Samuel Keiffer
19fc9ad52f Merge branch 'sam/client-time' into 'master' 
Tween client time to match with server time.

See merge request veloren/veloren!3851
 2023-04-01 21:50:02 +00:00
Sam
352d34557e Fix modular crafting window showing an item output when it is not possible to craft two components together. 2023-04-01 17:22:01 -04:00
Sam
2e6d55a78b Use topographic map for town selection screen. 2023-04-01 17:10:44 -04:00
Joshua Barretto
ab4e3d23e3 Make clippy happy 2023-04-01 22:03:24 +01:00
Sam
0ce452cf0c Tween client time to match with server time. 2023-04-01 16:58:03 -04:00
Monty Marz
ca18da8061 UI tweaks 2023-04-01 21:54:48 +02:00
Joshua Barretto
335fa514aa Merge branch 'mute-invite' into 'master' 
Hide invites coming from muted players

Closes #1814

See merge request veloren/veloren!3849
 2023-04-01 17:33:50 +00:00
Sam
f40ef0d5dd Polymorph effect now more correctly handles when multiple polymorph buffs are applied. 2023-04-01 13:11:59 -04:00
Joshua Barretto
9645172135 Slightly smoother FxUpscale 2023-04-01 18:06:20 +01:00
Joshua Barretto
63a949b95c Removed spawn town and safe spawn settings 2023-04-01 17:51:05 +01:00
Maxicarlos08
ac377e2bbf
Hide invites comming from muted players 2023-04-01 18:45:19 +02:00
Joshua Barretto
42c534b7b4 Removed /home, replaced with /respawn 2023-04-01 17:37:01 +01:00
Joshua Barretto
c0723c659e Updated changelog 2023-04-01 12:38:43 +01:00
Joshua Barretto
19db823092 Proper next/prev site buttons 2023-04-01 12:34:58 +01:00
Joshua Barretto
0d7ee4479b Limit starter sites to towns 2023-03-31 21:31:01 +01:00
Joshua Barretto
2e3870cf6d Shut up, clippy 2023-03-31 21:17:38 +01:00
Joshua Barretto
6add1b851d Simplified map drawing 2023-03-31 20:44:59 +01:00
tygyh
dedf93c6ad Fix issue #1758 for Swedish 2023-03-31 21:02:41 +02:00
Joshua Barretto
0f7648aadb Better use of space on char create screen 2023-03-31 18:08:12 +01:00
tygyh
4067990847 Update swedish translations 2023-03-31 17:36:17 +02:00
Joshua Barretto
c28e61383d Added target to starting site map 2023-03-31 16:25:24 +01:00
Joshua Barretto
9e76561ad6 Spawn new players at the highest point in a chunk 2023-03-31 14:38:32 +01:00
Joshua Barretto
45644da98a Don't display the world map on character edit 2023-03-31 14:36:30 +01:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master' 
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
 2023-03-31 02:57:39 +00:00
Samuel Keiffer
ca91b75a24 Merge branch 'sam/buff-tweaks' into 'master' 
Buffs can have variable tick times

See merge request veloren/veloren!3845
 2023-03-31 02:12:26 +00:00
Sam
09f600bc1e Buffs can have variable tick times 2023-03-30 21:23:41 -04:00
Isse
08ca360926 Merge branch 'isse/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!3846
 2023-03-29 23:11:59 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master' 
Sword Tweaks

See merge request veloren/veloren!3838
 2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
Marcel
864666a73b Merge branch 'tygyh/Update-swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3835
 2023-03-28 23:34:22 +00:00
Marcel
b7a1dd24f2 Merge branch 'kinoshi/ru_RU-translations-update' into 'master' 
Update russian translations

See merge request veloren/veloren!3841
 2023-03-28 23:26:11 +00:00
kinoshi
f0fa766410 Update russian translations 2023-03-28 23:26:11 +00:00
Marcel
0d91430945 Merge branch 'yusdacra/update-nix' into 'master' 
build(nix): update flake.nix

See merge request veloren/veloren!3806
 2023-03-28 23:01:13 +00:00
Sam
4309767898 Tweak 2023-03-27 21:51:45 -04:00
Justin Shipsey
8bffb0cfc3 Merge branch 'bird_medium_wing_tweaks' into 'master' 
bird_medium_wing_tweaks

See merge request veloren/veloren!3844
 2023-03-27 19:13:19 +00:00
flo
aec35a4792 bird_medium_wing_tweaks 2023-03-27 19:13:19 +00:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
ef7b400cca Number tweaking 2023-03-26 19:50:42 -04:00
Sam
124c8cfb65 Weapon stat tweaks 2023-03-25 13:05:26 -04:00
Sam
f2dfaf0276 Fixed dullahan AI. Some number tweaks. 2023-03-23 21:56:16 -04:00
Isse
1298fc792b Merge branch 'ProfessionalHobbyist/configurable_day_night_length' into 'master' 
Add setting to control length of day/night cycle for servers. ("Fix" for https://gitlab.com/veloren/veloren/-/issues/1798)

See merge request veloren/veloren!3836
 2023-03-23 16:33:39 +00:00