Commit Graph

14962 Commits

Author SHA1 Message Date
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
Isse
1071fd0bca entity targets 2023-11-22 22:40:56 +01:00
Isse
456c0ad3e8 Merge branch 'isse/rtsim-vehicles' into 'master'
Unify RTSim vehicles and NPCs

See merge request veloren/veloren!4168
2023-11-22 14:53:58 +00:00
Javier Pérez
e243aa07f5 docs: remove references to the Twitter account 2023-11-19 22:54:21 +01:00
Samuel Keiffer
f9a7c83c5a Merge branch 'sam/deprecate-spinmelee' into 'master'
Deprecated SpinMelee Character State

See merge request veloren/veloren!4186
2023-11-18 20:04:20 +00:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Imbris
d8a0e83d61 Merge branch 'crabman/veloren-common-dep-fix' into 'master'
Fix enum-map dependency of veloren-common

See merge request veloren/veloren!4185
2023-11-16 21:42:57 +00:00
maxicarlos08
a5199a966a
Include required serde feature for enum-map in veloren-common
This previously broke torvus builds, but worked fine for builds here
since veloren-rtsim enabled the serde feature.
2023-11-16 21:47:44 +01:00
Isse
e0e7fe499d despawn with volume mount 2023-11-15 11:58:26 +01:00
Isse
7856aac713 Remove dead code and factor out into Dir::random_2d 2023-11-15 11:58:26 +01:00
Isse
78120e4db5 remove trailing whitespace 2023-11-15 11:58:26 +01:00
Isse
e0dbba0279 clippy fixes 2023-11-15 11:58:26 +01:00
Isse
7fd255ec6c bug fixes and airships land at airship stations 2023-11-15 11:58:26 +01:00
Isse
1f195fd848 Make vehicles npcs and npc uid used in rtsim commands 2023-11-15 11:58:26 +01:00
unknown
bd8fd35e62 Update Burning Potion model 2023-11-14 23:07:10 -03:00
Samuel Keiffer
b9bfb3f1dd Merge branch 'sam/precision' into 'master'
Changed criticals to precision

See merge request veloren/veloren!4154
2023-11-14 23:53:57 +00:00
Sam
13148bd436 Changed how max precision was calculated to make it more compact. 2023-11-14 18:16:42 -05:00
Sam
fb3d0208b9 Changelog 2023-11-14 18:10:51 -05:00
Sam
49756ac37c Headshots from above are less precise, headshots from below are no longer precise. 2023-11-14 18:07:02 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Maxicarlos08
1d1b51fa51 Adjust precision power 2023-11-14 18:07:01 -05:00
Sam
f47b61d446 Adjusted precision multipliers. 2023-11-14 18:07:00 -05:00
Sam
6814ce8134 Addressed review comments. 2023-11-14 18:07:00 -05:00
Sam
01d1e15be3 Fixed UI crash 2023-11-14 18:06:59 -05:00
Sam
d3b3bca621 Added precision 2023-11-14 18:06:59 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Samuel Keiffer
9b878586bf Merge branch 'poperigby/fire-potion' into 'master'
Add Burning Potion that applies the Burning effect to the user

See merge request veloren/veloren!4174
2023-11-14 02:00:52 +00:00
PopeRigby
688fd67c33 Add Burning Potion that applies the Burning effect to the user 2023-11-14 02:00:50 +00:00
Samuel Keiffer
fdb28ec2dd Merge branch 'sam/buff-maps' into 'master'
Changed buffs from using hash maps to an enum map and a slot map.

See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Samuel Keiffer
a4ff592547 Merge branch 'sam/agent-combat-state' into 'master'
Split action state into two sets of state, one each for combat and behavior.

See merge request veloren/veloren!4183
2023-11-12 18:19:07 +00:00