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
14,840 Commits 151 Branches 18 Tags 2.1 GiB
ab8a7147b4
Commit Graph

14840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
flo
18fd06fd88 Merge branch 'isse/crustacean-skeleton' into 'master' 
crustacean-skeleton and crab

See merge request veloren/veloren!4200
 2023-12-16 13:47:56 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8 fix doctest 2023-12-16 14:40:26 +01:00
Christof Petig
dd8850770e remove variation debugging output 2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
611b55b279 PRNG experiments 2023-12-15 17:27:15 +01:00
Christof Petig
9c9c8e6873 lights over the door 2023-12-14 23:29:48 +01:00
Christof Petig
c0b56671ec hang wreaths at the fireplace 2023-12-14 23:29:32 +01:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +01:00
Isse
ba02d083da Merge branch 'isse/walk-toggle' into 'master' 
Roleplay stuff

See merge request veloren/veloren!4171
 2023-12-12 19:59:58 +00:00
Isse
b654c2f923 expect instead of unwrap 2023-12-12 20:20:03 +01:00
Isse
96a3c81cbb fix captain dismounting and don't panic in RandomField::choose 2023-12-12 20:14:39 +01:00
Isse
8569f30336 review fixes 2023-12-12 19:41:40 +01:00
Isse
850112bd72 typo fix and add some adjectives to tavern namegen 2023-12-12 19:28:12 +01:00
Isse
5361b290df make vec2 make more sense 2023-12-12 19:25:06 +01:00
Samuel Keiffer
776cf2fb76 Merge branch 'hrom/agile-icon-fix' into 'master' 
fixed perforate icon not displaying

See merge request veloren/veloren!4203
 2023-12-09 16:45:08 +00:00
flo
8a4ada0407 Merge branch 'Neras/cobalt&blood-armor_buff' into 'master' 
added 10 armor stat for cobalt and bloodstone sets

See merge request veloren/veloren!4206
 2023-12-08 14:40:43 +00:00
Neras
10513091e0 added 10 armor stat for cobalt and bloodstone sets 2023-12-08 14:40:42 +00:00
Isse
57bf7cfdac place rooms at correct alt, remove walls between gardens 2023-12-07 22:34:58 +01:00
Joshua Barretto
fbd72f7400 Better walking animation 2023-12-07 20:08:40 +01:00
Isse
110e36e468 add to changelog 2023-12-07 20:08:37 +01:00
Isse
1000b7b73f better colors for tavern 2023-12-07 20:08:03 +01:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
2097a499c7 cancel walking on some inputs 2023-12-07 20:08:03 +01:00
Isse
96a70d760c clippyyyyy 2023-12-07 20:08:03 +01:00
Isse
7a1612aa8a small fixes 2023-12-07 20:08:03 +01:00
Isse
ee4c6d006f More advanced roofs 2023-12-07 20:08:03 +01:00
Isse
5a31b17bc3 Add simple roofs 2023-12-07 20:08:03 +01:00
Isse
a9191b96a9 better stairs 2023-12-07 20:08:03 +01:00
Isse
6e19abd7ec stairs 2023-12-07 20:08:03 +01:00
Isse
e8f8f20ad0 somewhat 3d layouting 2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
Isse
c1aa9bd1b6 move some details to generate 2023-12-07 20:08:03 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
9903b53105 working rooms 2023-12-07 20:08:03 +01:00
Isse
eb2395a401 walk fixes 2023-12-07 20:08:03 +01:00
Isse
ecb85a0534 Tavern room layout 2023-12-07 20:08:02 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01:00
Hrom
de42ffdfd8 fixed perforate icon not displaying 2023-12-06 23:38:22 +01:00
HEIEnthusiast
b742d2987b Migration for burning potion 2023-12-05 15:54:12 -04:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
HEIEnthusiast
73d7ff224d Merge branch 'More-potions' of https://gitlab.com/veloren/dev/veloren into More-potions 2023-12-05 12:41:14 -04:00
Joshua Barretto
8d35450d3f Merge branch 'zesterer/git-gc-before-tag-push' into 'master' 
Perform a cleanup before publishing a tag

See merge request veloren/veloren!4201
 2023-11-30 10:59:42 +00:00
Joshua Barretto
777874c805 Perform a cleanup before publishing a tag 2023-11-30 10:17:06 +00:00
Py bit
53600a941d Update mod.rs 2023-11-29 17:03:17 +00:00
HEIEnthusiast
76b2d7d0e0 Recipe change 2023-11-29 06:56:35 -04:00
HEIEnthusiast
4659a66cfe Further tweaks 2023-11-29 06:43:46 -04:00