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,279 Commits 151 Branches 18 Tags 2.1 GiB
f40ef0d5dd
Commit Graph

13279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
f40ef0d5dd Polymorph effect now more correctly handles when multiple polymorph buffs are applied. 2023-04-01 13:11:59 -04: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
Sophia Waggoner
b1943cdb26 Handle invalid settings gracefully (use default, give warning). 2023-03-22 11:16:30 -07:00
Sophia Waggoner
b600f08c09 Re-add accidentally deleted ticking of Time. 2023-03-22 06:45:23 -07:00
Sophia Waggoner
30251221e5 Fix math mistakes (24 * 60 is 1440 not 1400) 2023-03-22 06:19:38 -07:00
Sophia Waggoner
83d66a180a Delete TODO 2023-03-22 06:14:51 -07:00
Sophia Waggoner
264e4a53f8 cargo clippy + fmt 2023-03-22 05:49:54 -07:00
Sophia Waggoner
d5c169682e Update changelog. 2023-03-21 22:00:15 -07:00
Sophia Waggoner
4a3d1bbb86 Ultimately use setting in day cycle updates. 
(First functional commit.)
 2023-03-21 21:32:05 -07:00
Sophia Waggoner
7e4ea483e0 Add a ServerConstants to Client and Server structs and sync on register. 2023-03-21 20:28:08 -07:00
Samuel Keiffer
71c9cb516a Merge branch 'sword-2' into 'master' 
Sword 2

See merge request veloren/veloren!3745
 2023-03-22 01:01:33 +00:00
Sophia Waggoner
b649774316 Add ServerConstants and its module to common 2023-03-21 17:29:51 -07:00
Sam
2ec75c657d Changelog 2023-03-21 20:24:08 -04:00
Sam
e5c9f92269 Fix clippy from rebase 2023-03-21 20:23:46 -04:00
Sam
1337525987 Review comment 2023-03-21 20:18:35 -04:00
Sam
ac115055ac Final icons 2023-03-21 20:18:34 -04:00
Sam
5c675fdbe2 Addressed review 2023-03-21 20:18:34 -04:00
Sam
1301fff800 Agility stance ability icons. 2023-03-21 20:18:33 -04:00
Sam
8b0a59c0dd Heavy stance ability icons. 2023-03-21 20:18:33 -04:00
Monty Marz
3e37586ba5 icons 2023-03-21 20:18:32 -04:00
Sam
4d0b192fbd Icons for crippling stance abilities. 2023-03-21 20:18:32 -04:00
Sam
e962690fb8 Tweaks to various stats and earth splitter animation. 2023-03-21 20:18:31 -04:00
Monty Marz
3a3dc0d0f9 3 more icons 2023-03-21 20:18:31 -04:00
Sam
25c42e927a Rebase 2023-03-21 20:18:28 -04:00
Sam
aa9f824be9 Made hot reloaded crates optional 2023-03-21 20:17:00 -04:00
Sam
bd7f33eae5 Fixed unit test 2023-03-21 20:16:59 -04:00
Sam
c78c45ec73 Addressed review 2023-03-21 20:16:59 -04:00
Sam
cc84fb3df3 Fix manifest 2023-03-21 20:16:58 -04:00
Sam
8574066176 Made descriptions more informative 2023-03-21 20:16:58 -04:00
Sam
0dc25c8389 Addressed review 2023-03-21 20:16:57 -04:00
Sam
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -04:00