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

14850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
HEIEnthusiast
86f75de01c Merge branch 'More-potions' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-29 06:31:04 -04:00
HEIEnthusiast
77d63b2d9f changelog.md 2023-11-29 06:30:38 -04:00
HEIEnthusiast
cc013d7b77 Changing values 2023-11-29 06:25:20 -04:00
Py bit
f0d915b311 Update CHANGELOG.md 2023-11-28 17:56:10 +00:00
HEIEnthusiast
7d7937df36 , 2023-11-28 13:42:24 -04:00
HEIEnthusiast
2497c04a63 Code quality fix :( 2023-11-28 12:11:34 -04:00
HEIEnthusiast
a01d7485e4 Small speed tweak 2023-11-28 11:43:12 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Samuel Keiffer
233f1d6bac Merge branch 'qsto/phoenix' into 'master' 
Phoenix overhaul

See merge request veloren/veloren!4073
 2023-11-28 11:13:18 +00:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
Samuel Keiffer
3d9d3d9419 Merge branch 'crabman/basicmelee-hit-timing' into 'master' 
Add hit_timing to BasicMelee

See merge request veloren/veloren!4193
 2023-11-27 21:47:30 +00:00
Maxicarlos08
2da97747e5
Addressed review comments 2023-11-27 21:29:13 +01:00
maxicarlos08
d05586f08a
fix small precision bug 2023-11-27 21:28:12 +01:00
maxicarlos08
fc3634aaa8
changelog 2023-11-27 21:28:12 +01:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee 2023-11-27 21:28:12 +01:00
HEIEnthusiast
b6c67a7f41 Made handle_jump use it's own jump_modifier stat 2023-11-27 16:15:29 -04:00
Christof Petig
256afc1960 Merge branch 'crabman/precision-ui-fix' into 'master' 
fix stat UI bug for modular components while trading

See merge request veloren/veloren!4196
 2023-11-27 19:25:41 +00:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
6ecbd5ee92 Merge branch 'master' into More-potions 2023-11-27 15:04:15 -04:00
Isse
73c0a02851 Merge branch 'crabman/curios-potion-loot-protection' into 'master' 
Don't allow bypassing loot protection with curious potion

See merge request veloren/veloren!4199
 2023-11-27 18:34:21 +00:00
Maxicarlos08
1cf733597d
Don't allow bypassing loot protection with curious potion 2023-11-27 18:54:20 +01:00
Py bit
e0de63dbf8 Update buff.rs 2023-11-27 12:25:23 +00:00
Py bit
16b873590b Update buff.rs 2023-11-27 12:02:54 +00:00
Py bit
0074be2339 Update buff.rs 2023-11-27 11:39:30 +00:00
Py bit
bf5acdc3ba Update CHANGELOG.md 2023-11-27 11:07:46 +00:00
HEIEnthusiast
783cfdc719 Merge branch 'master' into More-potions 2023-11-27 07:00:48 -04:00
HEIEnthusiast
4d87a9ab44 General potion modifications 2023-11-27 06:57:42 -04:00
HEIEnthusiast
59c3162c49 Merge branch 'master' of https://gitlab.com/veloren/dev/veloren 
12 commits behind master fix
 2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
Maxicarlos08
c689708ec9
fix stat UI bug while trading 2023-11-26 20:22:59 +01:00
Isse
69e827dfda Merge branch 'isse/very-cool-commands' into 'master' 
Target any entity with commands, and a few new commands.

See merge request veloren/veloren!4192
 2023-11-26 15:13:45 +00:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
a4caa2bc26 use Result::or for Either::from_str 2023-11-26 15:37:14 +01:00
flo
e9ae0a4c9e Merge branch 'clifftown_relocation' into 'master' 
clifftown_relocation

See merge request veloren/veloren!4194
 2023-11-25 20:58:05 +00:00
flo
daff899f37 clifftown_relocation 2023-11-25 20:58:05 +00:00
flo
659113830e Merge branch 'troll_caves_and_camps_into_sites' into 'master' 
troll_caves_and_camps_into_sites

See merge request veloren/veloren!4188
 2023-11-24 07:53:15 +00:00
flo
756ac0eefe troll_caves_and_camps_into_sites 2023-11-24 07:53:15 +00:00
Isse
a151a6f550 tether length argument 2023-11-23 22:22:34 +01:00