Commit Graph

15508 Commits

Author SHA1 Message Date
horblegorble
d35b9cfc48 give generic armor to mountain and swamp trolls 2024-04-10 19:04:42 +10:00
crabman
686343f1d5 Merge branch 'horblegorble/biped-large-tweak' into 'master'
horblegorble/biped-large-tweak

See merge request veloren/veloren!4419
2024-04-09 05:41:10 +00:00
crabman
269e5ed713 Merge branch 'necti-brinestone-cost-increase' into 'master'
Necti brinestone cost increase

See merge request veloren/veloren!4418
2024-04-09 05:38:19 +00:00
ryan necti
f1a2f090eb Necti brinestone cost increase 2024-04-09 05:38:19 +00:00
Marcel
95cddc6b63 Merge branch 'treeco/fix-audio-panic' into 'master'
Fix Rodio panic

See merge request veloren/veloren!4420
2024-04-08 15:52:41 +00:00
Treeco
8a9ba69bae Fix Rodio panic 2024-04-08 13:18:07 +01:00
horblegorble
4f984f1f44 remove poise res from generic and tursus armors; decrease wendigo hp 2024-04-08 17:46:48 +10:00
horblegorble
23583f3298 use tursus values for generic biped large armour; slight increase to wild large biped hp 2024-04-08 15:36:59 +10:00
horblegorble
245fbed294 use tursus values for generic biped large armour; slight increase to wild large biped hp 2024-04-08 15:33:21 +10:00
crabman
4ee31ab020 Merge branch 'newclarityex/petting-animals' into 'master'
newclarityex/petting animals

See merge request veloren/veloren!4408
2024-04-07 15:05:19 +00:00
Kira Lu
5e88b67e0b newclarityex/petting animals 2024-04-07 15:05:18 +00:00
Samuel Keiffer
24e8727355 Merge branch 'srpapinha/buff-parry-block-poise-cost' into 'master'
Buff parry/block poise cost

See merge request veloren/veloren!4401
2024-04-05 00:05:06 +00:00
crabman
332a2a1478 Merge branch 'weblate-translation' into 'master'
Update translation files (Weblate)

See merge request veloren/veloren!4411
2024-04-04 15:10:32 +00:00
crabman
e6e8b246b0 Merge branch 'pyrotechnics' into 'master'
add fireworks and bombs back to chests, sahagin tier and above

See merge request veloren/veloren!4413
2024-04-04 11:14:42 +00:00
horblegorble
c06afb911e change terracotta chest to 60%, single roll 2024-04-04 20:19:09 +10:00
horblegorble
f0e6031eee move inline Lottery to standalone pyrotechnics tatable, include coral chests, scale drop chances across tiers 2024-04-04 19:37:40 +10:00
horblegorble
addba2cfda add fireworks and bombs back to chests, sahagin tier and above 2024-04-04 08:11:29 +10:00
Joshua Barretto
2f0c83992f Merge branch 'zesterer/morning-light' into 'master'
More ambient light in morning and evening

See merge request veloren/veloren!3954
2024-04-03 20:23:33 +00:00
crabman
6342288341 Merge branch 'crabman/post-party' into 'master'
tweak chunk and reloading related commands

See merge request veloren/veloren!4409
2024-04-03 18:08:57 +00:00
crabman
59b176a7bb
only attempt to remove empty terrain file if it exists 2024-04-03 18:32:22 +01:00
Codeberg Translate
dcbd7b1873
Update translation files
Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/items/armor/
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/
Translation: Veloren/armor
Translation: Veloren/voxygen-npc
2024-04-03 14:08:11 +00: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
srpapinha
fc9cc77b95 Buff parry/block poise cost 2024-03-30 10:28:39 -03: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
Joshua Barretto
a4f4e78ac6 Fixed calculation of LoD normals 2024-03-28 17:39:35 +00: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
Joshua Barretto
0aa034e30a Improve volumetic sampling quality 2024-03-28 16:30:20 +00:00
Joshua Barretto
0b1fabba91 Make LoD voxel effect camera-relative 2024-03-28 15:49:59 +00:00
Joshua Barretto
ddbf92f289 More ambient light in morning and evening 2024-03-28 15:44:15 +00: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