crabman
59b176a7bb
only attempt to remove empty terrain file if it exists
2024-04-03 18:32:22 +01:00
crabman
5e8de39fd0
address review comments
2024-04-03 12:50:48 +01:00
crabman
10c47128ce
misc post party changes
2024-04-03 12:17:17 +01:00
Joshua Barretto
302e2e92b0
Merge branch 'x7cfe/fix_npc_goto_jump' into 'master'
...
Fix accidental jump cancellation during dispatch of `NpcActivity::Goto`
See merge request veloren/veloren!4406
2024-04-02 20:28:40 +00:00
Dmitry Kashitsyn
4664f1455f
Reformat the source
2024-04-02 23:32:39 +05:00
Dmitry Kashitsyn
45916d1794
Fix accidental jump cancellation during dispatch of NpcActivity::Goto
...
`AgentData::jump_if` cancels `InputKind::Jump` if condition
is not met. Even if the jump itself was issued elsewhere.
This prevented merchants and travelers from reaching target site
if somewhere along the path jump is required.
This is exactly what happens during dispatch of `NpcActivity::Goto`.
Original implementation contained `traverse` followed by `jump_if`
for flying NPCs which cancelled pending `InputKind::Jump` issued
by `traverse`.
This fix extends jump condition inside traverse by
including `traversal_config.can_fly`.
2024-04-02 22:16:12 +05:00
crabman
d8bd81357b
Merge branch 'easter_and_april_fools_stuff' into 'master'
...
easter_and_april_fools_stuff
See merge request veloren/veloren!4404
2024-04-01 06:46:43 +00:00
flo
f8f2684810
easter_and_april_fools_stuff
2024-04-01 06:46:43 +00:00
crabman
e353802d77
Merge branch 'crabman/rope-panic' into 'master'
...
Fix rope shader panic
See merge request veloren/veloren!4403
2024-03-31 16:09:39 +00:00
crabman
47438dd9f5
Fix rope shader panic
2024-03-31 16:30:52 +01:00
Marcel
27cc08909a
Merge branch 'feature/sign_lighting_translations' into 'master'
...
Allow translation for hanging sign & lights
See merge request veloren/veloren!4402
2024-03-31 09:18:03 +00:00
Thomas S
eaecbef5a8
Allow translation for hanging sign & lights
2024-03-31 09:18:02 +00:00
Marcel
a955871f60
Merge branch 'gamer-kold/update-rodio-v2' into 'master'
...
Updated Rodio
See merge request veloren/veloren!4399
2024-03-31 09:05:18 +00:00
Marcel
80fe5ca64b
Merge branch 'xMAC94x/release-numbers' into 'master'
...
Change the version number to 0.16
See merge request veloren/veloren!4400
2024-03-30 00:03:28 +00:00
Marcel Märtens
35afd20b63
Change the version number to 0.16
2024-03-30 00:10:54 +01:00
Talha Qamar
5520dec17c
Update Cargo.lock
2024-03-29 00:05:17 +05:00
Talha Qamar
43b0adddc6
Ran clippy and rustfmt
2024-03-28 22:14:32 +05:00
Talha Qamar
028ca816b7
Updated Rodio
2024-03-28 22:11:12 +05:00
Marcel
3ce82874a3
Merge branch 'crabman/map_tweaks' into 'master'
...
Map tweaks & new default map
See merge request veloren/veloren!4383
2024-03-28 10:14:59 +00:00
crabman
8c7f99371b
New default singleplayer world
2024-03-28 09:33:42 +00:00
crabman
b2e38d7e6d
starting site tweaks
2024-03-28 09:33:42 +00:00
Illia Denysenko
69e0653683
Merge branch 'weblate-translation' into 'master'
...
Update translation files (Weblate)
See merge request veloren/veloren!4397
2024-03-27 22:40:51 +00:00
Otto Richter
1faf87cda1
Update translation files (Weblate)
2024-03-27 22:40:51 +00:00
Treeco
c2bf7c3fc1
Merge branch 'treeco/lod-models' into 'master'
...
Add airship dock and coast town LOD
See merge request veloren/veloren!4396
2024-03-27 22:29:10 +00:00
Treeco
948e7e646f
Further LOD object additions
...
- Airship dock
- Coastal house
- Coastal workshop
2024-03-27 20:19:12 +00:00
Marcel
51098b2012
Merge branch 'Kay_Hemme/fix_item_label_cut-off_when_trading_merchant' into 'master'
...
Fixes #1865 -Item label gets cut-off when trading with Merchant
Closes #1865
See merge request veloren/veloren!4389
2024-03-27 14:55:12 +00:00
Kay Hemme
f1e1271c7e
Fixes #1865 -Item label gets cut-off when trading with Merchant
2024-03-27 14:55:12 +00:00
Marcel
794af0207a
Merge branch 'treeco/lod-models' into 'master'
...
Add savaannah and terracottaa LOD models
See merge request veloren/veloren!4394
2024-03-27 12:03:47 +00:00
Treeco
79bd3182eb
Added terracotta LOD
2024-03-27 01:48:24 +00:00
Treeco
9d83b046a6
Added savannah settlement lod
2024-03-27 01:42:11 +00:00
Marcel
5bd884df86
Merge branch 'crabman/friendly-fire-aura' into 'master'
...
/aura command and friendly fire auras
See merge request veloren/veloren!4391
2024-03-26 18:48:39 +00:00
crabman
41fd854e4b
changelog entry
2024-03-26 11:34:07 +00:00
crabman
c589bc5ca0
friendly fire and pvp at desert arenas!
2024-03-26 11:34:07 +00:00
crabman
4d67e808e1
address review comments
2024-03-26 11:34:07 +00:00
crabman
89af8facbe
fix frozen aura particles
2024-03-25 19:56:08 +00:00
crabman
8dd7e3e0d5
/aura command
2024-03-25 19:56:08 +00:00
crabman
af4f147fda
FriendlyFire and ForcePvP auras
2024-03-25 19:56:08 +00:00
crabman
7afadf5b56
Merge branch 'crabman/dependency-fix' into 'master'
...
Update outdated dependency
See merge request veloren/veloren!4393
2024-03-23 20:37:19 +00:00
crabman
a8bd0ade13
update outdated dependency
2024-03-23 20:03:24 +00:00
Isse
e22cbab7ce
Merge branch 'treeco/lod-models' into 'master'
...
Overhaul of LOD models
See merge request veloren/veloren!4390
2024-03-23 18:54:17 +00:00
Isse
9079a0e3c4
Merge branch 'synis/cave-performance' into 'master'
...
Addressing cave feedback and performance improvements
See merge request veloren/veloren!4360
2024-03-23 17:55:59 +00:00
Treeco
36cab14859
Addressed comments
2024-03-23 17:32:54 +00:00
Treeco
86a27f2ddf
Changelog
2024-03-23 17:32:54 +00:00
Treeco
954cede352
Add new LOD trees and objects
2024-03-23 17:32:54 +00:00
Treeco
62a99f2466
Use real colours for LOD trees and rooftops, lay groundwork for further additions
2024-03-23 17:32:54 +00:00
Treeco
81302a7017
Cedar rework (NOT LOD)
2024-03-23 17:32:54 +00:00
Syniis
361fb5b080
Use fixed size array for crystals
2024-03-23 18:11:42 +01:00
crabman
3d3bc74d75
Merge branch 'crabman/roll-panic-fix' into 'master'
...
Fix panic when interrupting rolls just before ending on slower clients
See merge request veloren/veloren!4392
2024-03-23 00:21:35 +00:00
crabman
0296ee1a2c
Fix panic when interrupting rolls just before ending on slower clients
2024-03-22 23:51:12 +00:00
Syniis
46af9ee489
Biome distribution tweaks
2024-03-22 23:14:18 +01:00
