Isse
100568f955
Merge branch 'feat/time_length_on_map_settings' into 'master'
...
Feat: Day duration slider on map creation UI (#1909 )
Closes #1909
See merge request veloren/veloren!4204
2024-01-03 22:21:53 +00:00
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Imbris
6f28382a69
Merge branch 'shader-fixes' into 'master'
...
Avoid a warning in shader code (alleged unsupported function)
See merge request veloren/veloren!4238
2024-01-03 21:39:06 +00:00
Imbris
c37f0d4c90
Merge branch 'imbris/convert-screenshot-earlier' into 'master'
...
Convert to rgb earlier in screenshot process.
See merge request veloren/veloren!4237
2024-01-03 20:21:32 +00:00
Darren Salt
dc0725e104
Avoid a wgpu SPIR-V warning about BitFieldUExtract
...
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:
WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device: Proceeding unsafely without validation
This avoids that warning (and removes now-unnecessary type conversions).
2024-01-03 16:33:02 +00:00
Samuel Keiffer
448e1ba64a
Merge branch 'crabman/airship-fix-v6' into 'master'
...
Fix airship captains dismounting
See merge request veloren/veloren!4225
2024-01-02 23:19:48 +00:00
Maxicarlos08
37b562aaf6
Clippyyy
2024-01-02 23:42:14 +01:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions
2024-01-02 23:42:14 +01:00
Maxicarlos08
004be6395f
Don't dismount if we're a steering entity
2024-01-02 23:42:14 +01:00
Imbris
fc28629148
Convert to rgb earlier in screenshot process.
...
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00
Imbris
35fc92f872
Merge branch 'screenshot' into 'master'
...
Don't include an alpha channel when creating a screenshot file.
See merge request veloren/veloren!4222
2024-01-01 21:41:41 +00:00
Samuel Keiffer
5bd089c56d
Merge branch 'sam/remove-combo-melee' into 'master'
...
Deprecated combo melee character state
See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
Sam
8ee054a462
Fix tests
2023-12-29 11:50:18 -05:00
Marcel
016bb25242
Merge branch 'DaforLynx/audio-dec-2023' into 'master'
...
Audio fixes and new music
See merge request veloren/veloren!4223
2023-12-29 00:25:08 +00:00
DaforLynx
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00
Sam
f65d449aa3
Deprecated combo melee character state
2023-12-28 19:02:10 -05:00
flo
afb1e04e5f
Merge branch 'various_small_fixes' into 'master'
...
various_small_fixes
See merge request veloren/veloren!4229
2023-12-27 07:30:23 +00:00
flo
c123bdaef5
various_small_fixes
2023-12-27 07:30:22 +00:00
Christof Petig
1f71892897
Merge branch 'christof/fix-kelp' into 'master'
...
Reintroduce underwater plants
See merge request veloren/veloren!4230
2023-12-26 20:35:21 +00:00
Samuel Keiffer
c3db45541c
Merge branch 'make_crustaceans_tameable' into 'master'
...
make_crustaceans_tameable
See merge request veloren/veloren!4219
2023-12-26 19:55:21 +00:00
flo
8e76aaceb8
make_crustaceans_tameable
2023-12-26 19:55:21 +00:00
Christof Petig
055e11f10e
reintroduce underwater plants
2023-12-26 16:48:23 +01:00
flo
4df808ce2e
Merge branch 'jcoxeye/fix-small-leather-pouch-salvage' into 'master'
...
Small leather pouches salvage into simple leather as opposed to thick leather
See merge request veloren/veloren!4228
2023-12-25 21:55:41 +00:00
Jeffrey Cox
31c04f1ffb
Small leather pouches salvage into simple leather as opposed to thick leather
2023-12-25 21:55:41 +00:00
flo
7cb22906d2
Merge branch 'Froggy/armor_offset_fixes' into 'master'
...
Froggy/armor offset fixes
See merge request veloren/veloren!4227
2023-12-25 12:14:24 +00:00
Froggy
7c66fff767
Froggy/armor offset fixes
2023-12-25 12:14:24 +00:00
Darren Salt
4156dd56f3
Don't include an alpha channel when creating a screenshot file.
2023-12-21 17:14:07 +00:00
Marcel
62dc6acc32
Merge branch 'crabman/gittag-beforescript' into 'master'
...
override default before_script for gittag job
See merge request veloren/veloren!4221
2023-12-21 16:50:39 +00:00
maxicarlos08
b7cc9c8f24
override default before_script for gittag job
2023-12-21 17:47:13 +01:00
Marcel
fe4f7957c7
Merge branch 'crabman/gittag-fix' into 'master'
...
attempt to fix gittag
See merge request veloren/veloren!4220
2023-12-21 15:21:39 +00:00
maxicarlos08
58592e9ae0
print git version in gittag job
2023-12-21 15:47:33 +01:00
maxicarlos08
312e8165d0
use bitnami/git image for gittag job
2023-12-21 15:47:29 +01:00
Christof Petig
5af8c4687e
Merge branch 'christof/christmas23' into 'master'
...
Christmas theme revival
See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
flo
f62e3d6124
Merge branch 'armor_offset_fixes' into 'master'
...
fixed armor offsets to enable mix'n'match armor
See merge request veloren/veloren!4218
2023-12-20 12:05:58 +00:00
Froggy
8cfd65ff76
fixed armor offsets to enable mix'n'match armor
2023-12-20 12:05:58 +00:00
flo
72df65ee85
Merge branch 'headwear_fix' into 'master'
...
fixed headwear offsets and some vox files
See merge request veloren/veloren!4214
2023-12-18 10:19:02 +00:00
Froggy
01ac73b73e
fixed headwear offsets and some vox files
2023-12-18 20:42:52 +11:00
flo
ecde64a30f
Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master'
...
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
See merge request veloren/veloren!4212
2023-12-17 22:49:56 +00:00
flo
f0754021ae
Merge branch 'do-no-van/armor-offset-fixes' into 'master'
...
fix typo and armor offsets
See merge request veloren/veloren!4213
2023-12-17 22:44:44 +00:00
do-no-van
b5eaa58728
fix typo and armor offsets
2023-12-17 22:44:43 +00:00
flo
0a42a51810
Merge branch 'poise_resilience_buffs' into 'master'
...
poise_resilience_buffs_for_dagon_and_wyverns
See merge request veloren/veloren!4207
2023-12-17 20:12:13 +00:00
flo
6f5e385d2a
poise_resilience_buffs_for_dagon_and_wyverns
2023-12-17 20:12:13 +00:00
JCoxeye
00434f55c9
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
2023-12-17 12:41:27 -05:00
flo
f075b1d654
Merge branch 'uniior/barrels' into 'master'
...
Crate and Barrel sprites
See merge request veloren/veloren!4210
2023-12-17 16:17:14 +00:00
Uniior
737b5761f6
Crate and Barrel sprites
2023-12-17 16:17:14 +00:00
flo
18fd06fd88
Merge branch 'isse/crustacean-skeleton' into 'master'
...
crustacean-skeleton and crab
See merge request veloren/veloren!4200
2023-12-16 13:47:56 +00:00
flo
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8
fix doctest
2023-12-16 14:40:26 +01:00
Christof Petig
dd8850770e
remove variation debugging output
2023-12-16 12:11:12 +01:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
