Commit Graph

15291 Commits

Author SHA1 Message Date
UncomfySilence
d7af58aefd overworld entity distribution tweaks and movement speed changes 2024-02-20 16:18:03 +01:00
uniior
cf8371373a Address TreantSapling 2024-02-20 16:18:03 +01:00
uniior
ba0db563cc Address comments 2024-02-20 16:18:02 +01:00
uniior
7e7bfa00e4 Further tweaks from testing 2024-02-20 16:18:02 +01:00
crabman
60c58200a9 reduce XP yield of axolotls and geckos 2024-02-20 16:18:02 +01:00
crabman
2249ca6a49 don't attempt to increase duration of stackable buffs 2024-02-20 16:18:01 +01:00
uniior
e720ee834e Initial 2024-02-20 16:18:01 +01:00
danielkenji83
961edf910d Updates from review 2024-02-19 19:42:37 -03:00
danielkenji83
9d73fcfc3f Updates from review 2024-02-18 23:30:43 -03:00
flo
9031ac922a Merge branch 'phoenix_tweaks' into 'master'
phoenix_tweaks

See merge request veloren/veloren!4331
2024-02-18 19:11:34 +00:00
flo
605cb0837f phoenix_tweaks 2024-02-18 19:11:34 +00:00
danielkenji83
1271b5ff9a Remove block_strength stat from main.rs 2024-02-17 19:56:56 -03:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
crabman
4adfebf063 Merge branch 'james/get-lit' into 'master'
Apply burning buff to entities touching another entity with the burning buff

See merge request veloren/veloren!4326
2024-02-17 21:56:56 +00:00
James Melkonian
cc059e2882 Apply burning buff to entities touching another entity with the burning buff 2024-02-17 21:56:55 +00:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -03:00
Illia Denysenko
9434b11ae3 Merge branch 'fvasco-common-items-npc' into 'master'
Italian translation

See merge request veloren/veloren!4330
2024-02-17 14:05:00 +00:00
Francesco Vasco
2480469cbb Italian translation 2024-02-17 13:23:05 +01:00
danielkenji83
1c504ea060 Rebase fix 2024-02-17 01:07:55 -03:00
danielkenji83
81cfb26059 Updates from review 2024-02-17 00:50:30 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
Imbris
8e62c17a81 Merge branch 'imbris/shaderc-opt' into 'master'
Fix issue with missing capability when enabling shaderc optimizations

Closes #1936

See merge request veloren/veloren!4322
2024-02-15 17:25:12 +00:00
flo
99c997fabd Merge branch 'terracotta_ruins' into 'master'
terracotta

See merge request veloren/veloren!4286
2024-02-15 06:08:04 +00:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
crabman
5c4e68cce7 Merge branch 'beginner_balance_tweaks' into 'master'
Beginner balance tweaks

See merge request veloren/veloren!4269
2024-02-14 23:23:29 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
crabman
cf2ce2d470 Merge branch 'crabman/windows-remove-shutdown-signals' into 'master'
exclude non linux/macos targets from compiling ShutdownSignal

See merge request veloren/veloren!4327
2024-02-14 21:58:23 +00:00
Imbris
ab24cf3732 Switch to using an experimental shader option to toggle shaderc optimizations 2024-02-14 16:36:59 -05:00
Imbris
5434ce546b Fix issue with missing capability when enabling shaderc optimizations
See https://github.com/gfx-rs/wgpu/issues/4915

Also:
* Remove unused vert-out frag-in variables from shaders (naga doesn't
  like this probably because they are optimized out on the fragment
  side). This restriction from naga may be relaxed in the future
  see https://github.com/gfx-rs/wgpu/issues/3748.
* Enable OptimizationLevel::Performance for shaderc by default
* Add a environment variable VOXYGEN_SHADERC_OPTS for disabling this
  (e.g. to test if it actually makes a difference on any platform).
  (TODO: testing might be easier if there was a way to do toggle it
  without restarting...)
2024-02-14 16:36:59 -05:00
crabman
ea2c690189
exclude non linux/macos targets from compiling ShutdownSignal 2024-02-14 21:55:12 +01:00
crabman
68ba2b4e1e Merge branch 'crabman/shutdown-signals' into 'master'
Allow using other signals for graceful shutdown

See merge request veloren/veloren!4325
2024-02-14 15:04:20 +00:00
crabman
1daa2ce3db Merge branch 'entity-delete-fix' into 'master'
Fix a few event system and death related bugs

See merge request veloren/veloren!4323
2024-02-13 18:09:17 +00:00
crabman
4f4e560e72
register group_manip and information event systems 2024-02-13 18:24:56 +01:00
Illia Denysenko
5ff40fdcfd Merge branch 'evgenkot/loot-scroller-i18n' into 'master'
I18n loot_scroller

See merge request veloren/veloren!4317
2024-02-13 14:25:09 +00:00
evgenkot
f4ce05a657 I18n move stats 2024-02-13 17:01:27 +05:00
crabman
e225da7a75
disallow trading dead entities 2024-02-12 23:55:05 +01:00
crabman
8285162967
Fix a few cases where return was incorectly used in event systems 2024-02-12 23:49:52 +01:00
crabman
3ad05e4069
only enable wasmtime-wasi dep with plugins feature 2024-02-12 23:35:21 +01:00
crabman
aaa1bd2af9
Correctly delete entities (including those that don't drop items!) 2024-02-12 23:35:21 +01:00
evgenkot
eb4911f60d I18n pickup-msg correction for en uk ru 2024-02-12 23:26:14 +05:00
evgenkot
eee330c9e9 I18n loot_scroller correct name 2024-02-12 21:24:57 +05:00
evgenkot
f9ee398a17 I18n loot_scroller user_gender 2024-02-12 21:24:57 +05:00
crabman
ae66f5db43
allow using other signals for graceful shutdown 2024-02-12 09:49:17 +01:00
Illia Denysenko
72d5ed68c8 Merge branch 'fvasco-body-npc-speech' into 'master'
Italian translation with genders

See merge request veloren/veloren!4319
2024-02-11 23:34:45 +00:00
Imbris
f159dd5357 Merge branch 'imbris/metal-panic' into 'master'
Don't include compute in shadow push constant shader stages

Closes #1951

See merge request veloren/veloren!4321
2024-02-11 20:03:36 +00:00
Imbris
59596874e1 Don't include compute in shadow push constant shader stages
(avoids panic on metal backend: https://gitlab.com/veloren/veloren/-/issues/1951)
2024-02-11 12:29:07 -05:00
Francesco Vasco
e75117688b Italian translation with genders 2024-02-11 16:40:47 +01:00
Marcel
756dbdd9d7 Merge branch 'crabman/dbg-remove' into 'master'
Remove dbg statement

Closes #1941

See merge request veloren/veloren!4297
2024-02-10 16:58:46 +00:00
crabman
62a73e5c14
remove dbg statement 2024-02-10 17:34:56 +01:00
Marcel
db256e5dda Merge branch 'group-i18n-hotfix' into 'master'
fix incorrect i18 group chat key

See merge request veloren/veloren!4313
2024-02-10 12:10:20 +00:00