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

14632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
27f590352f Capsize 2023-07-29 19:04:04 -04:00
Sam
976ecaa0b6 Bulkhead 2023-07-29 19:04:04 -04:00
Sam
98f33f0633 Keelhaul 2023-07-29 19:04:03 -04:00
Sam
188be17b95 Defiance 2023-07-29 19:04:03 -04:00
Sam
c62626cec1 Plunder 2023-07-29 19:04:02 -04:00
Sam
820f8dca94 Sunder 2023-07-29 19:04:02 -04:00
Sam
daea14f8e5 Skull bash 2023-07-29 19:04:01 -04:00
Sam
9a6cb01da3 Fracture now scales with combo and consumes only half of combo 2023-07-29 19:04:01 -04:00
Sam
42e804578e Riptide 2023-07-29 19:04:01 -04:00
Sam
41f69d28ac Lacerate 2023-07-29 19:04:00 -04:00
Sam
35a05329fc Fracture 2023-07-29 19:04:00 -04:00
Sam
a2deac19ee Furor 2023-07-29 19:03:59 -04:00
Sam
1548db3760 Fierce raze 2023-07-29 19:03:59 -04:00
Sam
4b398fb1cf Bloodfeast 2023-07-29 19:03:58 -04:00
Sam
1cc99c9c4a Fixes to animations and making ability that the animation system thinks is being used more correct 2023-07-29 19:03:56 -04:00
Sam
38fb7b8cd5 Rake 2023-07-29 18:53:49 -04:00
Sam
ff15780c22 Maelstrom 2023-07-29 18:53:48 -04:00
Sam
0e771c9082 Execute 2023-07-29 18:53:48 -04:00
Sam
6f31067b1a Adrenaline rush 2023-07-29 18:53:47 -04:00
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