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

14957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maxicarlos08
b7cc9c8f24
override default before_script for gittag job 2023-12-21 17:47:13 +01:00
Marcel
fe4f7957c7 Merge branch 'crabman/gittag-fix' into 'master' 
attempt to fix gittag

See merge request veloren/veloren!4220
 2023-12-21 15:21:39 +00:00
maxicarlos08
58592e9ae0
print git version in gittag job 2023-12-21 15:47:33 +01:00
maxicarlos08
312e8165d0
use bitnami/git image for gittag job 2023-12-21 15:47:29 +01:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master' 
Christmas theme revival

See merge request veloren/veloren!4209
 2023-12-20 17:02:01 +00:00
flo
f62e3d6124 Merge branch 'armor_offset_fixes' into 'master' 
fixed armor offsets to enable mix'n'match armor

See merge request veloren/veloren!4218
 2023-12-20 12:05:58 +00:00
Froggy
8cfd65ff76 fixed armor offsets to enable mix'n'match armor 2023-12-20 12:05:58 +00:00
flo
72df65ee85 Merge branch 'headwear_fix' into 'master' 
fixed headwear offsets and some vox files

See merge request veloren/veloren!4214
 2023-12-18 10:19:02 +00:00
Froggy
01ac73b73e fixed headwear offsets and some vox files 2023-12-18 20:42:52 +11:00
flo
ecde64a30f Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master' 
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron

See merge request veloren/veloren!4212
 2023-12-17 22:49:56 +00:00
flo
f0754021ae Merge branch 'do-no-van/armor-offset-fixes' into 'master' 
fix typo and armor offsets

See merge request veloren/veloren!4213
 2023-12-17 22:44:44 +00:00
do-no-van
b5eaa58728 fix typo and armor offsets 2023-12-17 22:44:43 +00:00
flo
0a42a51810 Merge branch 'poise_resilience_buffs' into 'master' 
poise_resilience_buffs_for_dagon_and_wyverns

See merge request veloren/veloren!4207
 2023-12-17 20:12:13 +00:00
flo
6f5e385d2a poise_resilience_buffs_for_dagon_and_wyverns 2023-12-17 20:12:13 +00:00
JCoxeye
00434f55c9 Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron 2023-12-17 12:41:27 -05:00
flo
f075b1d654 Merge branch 'uniior/barrels' into 'master' 
Crate and Barrel sprites

See merge request veloren/veloren!4210
 2023-12-17 16:17:14 +00:00
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