Commit Graph

14683 Commits

Author SHA1 Message Date
Isse
7a1612aa8a small fixes 2023-12-07 20:08:03 +01:00
Isse
ee4c6d006f More advanced roofs 2023-12-07 20:08:03 +01:00
Isse
5a31b17bc3 Add simple roofs 2023-12-07 20:08:03 +01:00
Isse
a9191b96a9 better stairs 2023-12-07 20:08:03 +01:00
Isse
6e19abd7ec stairs 2023-12-07 20:08:03 +01:00
Isse
e8f8f20ad0 somewhat 3d layouting 2023-12-07 20:08:03 +01:00
Isse
a3a19ecc3a tavern rtsim 2023-12-07 20:08:03 +01:00
Isse
c1aa9bd1b6 move some details to generate 2023-12-07 20:08:03 +01:00
Isse
4fa52db71d more work on tavern 2023-12-07 20:08:03 +01:00
Isse
9903b53105 working rooms 2023-12-07 20:08:03 +01:00
Isse
eb2395a401 walk fixes 2023-12-07 20:08:03 +01:00
Isse
ecb85a0534 Tavern room layout 2023-12-07 20:08:02 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01: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
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
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
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
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
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
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