Commit Graph

14890 Commits

Author SHA1 Message Date
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
Isse
2500fa2b42 Command error on trying to spawn a pet for an anchored entity 2023-11-23 20:52:20 +01:00
Isse
31f67a97b3 clippy fix 2023-11-23 12:06:58 +01:00
Isse
88a7e1de86 better tab completion for uid 2023-11-23 11:08:21 +01:00
Isse
4d8bcf0a92 only preprocess for entity target argument 2023-11-23 11:04:30 +01:00
Samuel Keiffer
b1a7c71f23 Merge branch 'crabman/precision-fix' into 'master'
Don't use attacker orientation for calculating melee precision

See merge request veloren/veloren!4191
2023-11-23 00:33:51 +00:00
Isse
ef47ed6f62 Add to changelog 2023-11-23 01:06:54 +01:00
Isse
5a3e6316a5 fix tethering 2023-11-23 01:01:31 +01:00
maxicarlos08
4456643867
Don't use attacker orientation for calculating melee precision 2023-11-23 00:55:17 +01:00
Isse
51c67d7394 client shorthands 2023-11-22 23:40:13 +01:00
Isse
34edfdb7a2 link related commands 2023-11-22 23:10:32 +01:00