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,260 Commits 151 Branches 18 Tags 2.1 GiB
6fbca74e88
Commit Graph

14260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
4a690840e4 Savage sense 2023-07-29 18:53:47 -04:00
Sam
8c66bf8f70 Rising tide 2023-07-29 18:53:46 -04:00
Sam
af0a9ca3a4 Berserk 2023-07-29 18:53:46 -04:00
Sam
3bdde16881 Brutal swing 2023-07-29 18:53:45 -04:00
Sam
8ff7ee2819 Cleave 2023-07-29 18:53:45 -04:00
Sam
3e8b2b283a Triple chop 2023-07-29 18:53:44 -04:00
Sam
80ab9c26ec Initial setup 2023-07-29 18:53:38 -04:00
Samuel Keiffer
026b61baee Merge branch 'maxicarlos08/chieftain-mask-fix' into 'master' 
Maxicarlos08/chieftain mask fix

See merge request veloren/veloren!4024
 2023-07-29 01:22:28 +00:00
Avi Weinstock
15e75ebfbf Merge branch 'itemtooltip-quantity' into 'master' 
Show item amounts in item tooltips.

See merge request veloren/veloren!4047
 2023-07-28 23:00:51 +00:00
Isse
05e925d180 Merge branch 'nerasw/defensive_stance_tweaks' into 'master' 
Nerasw/defensive stance tweaks

See merge request veloren/veloren!4020
 2023-07-28 21:29:32 +00:00
Neras
e72a8f2fcc Nerasw/defensive stance tweaks 2023-07-28 21:29:32 +00:00
Isse
91da702d66 lesser spacing with amount 2023-07-28 18:08:18 +02:00
Avi Weinstock
4669b4ab52 Show item amounts in item tooltips. 2023-07-28 11:47:05 -04:00
Isse
769f341795 Merge branch 'isse/fix-adlet-dbz' into 'master' 
Fix adlet site division by zero

See merge request veloren/veloren!4046
 2023-07-28 14:39:48 +00:00
Isse
e7269a510b Fix adlet site division by zero 2023-07-28 16:08:25 +02:00
Christof Petig
1fd42bd988 Merge branch 'igigog/refactor_save_thread' into 'master' 
Refactor save_thread function

See merge request veloren/veloren!4022
 2023-07-27 21:22:06 +00:00
Marcel Märtens
13188b49e1 We noticed multiple CI errors over the last week, e.g. https://gitlab.com/veloren/veloren/-/jobs/4749826609 
$ if [[ ! "${SCHEDULE_CADENCE}" =~ ${TAG_REGEX} ]]; then # collapsed multi-line command
warning: redirecting to https://gitlab.com/veloren/veloren.git/
Locking support detected on remote "origin". Consider enabling it with:
  $ git config lfs.https://veloren-bot:[MASKED]@gitlab.com/veloren/veloren.git/info/lfs.locksverify true
ref weekly:: Error in git rev-list --stdin --objects --not --remotes=origin --: exit status 128 fatal: bad object 11bc48033cf4e6528268f2acd97324e16e118bce
error: failed to push some refs to 'https://veloren-bot:[MASKED]@gitlab.com/veloren/veloren'

There seems to be a fix proposed here: https://github.com/git-lfs/git-lfs/issues/3977 by running git fetch first.
lets try it out. Maybe we need to give it some commandline parameters to optimize in the future
 2023-07-27 13:22:06 +02:00
Maxicarlos08
922a592c8d
fixed migrations 2023-07-27 00:24:43 +02:00
Christof Petig
0f7daf9920 Merge branch 'qsto/potion-fixes' into 'master' 
Potions fixes

See merge request veloren/veloren!4041
 2023-07-26 21:23:08 +00:00
Michal Sroczynski
2c220e5548 Fix 2023-07-26 15:28:32 +02:00
Michal Sroczynski
ced87c08ec Fix 2023-07-25 20:55:42 +02:00
Michal Sroczynski
d2aec43e9e Changelog 2023-07-25 20:39:30 +02:00
Michal Sroczynski
ccd469cb0a Potions fixes 2023-07-25 20:37:51 +02:00
Michal Sroczynski
74a0c9caa3 Revert "Potions fixes" 
This reverts commit 1a52c4d24d.
 2023-07-25 20:03:56 +02:00
