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,345 Commits 151 Branches 18 Tags 2.1 GiB
4e528d1ad2
Commit Graph

13345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Yanovski
4e528d1ad2 Revert "Trying to reduce locking during allocation again..." 
This reverts commit 39225cdbd5.
 2023-03-29 02:38:51 -07:00
Joshua Yanovski
9c6dd39054 Lower rather than raise priorities. 2023-03-29 02:38:43 -07:00
Joshua Yanovski
256a58ccd3 More merge fallout. 2023-03-29 02:27:39 -07:00
Joshua Yanovski
37c41c449f WIP changes 2023-03-29 02:02:13 -07:00
Joshua Yanovski
9aaf4179ef Fix up merge 2023-03-29 02:02:06 -07:00
Joshua Yanovski
02f18825ef Tracy thread names. 2023-03-29 01:52:56 -07:00
Joshua Yanovski
48d7f7dafd [WIP] improving thread pool usage and bot client. 2023-03-29 01:52:28 -07:00
Joshua Yanovski
6d4113993c Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen 2023-03-29 01:21:58 -07: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
Sam
1a58b7a8d4 Balance tweaks 2023-03-21 20:13:48 -04:00
Sam
c295506ef9 Removed buffered inputs 2023-03-21 20:13:45 -04:00
Sam
e37e4016d6 Balance tweaks 2023-03-21 20:10:44 -04:00
Monty Marz
cbbbab6bff moar icons 
quickdraw icon
 2023-03-21 20:10:43 -04:00
Sam
868a42ba39 Addressed UX feedback 2023-03-21 20:10:40 -04:00
Sam
acde417ca7 Abilities that require a particular stance will be greyed out when not in that stance. 2023-03-21 20:08:21 -04:00
Sam
9c43c016a3 Fixed roll not returning to wield if initiated from a wielded character state. 2023-03-21 20:08:21 -04:00
Sam
f866bc053c Added note in ability descriptions about which ones are modified by stances. 2023-03-21 20:08:20 -04:00
Sam
07c3e30a95 Fixed blade fever reducing damage instead of increasing it 2023-03-21 20:08:18 -04:00
Sam
e7dac1e3f3 Revert hacks to CI 2023-03-21 20:07:37 -04:00
Sam
7386257854 Appease CI 2023-03-21 20:07:37 -04:00
Sam
c9db227e43 Various things can cause one to naturally leave a stance. Also mildly buffed cultists. 2023-03-21 20:07:34 -04:00