Darren Salt
7051ba5c89
Correct/improve some en-US text.
2024-01-05 11:47:27 +00: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
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
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
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
c123bdaef5
various_small_fixes
2023-12-27 07:30:22 +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
Froggy
7c66fff767
Froggy/armor offset fixes
2023-12-25 12:14:24 +00: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
Froggy
8cfd65ff76
fixed armor offsets to enable mix'n'match armor
2023-12-20 12:05:58 +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
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
Uniior
737b5761f6
Crate and Barrel sprites
2023-12-17 16:17:14 +00:00
flo
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb
Calendar based gear for villagers
2023-12-14 16:31:48 +01:00
Isse
ba02d083da
Merge branch 'isse/walk-toggle' into 'master'
...
Roleplay stuff
See merge request veloren/veloren!4171
2023-12-12 19:59:58 +00:00
Neras
10513091e0
added 10 armor stat for cobalt and bloodstone sets
2023-12-08 14:40:42 +00:00
Isse
b60ebd4131
don't show red text when walking
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +01:00
Isse
5320f83462
configurable walking speed
2023-12-07 20:08:02 +01:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee
2023-11-27 21:28:12 +01:00
Isse
69e827dfda
Merge branch 'isse/very-cool-commands' into 'master'
...
Target any entity with commands, and a few new commands.
See merge request veloren/veloren!4192
2023-11-26 15:13:45 +00:00
flo
756ac0eefe
troll_caves_and_camps_into_sites
2023-11-24 07:53:15 +00:00
Isse
5a3e6316a5
fix tethering
2023-11-23 01:01:31 +01:00
Sam
4e0e94b5c6
Removed spin melee character state
2023-11-16 19:17:38 -05:00
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Maxicarlos08
1d1b51fa51
Adjust precision power
2023-11-14 18:07:01 -05:00
Sam
d3b3bca621
Added precision
2023-11-14 18:06:59 -05:00
Sam
62464dbe11
Removed crit chance stat
2023-11-14 18:06:58 -05:00
Samuel Keiffer
9b878586bf
Merge branch 'poperigby/fire-potion' into 'master'
...
Add Burning Potion that applies the Burning effect to the user
See merge request veloren/veloren!4174
2023-11-14 02:00:52 +00:00
PopeRigby
688fd67c33
Add Burning Potion that applies the Burning effect to the user
2023-11-14 02:00:50 +00:00
Samuel Keiffer
fdb28ec2dd
Merge branch 'sam/buff-maps' into 'master'
...
Changed buffs from using hash maps to an enum map and a slot map.
See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Sam
3f19c61426
Changed buffs from using hash maps to an enum map and a slot map.
2023-11-12 12:37:28 -05:00
Maxicarlos08
7382f70f1e
Re-enable buff stacking for short buffs
2023-11-12 17:17:20 +01:00
Isse
db1480b564
put ice_reflections under REFLECTION_MODE_HIGH
2023-11-10 12:53:09 +01:00
Christof Petig
424006e000
Merge branch 'site_rock_circle' into 'master'
...
site_rock_circle
See merge request veloren/veloren!4175
2023-11-10 00:31:04 +00:00
flo
9d52110a49
site_rock_circle
2023-11-10 00:31:03 +00:00
Christof Petig
0ddd40336a
Merge branch 'zesterer/worldgen' into 'master'
...
Various worldgen improvements
See merge request veloren/veloren!4152
2023-11-10 00:15:29 +00:00
Sorann753
a63debe1b7
Fixed French Translation
2023-11-09 19:41:05 +00:00
Joshua Barretto
84e59c52fb
Made portal fizz better convey access
2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf
Made ice reflective
2023-11-08 23:19:00 +01:00
Joshua Barretto
05863eb1ef
Better mesa layer colours
2023-11-08 23:17:34 +01:00
