Imbris
03e46de748
Merge branch 'imbris/construct-dispatcher-once' into 'master'
...
Only construct specs::Dispatcher once
See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
Darren Salt
7051ba5c89
Correct/improve some en-US text.
2024-01-05 11:47:27 +00:00
Imbris
6eedea7821
review fixes #2
2024-01-04 19:55:17 -05:00
Samuel Keiffer
dbf3ed49a9
Merge branch 'More-potions' into 'master'
...
Potion of Agility
See merge request veloren/veloren!4197
2024-01-04 23:06:45 +00:00
Pybit
db2a63357e
Update file CHANGELOG.md
2024-01-04 11:55:24 +00:00
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
807bd758b7
cargo fmt
2024-01-04 00:30:21 -05:00
Imbris
6d57169875
review fixes
2024-01-04 00:01:08 -05:00
Imbris
6c6b9181a5
Only construct specs::Dispatcher once
...
* use version of shred that has an added SendDispatcher so we can
construct the dispatcher and send it between threads (only State to
remain sendable)
* move closure for adding systems from State::tick to the creation
functions
* this does mean some voxygen systems always run instead of just in the
session state, but that should not cause issues and we can always
configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
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
Pybit
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +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
Yusuf Bera Ertan
9190a40cbd
build(nix): set veloren git tag and veloren git version variables in the development shell too
2024-01-01 12:48:43 +03:00
Yusuf Bera Ertan
f7d9885723
build(nix): remove flake-parts debug option from flake.nix
2023-12-30 11:36:13 +03:00
Yusuf Bera Ertan
4055eb15ec
build(nix): update flake dependencies and fix flake.nix
2023-12-30 11:15:25 +03: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
JCoxeye
49994af136
Added glacial crystal to unsellable_materials.ron, and buffed price of boreal armor by 5x.
2023-12-27 08:34:27 -05:00
JCoxeye
0f46eeaa78
Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs
2023-12-27 07:59:03 -05:00
JCoxeye
41bec15bc5
Added price entries for blue falcon, moonrise glider, and eerie pumpkin lantern to collection.ron, and added price entries for liana kit and heavy seabag to misc_armor.
2023-12-27 07:59:03 -05:00
JCoxeye
3f747b5ab3
Reverted grim salvager loot table changes, added bandanas and hoods to misc_armor, and roughly adjusted file weighting accordingly.
2023-12-27 07:59:02 -05:00
JCoxeye
3dc2c04491
Reduced price of abyssal heart.
2023-12-27 07:59:02 -05:00
JCoxeye
9334c7a2f9
Added price entries for coral, brinestone, abyssal hearts, and pearls in unsellable_materials.
2023-12-27 07:59:01 -05:00
JCoxeye
a7562b1baf
Added a loot table in assets/common/trading for misc_armor, containing a variety of assorted armor.
2023-12-27 07:59:01 -05:00
JCoxeye
5c90797ee1
Moved grim salvager armor drops to their own loot table, and gave said loot table a price entry.
2023-12-27 07:59:00 -05:00
JCoxeye
853165e465
Added price entries for cultist and boreal armor loot tables. Removed redundant jewellery price table.
2023-12-27 07:59:00 -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