Michal Sroczynski
1a52c4d24d Potions fixes 2023-07-25 17:28:21 +02:00
Marcel
3ad6517aa1 Merge branch 'czech-translation-supply-missing-files' into 'master' 
Czech translation - adding missing files

See merge request veloren/veloren!4018
 2023-07-24 15:02:13 +00:00
JimmyDdotEXE
77fb2150d9 addressed code quality issues noted by pipeline 2023-07-23 21:13:06 -04:00
JimmyDdotEXE
8fd30ea55b left and right bumpers as layer buttons on controller 2023-07-23 21:13:05 -04:00
Marcel
90e33e96bd Merge branch 'qsto/instruments-recipes-fix' into 'master' 
Instruments recipes fix

See merge request veloren/veloren!4034
 2023-07-23 21:45:56 +00:00
Michał
45170212c5 Instruments recipes fix 2023-07-23 21:45:54 +00:00
Marcel
530e57d10e Merge branch 'qsto/cyclop-loot-fix' into 'master' 
Wild cyclop loot fix

See merge request veloren/veloren!4036
 2023-07-23 21:33:19 +00:00
Michał
89ce7a5c3a Wild cyclop loot fix 2023-07-23 21:33:18 +00:00
Samuel Keiffer
9f2ece3199 Merge branch 'remove-coin-counter' into 'master' 
Remove coin counter at the bottom of inventories.

See merge request veloren/veloren!3998
 2023-07-23 17:29:23 +00:00
Isse
b4edcdee5d Merge branch 'qsto/juicier-meats' into 'master' 
Loot, foods and salvage tweaks

See merge request veloren/veloren!4017
 2023-07-19 14:16:20 +00:00
Michał
29a1a7050b Loot, foods and salvage tweaks 2023-07-19 14:16:20 +00:00
Marcel
9cbbf5c28b Merge branch 'imbris/fix-3983' into 'master' 
Revert GIT_STRATEGY: none from !3983

See merge request veloren/veloren!4033
 2023-07-19 13:19:22 +00:00
Imbris
02637ff347 Revert GIT_STRATEGY: none from !3983, it turns out that the git repo is 
actually needed in the docker job for the docker file in the server-cli
folder... although it is only 1 file so there may be more efficient ways
to get it...
 2023-07-18 21:33:02 -04:00
Marcel
7bc3596caa Merge branch 'xMAC94x/remove_old_code' into 'master' 
update mumble-link and remove a old path handling

See merge request veloren/veloren!4030
 2023-07-17 21:39:39 +00:00
Imbris
93adeaa491 Merge branch 'imbris/minor-ci-opt' into 'master' 
Minor CI optimization

See merge request veloren/veloren!3983
 2023-07-17 10:09:44 +00:00
Marcel Märtens
31da906f84 update mumble-link and remove a old path to migrate pre-2020 voxygen saves to the new save location 
With this change people with older version need to run a version from 2021-2022 before updating to this change and start singleplayer once.
Get rid of old rust dependencies
 2023-07-17 10:50:53 +02:00
Imbris
fb99265d4a Use common base image for gittag job 2023-07-16 20:30:56 -04:00
Imbris
f0a324e729 Minor CI optimization (don't fetch git repo in docker publishing job 
where we don't use it)

(and cargo decided to update cfg-if version in random dependency)
 2023-07-16 20:30:55 -04:00
Avi Weinstock
2c7a9d1a7a Use SI prefixes as suffixes for shortening item quantities shown in slots, to prevent the quantity associated with large stacks from overflowing into adjacent grid cells. 2023-07-14 11:02:37 -04:00
Avi Weinstock
7f06607899 Remove coin counter at the bottom of inventories. 2023-07-14 11:02:37 -04:00
Maxicarlos08
9901ba691e
fix alignment of wanderer's hat and a typo 2023-07-14 00:59:27 +02:00
Maxicarlos08
2cbb104243
Miner helmet migrations 2023-07-13 17:18:46 +02:00
Maxicarlos08
b16b1bf51f
Fix alignments and remove unused variations 2023-07-13 17:11:07 +02:00
flo666
326d33d935 re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest 2023-07-13 16:25:43 +02:00
Maxicarlos08
d057e9d4d6
remove incorret chieftain mask definitions 2023-07-13 14:19:04 +02:00
Isse
1605fdb610 Merge branch 'fix_desertcity_repairbench' into 'master' 
fix_desertcity_repairbench

See merge request veloren/veloren!4023
 2023-07-13 11:30:53 +00:00