DaforLynx
7b6f424bb0
Loud rivers
2022-03-13 07:47:23 +00:00
DaforLynx
123fee2707
Fix swim sfx, fix glider sfx, add glide sfx
2022-03-13 05:44:07 +00:00
Marcel
d05cb99007
Merge branch 'unvariant/trading_fix' into 'master'
...
prevent glider and sneak from triggering during trade
See merge request veloren/veloren!3264
2022-03-08 10:25:16 +00:00
ninefox
115b2875b3
prevent glider and sneak from triggering during trade
2022-03-07 20:28:38 -08:00
Isidor Nielsen
a5ab36e6b5
Map marker fixes
2022-03-07 12:16:04 +00:00
Sam
89bf529a5e
Addressed review comments
2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045
Addressed review comments
2022-03-03 01:11:18 -05:00
Sam
0a0fffd5ed
Addressed review comments
2022-03-03 01:11:17 -05:00
Sam
5a60562eee
Addressed review comments
2022-03-03 01:11:16 -05:00
Sam
ce70c512e2
Arrow trails
2022-03-03 01:11:15 -05:00
Sam
48c97cd829
Glider trails
2022-03-03 01:11:13 -05:00
Sam
eacd43be16
Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better.
2022-03-03 01:11:12 -05:00
jshipsey
6ba8af5434
anim additions
2022-03-03 01:11:11 -05:00
Sam
f3c5c2b5e3
Pointy trails
2022-03-03 01:11:10 -05:00
Sam
b3a19ebc00
Weapon trails now works with dual wielding
2022-03-03 01:11:08 -05:00
Sam
a967daa2f5
Trails now controlled and enabled from animation files.
2022-03-03 01:11:07 -05:00
Sam
fc1a9f3c61
Trail thinning is now smooth
2022-03-03 01:11:06 -05:00
Sam
87434c472c
Trails shrinks over time
2022-03-03 01:11:05 -05:00
Sam
ab4c5dac87
Reset vertices for trails in trail manager.
2022-03-03 01:11:04 -05:00
Sam
bee16001ed
Don't upload weapon trails to GPUs for entities that have only zero quds.
2022-03-03 01:11:03 -05:00
Sam
cfbb3a5bca
Changed to a single dynamic model
2022-03-03 01:11:02 -05:00
Monty Marz
82def16969
visuals
2022-03-03 01:11:00 -05:00
Sam
c6dc96b795
Settings button to turn off weapon trails.
2022-03-03 01:10:59 -05:00
Sam
f4abe4f275
More tweaks
2022-03-03 01:10:58 -05:00
Sam
1f2ede656e
Fixed tests
2022-03-03 01:10:57 -05:00
Sam
b558331b32
Finishing touches
2022-03-03 01:10:55 -05:00
Sam
d23dd6c9e9
Fixed a few errors
2022-03-03 01:10:54 -05:00
Sam
5018a9f476
Game now runs, still doesn't work
2022-03-03 01:10:53 -05:00
Sam
33419c7b4c
Trails are now hackily created.
2022-03-03 01:10:51 -05:00
Sam
05f53a5316
Changed to one dynamic model per entity.
2022-03-03 01:10:50 -05:00
Sam
d9028ec978
Dynamic model now used for trail.
2022-03-03 01:10:49 -05:00
Sam
0794f980fe
Mostly snaked through another rendering pipeline
2022-03-03 01:10:47 -05:00
Christof Petig
f347b9de11
Diversify price calculation for items by using multiple categories per item.
2022-03-03 02:32:34 +00:00
ubruntu
d18242a1df
Fix interactable HUD
2022-02-27 21:50:07 +00:00
Imbris
8742a37e0f
Changes based on review. Fix tests.
2022-02-27 14:43:08 -05:00
Imbris
e6c2239744
Fix typo. cargo fmt.
2022-02-27 13:47:13 -05:00
Imbris
e52159f638
Remove original character from game world when possessing to make persistence more robust.
2022-02-27 13:47:13 -05:00
Imbris
10803a9735
Stop using Character presence kind when possessing so that persistence doesn't get messed up.
2022-02-27 13:47:12 -05:00
Karl Werf
4dae579aca
Minimap draw order fix
...
Minimap location marker and player indicator are no longer drawn on top of the main map if they overlap.
Minimap location marker is no longer a button.
2022-02-27 15:41:12 +01:00
Imbris
4aa89fd6cc
Merge branch 'unvariant/center_item_drops' into 'master'
...
Center item drops
See merge request veloren/veloren!3232
2022-02-27 02:07:30 +00:00
ninefox
329051c6df
removed extra fields from item_drop_manifest.ron
...
added TODO about applying non-random rotations in load.rs
2022-02-26 10:13:04 -08:00
Imbris
08f67a335f
Add experimental shader option that lowers glow strength for lights near the camera
2022-02-26 00:26:42 -05:00
ninefox
5aa98b7b3e
Applied review suggestions
2022-02-23 18:37:04 -08:00
ninefox
61913402a2
add code to center item drops
...
reduce size of coins
2022-02-23 17:16:10 -08:00
Marcel
2a9f75340a
Merge branch 'spanish_translation' into 'master'
...
apply changes from MR!2904
See merge request veloren/veloren!3224
2022-02-20 16:26:24 +00:00
Marcel
df7cd2da1a
Merge branch 'isse/shared-waypoints' into 'master'
...
Shared and persistent waypoints
See merge request veloren/veloren!3162
2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb
Shared and persistent waypoints
2022-02-20 10:10:18 +00:00
Marcel
6a9924d6ca
Merge branch 'imbris/small-fixes' into 'master'
...
Small bits of code cleanup
See merge request veloren/veloren!3222
2022-02-20 09:41:21 +00:00
Marcel Märtens
e2648f6733
apply changes from MR!2904
2022-02-20 10:18:24 +01:00
Imbris
d8996a9b94
Remove unwrap in handling of the DeleteServer message in the main menu ui
2022-02-19 19:37:53 -05:00
Imbris
adec5905bd
Properly wait to request buffer mapping until after the command to copy the screenshot texture to the buffer has been submitted.
2022-02-19 19:05:04 -05:00
Marcel Märtens
802b9e7914
Change the version number to 0.12
2022-02-18 22:36:53 +01:00
Treeco
fdd7237dfc
Removed dead settings button from main menu
2022-02-18 16:11:30 +00:00
Monty Marz
9ca1693ef8
New login-screen bg image
2022-02-17 16:08:37 +00:00
Imbris
bdb10c4e14
Merge branch 'isse/minor-ux-improvements' into 'master'
...
Minor inventory ux improvements
Closes #1436
See merge request veloren/veloren!3157
2022-02-16 21:48:03 +00:00
Isidor Nielsen
67f2d05d3c
Minor inventory ux improvements
2022-02-16 21:48:03 +00:00
ShouvikGhosh2048
d72f43190b
Fixes #1452 - Prevents empty trades
2022-02-16 21:41:26 +00:00
Samuel Keiffer
6c7c0eefae
Merge branch 'gnarlings' into 'master'
...
Gnarlings
See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
Sam
f30e879cf5
Clippy fixes
2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9
small UI fixes, new haste buff icon
2022-02-14 19:24:59 +01:00
Sam
3373985a5f
Comments
2022-02-13 23:35:18 -05:00
Sam
6dafacaa24
Addressed review comments
2022-02-13 21:49:46 -05:00
unvariant
9d98cd9e58
Render item drops instead of placeholder textures
2022-02-14 02:09:45 +00:00
Imbris
ddcee8448b
Merge branch 'persist_debug_checkbox' into 'master'
...
Persist interface debug checkbox across sessions
See merge request veloren/veloren!3147
2022-02-13 19:43:51 +00:00
Monty Marz
c7ce2b773c
new icons
2022-02-12 22:46:34 +01:00
jshipsey
2eee43865f
chieftain anims
2022-02-11 02:18:48 -05:00
Sam
4991f7ecea
Gnarlign site tweaks and chieftain buff
2022-02-11 01:23:09 -05:00
Sam
377906dfa0
Ground shockwave particle tweaks.
2022-02-10 22:40:26 -05:00
Sam
86a00e75bb
Tweaked fire particles
2022-02-10 14:58:37 -05:00
Sam
bf7e84c6ae
Initial particle work
2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f
Chieftain AI and attacks
2022-02-10 14:58:35 -05:00
jshipsey
3a35dcc77f
brick texture colors
2022-02-10 14:58:34 -05:00
jshipsey
0c788997a4
anims
2022-02-10 14:58:34 -05:00
Sam
fcb0f8d8f0
Wood golem attacks and ai
2022-02-10 14:58:32 -05:00
Sam
e1f164d099
Initial AI for gnarling logger/mugger.
2022-02-10 14:58:27 -05:00
ninefox
2e902c1c5c
swapped show.debug for interface.toggle_debug
2022-02-09 18:31:46 -08:00
jshipsey
72f2b2eee8
clippy
2022-02-09 19:35:05 -05:00
jshipsey
7ae85aef50
tweaks
2022-02-09 19:34:24 -05:00
jshipsey
6d34a6b544
wallrunning
2022-02-09 19:34:23 -05:00
jshipsey
6f8cadc847
wall contact, run anim tweaks
2022-02-09 19:34:22 -05:00
Joshua Barretto
b2d6b06e2e
Merge branch 'zesterer/bare-minimum' into 'master'
...
Added BareMinimum shader effect
See merge request veloren/veloren!3188
2022-02-09 23:29:17 +00:00
Joshua Barretto
8888190eb4
Added BareMinimum shader effect
2022-02-09 12:56:21 +00:00
phoenix13032005
7a1f0d9fa1
Balance update
...
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
2022-02-09 12:13:42 +02:00
Imbris
18f6077321
Merge branch 'imbris/srgb-dither' into 'master'
...
Dither in nonlinear srgb space and dithering related experimental shader options
See merge request veloren/veloren!3160
2022-02-01 21:24:50 +00:00
Imbris
2325ac3d78
Use ori as fallback for look_dir so that other entities will turn properly when shooting (controller component is not synced)
2022-01-30 23:30:34 -05:00
Marcel Märtens
201a5ac2c7
stricten some rules and fix some clippy warnings
2022-01-30 20:16:21 +01:00
Avi Weinstock
f3f08936d8
Decrease too-many-arguments-threshold and type-complexity-threshold.
2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Imbris
21cad12272
Merge branch 'fix-ghost-item' into 'master'
...
Fix ghost item when trade gets declined
Closes #1429
See merge request veloren/veloren!3117
2022-01-30 17:31:15 +00:00
Imbris
89edd18787
Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options
2022-01-28 22:55:59 -05:00
juliancoffee
fba89517de
Move Veloren to 2021 edition
2022-01-26 16:46:40 +02:00
juliancoffee
6a0458ddf1
Move voxygen to 2021 edition
2022-01-26 15:47:39 +02:00
juliancoffee
9edd526279
Move voxygen-i18n to 2021 edition
2022-01-26 15:13:05 +02:00
Marcel
0ebff57a59
Merge branch 'Martin/remove-server-from-list' into 'master'
...
Feature: Delete button in the servers menu
See merge request veloren/veloren!3144
2022-01-26 10:20:15 +00:00
ninefox
e6ced0577e
Persist interface debug checkbox
2022-01-25 22:47:26 -08:00
Dominik Broński
ca7b048184
Merge branch 'SeaCrocodile' into 'master'
...
Sea crocodile
See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
Martin
700f709664
added delete button in the settings window which deletes a server from the list
2022-01-25 19:48:58 +02:00
Martin
a86ed49293
added message and event for deleting a server from the list
2022-01-25 19:48:19 +02:00
Imbris
432d78a232
Merge branch 'imbris/screenshot-format' into 'master'
...
Support multiple texture formats for screenshots
See merge request veloren/veloren!3134
2022-01-25 14:45:54 +00:00
Imbris
2bada7f02a
Don't send egui events when it is hidden and as a result these events are also never captured by egui. This fixes issues with the mouse clicks being captured if the mouse was hovered over the egui UI when it was toggled off.
2022-01-25 01:23:46 -05:00
Imbris
c320604a36
Support multiple texture formats for screenshots
2022-01-25 00:36:08 -05:00
InfRandomness
df6a0002e9
Move alpha values calculation to CPU
2022-01-24 19:24:51 +00:00
floppy
fb316e8f66
SeaCrocodile spawning in tropical Oceans
2022-01-24 19:36:13 +01:00
Justin Shipsey
05d5bca72d
Merge branch 'slipped/roll' into 'master'
...
hold weapon while rolling
See merge request veloren/veloren!3135
2022-01-24 09:56:00 +00:00
jshipsey
067f06561f
hold weapon while rolling
2022-01-24 03:55:00 -05:00
Imbris
57781eac27
Only toggle egui via F7 instead of needing to also have debug toggle on with F3
2022-01-24 01:40:55 -05:00
Imbris
086b4bece8
Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master'
...
Kalikatz/tweak to chat scroll issue
See merge request veloren/veloren!2962
2022-01-24 06:14:08 +00:00
Imbris
fc3da4bfce
Merge branch 'imbris/sobel' into 'master'
...
Add experimental sobel filter
See merge request veloren/veloren!3113
2022-01-24 02:42:54 +00:00
Imbris
7e5a3efd02
Add egui window to toggle experimental shaders.
2022-01-23 21:14:41 -05:00
Joshua Barretto
d18174e0d1
Revert "Merge branch 'infrandomness/remove_alpha' into 'master'"
...
This reverts merge request !3128
2022-01-24 00:52:03 +00:00
Imbris
6cfadc4f65
Add sobel filter as experimental shader option
2022-01-23 16:32:26 -05:00
Joshua Barretto
470353e08c
Fix for translucency blocking clouds
2022-01-23 16:32:26 -05:00
Joshua Barretto
38832fadd3
Improved underwater lighting on low shader settings
2022-01-23 16:32:26 -05:00
Joshua Barretto
e6332c1cb5
Significantly improved underwater shaders
2022-01-23 16:32:25 -05:00
Dr. Dystopia
9306dc816f
Fix warnings
2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb
Show HUD for campfires
2022-01-23 16:32:25 -05:00
Joshua Barretto
bdb0fc9c16
Merge branch 'zesterer/underwater' into 'master'
...
Underwater shaders
See merge request veloren/veloren!3127
2022-01-23 20:36:47 +00:00
Forest Anderson
d3aa224f15
Merge branch 'tygyh/Fix-warnings' into 'master'
...
Fix warnings
See merge request veloren/veloren!3051
2022-01-23 19:25:35 +00:00
Joshua Barretto
8504a8ab21
Merge branch 'ubruntu/campfire-hud' into 'master'
...
Show HUD for campfires
See merge request veloren/veloren!3097
2022-01-23 19:25:11 +00:00
ubruntu
ca2a81c20f
Show HUD for campfires
2022-01-23 19:25:11 +00:00
Forest Anderson
7c99f6eb5e
Merge branch 'unvariant/affix_remap_button' into 'master'
...
Affixed remap/clear button to top of control settings window
See merge request veloren/veloren!3119
2022-01-23 18:40:43 +00:00
Dr. Dystopia
bb48267827
Fix warnings
2022-01-23 19:03:47 +01:00
InfRandomness
69c3480fce
Move alpha values calculation
2022-01-23 17:16:22 +00:00
Joshua Barretto
8a684973b4
Merge branch 'zesterer/tiny-fixes' into 'master'
...
Addressing criticisms
See merge request veloren/veloren!3121
2022-01-22 16:44:01 +00:00
Joshua Barretto
b8df17080d
Merge branch 'infrandomness/waypoint_binding_customization' into 'master'
...
Add waypoint binding customization code
See merge request veloren/veloren!3122
2022-01-21 18:05:41 +00:00
InfRandomness
b33fda1e0c
Add waypoint binding customization code
2022-01-21 18:05:41 +00:00
Joshua Barretto
c0e3f0abef
Merge branch 'ubruntu/chest-sprite-names' into 'master'
...
Fix chest display names
See merge request veloren/veloren!3125
2022-01-21 18:05:39 +00:00
ubruntu
1d0c861e19
Fix chest display names
2022-01-21 18:05:39 +00:00
Joshua Barretto
31b9cd0565
Fix for translucency blocking clouds
2022-01-21 17:29:59 +00:00
Joshua Barretto
3b347a2aa3
Improved underwater lighting on low shader settings
2022-01-21 13:35:40 +00:00
Samuel Keiffer
a00ac11e25
Merge branch 'sam/fix-possess' into 'master'
...
Fix possession bug
See merge request veloren/veloren!3123
2022-01-21 07:40:23 +00:00
Joshua Barretto
5b606f0d50
Significantly improved underwater shaders
2022-01-21 00:42:20 +00:00
Sam
fe1db1e9e0
Can move around, so character state system runs
...
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
2022-01-20 15:26:35 -05:00
Joshua Barretto
4f181c936d
Merge branch 'name_areas_based_on_biome' into 'master'
...
name_areas_based_on_biome
See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
Joshua Barretto
5a7cd39625
Added point glow slider
2022-01-20 13:40:11 +00:00
Joshua Barretto
89cd58b1ac
Don't allow interaction with mounted entity
2022-01-20 11:25:53 +00:00
threadexception
2a65d4950d
Fix ghost item when trade gets declined
2022-01-20 09:07:47 +01:00
jshipsey
136555dbbe
fix crash
2022-01-20 02:14:49 -05:00
ninefox
3e198c5195
Affixed remap/clear button
2022-01-19 17:43:08 -08:00
Joshua Barretto
53574bb6ec
Tweaked lantern offsets
2022-01-19 20:08:13 -05:00
Joshua Barretto
fcd25648fe
Fixed point glow with no clouds
2022-01-19 20:08:13 -05:00
Joshua Barretto
7506dc2a41
Added procedural LoD detail shader
2022-01-19 19:59:14 -05:00
Joshua Barretto
dea540222f
Upped bloom default
2022-01-19 19:59:14 -05:00
Joshua Barretto
391d1f6bf4
Added point glow
2022-01-19 19:59:13 -05:00
Snowram
a6e396e29a
Stunned and jump anims, stats, spawns, more IA work
2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef
Arthropods spawns and loots
2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3
spit anim
2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00
summon an
2022-01-19 19:01:15 +01:00
Snowram
fd3ed89899
More arthropod animations
2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2
Arthropod basic attack
2022-01-19 19:01:14 +01:00
Snowram
6da42e61ab
Arthropod jump attack, hitboxes
2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005
Arthropod charge
2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60
More arthropod work
2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0
Adds poisoned debuff (energy change over time)
2022-01-19 19:01:13 +01:00
Snowram
2871fa83bc
Arthropod run
2022-01-19 19:01:12 +01:00
Snowram
fa549eece7
Adds new arthropod species
2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539
Adds arthropod skeleton
2022-01-19 19:01:11 +01:00
Samuel Keiffer
c3e92b6c7a
Merge branch 'sam/melee-constructor' into 'master'
...
Melee Constructor
See merge request veloren/veloren!3111
2022-01-19 06:36:51 +00:00
floppy
51356d5fad
in terrain.mod.rs, return name as Option in fn name
2022-01-18 19:53:20 +01:00
Joshua Barretto
b85aac6e23
Fixed minor shader issues, added curved world effect
2022-01-18 01:47:06 +00:00
Sam
b0644ca767
Melee attacks are now created through a melee constructor.
2022-01-17 20:41:24 -05:00
floppy
fd920cea1d
allow enabling/disabling biome names on map
2022-01-17 23:47:27 +01:00
floppy
a836b61190
allow enabling/disabling biome names on map
2022-01-17 23:45:51 +01:00
Joshua Barretto
cd428d9267
Added support for experimental shaders
2022-01-17 22:20:33 +00:00
Joshua Barretto
9c565dadc5
Merge branch 'zesterer/mount-everest' into 'master'
...
Mount Everest
See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
jshipsey
1d76d484bb
anim tweaks
2022-01-17 06:45:26 -05:00
Joshua Barretto
d0c101ed06
Remove redundant orientation
2022-01-17 09:25:46 +00:00
jshipsey
41ed0f284f
swivel, quadsmall/quadlow offsets
2022-01-17 03:42:56 -05:00
Kemper
6f0f43917d
Fix negative energy stat comparisons in item tooltips
2022-01-17 05:18:21 +00:00
Joshua Barretto
3b7ea72a9c
Fixed review comments
2022-01-16 21:13:13 +00:00
jshipsey
0ea1e6862e
animation tweaking
2022-01-16 15:46:17 -05:00
Joshua Barretto
7f3d9898db
More sensible turn rate in air
2022-01-16 19:43:13 +00:00
jshipsey
ed9de26f27
jump anim, quad med
2022-01-16 14:09:55 -05:00
Joshua Barretto
bde3aade2b
Updated changelog, fixed incorrect hint for mineable blocks
2022-01-16 17:53:51 +00:00
Joshua Barretto
043016a433
Don't try to mount unmountable entities, clippy fixes and fmt
2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5
Added overhead hints, smoother mount movement
2022-01-16 17:53:14 +00:00
Joshua Barretto
f33c12e976
Remove unnecessary interpolation cruft
2022-01-16 17:53:14 +00:00
Joshua Barretto
157cd6cd14
Fixed unusual speech bubble placement
2022-01-16 17:53:14 +00:00
Joshua Barretto
5c37786185
Improved interpolation for riders
2022-01-16 17:53:13 +00:00
Joshua Barretto
6931514ae5
Made teleport commands redirect to mount
2022-01-16 17:53:13 +00:00
Joshua Barretto
537cc38b5e
Fixed lantern position when mounting
2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed
Overhauled mounting to make it more reliable
2022-01-16 17:53:13 +00:00
Sam
7ae8ed09f6
Addressed MR comments.
2022-01-15 21:50:27 -05:00
Sam
4d3b0736d0
Fixed bug with returning to general combat skill tree.
2022-01-15 21:49:30 -05:00
Sam
aaa33c6834
Fixed display of some stats in dary and changelog entry.
2022-01-15 21:49:29 -05:00
Sam
745cc20c66
Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode.
2022-01-15 21:49:28 -05:00
Sam
19a1a0adb2
Changed to using slot maker for ability slots
2022-01-15 21:49:25 -05:00
Monty Marz
6d0913bb5e
visuals
2022-01-15 21:46:57 -05:00
Sam
d1c5d3e020
If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand.
2022-01-15 21:46:56 -05:00
Sam
70d6f3a854
Scroll through all aiblities in the same pages.
2022-01-15 21:46:56 -05:00
Sam
3870688717
Pages to swap between weapon abilities.
2022-01-15 21:46:55 -05:00
Sam
ed38272d23
Diary stats now use real values.
2022-01-15 21:46:55 -05:00
Monty Marz
eb0bed39e8
stats window WIP
2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68
progress
2022-01-15 21:46:54 -05:00
Sam
714e080535
Abilities can now be dragged to slot to be equipped.
2022-01-15 21:46:53 -05:00
Sam
d0e487da8a
Ability sets now start with non-empty defaults.
2022-01-15 21:45:27 -05:00
Sam
d86692c4fe
Added in-memory persistence of ability sets per weapon kind pair.
2022-01-15 21:42:34 -05:00
Monty Marz
89bf41574c
diary section buttons
2022-01-15 21:42:33 -05:00
Sam
ee5293c64e
Abilities scrollable now.
2022-01-15 21:42:33 -05:00
Sam
cf724bd76c
Initial UI work
2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b
Removed health scaling that bypasses the skill system.
2022-01-15 11:58:28 -05:00
Tormod G. Hellen
3afa16bf03
Fix hotbar changing when sorting inventory.
...
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Samuel Keiffer
589189315c
Merge branch 'slipped/gnarlingstuff' into 'master'
...
gnarling depth
See merge request veloren/veloren!3068
2022-01-14 07:22:11 +00:00
Imbris
1e24e4b8fb
Merge branch 'YuriMomo/Fix-Report-Message' into 'master'
...
Fix-Report-Message
See merge request veloren/veloren!3096
2022-01-14 06:17:55 +00:00
jshipsey
475fc1631f
akhlut
2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de
more gnarling weapons
2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -05:00
Sam
d1e1de3b14
Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
...
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
Dominik Bronski
38e4a41620
Fix-Report-Message
2022-01-11 20:42:05 +01:00
Monty Marz
bc1c84aa76
Merge branch 'pfau/smöl_fixes' into 'master'
...
change merchant backpack visuals and add mining skill icons
See merge request veloren/veloren!3089
2022-01-08 09:32:51 +00:00
Imbris
f948476f9f
Merge branch 'fetsorn-master-patch-26200' into 'master'
...
Fix typo "incase"->"in case"
See merge request veloren/veloren!3086
2022-01-08 04:07:33 +00:00
Monty Marz
d72d926341
change merchant backpack visuals and add mining skill icons
2022-01-08 01:57:52 +01:00
Joshua Barretto
3cba7e7f87
Merge branch 'zesterer/fix-nametags' into 'master'
...
Fixed nametag logic bug
See merge request veloren/veloren!3088
2022-01-07 22:38:59 +00:00
Joshua Barretto
bc7c942bc9
Fixed nametag logic bug
2022-01-07 21:54:14 +00:00
unvariant
71d2be5f76
support removing key bindings
2022-01-07 20:30:30 +00:00
fetsorn
338dec41ab
Fix typo "incase"->"in case"
2022-01-06 18:28:05 +00:00
voxal
7d07598370
Move comments and turn on by default
2022-01-05 20:07:05 -08:00
voxal
e75f569014
Refactor to avoid changing overhead struct
2022-01-05 20:07:05 -08:00
voxal
471e75d846
cargo fmt
2022-01-05 20:06:43 -08:00
voxal
41e7e25f16
Fix clippy::nonminimal-bool
2022-01-05 20:06:43 -08:00
voxal
e546a1d1a9
Allow players to see own speech bubbles.
2022-01-05 20:06:43 -08:00
Sam
2e09feb426
Tweaks to prompt dialog.
2022-01-03 19:55:06 -05:00
Sam
efbc5f9b75
UI notifying player that their skillset has been invalidated.
2022-01-03 19:55:06 -05:00
Sam
8221336587
Addressed some review.
2022-01-03 19:55:04 -05:00
Sam
64c8321626
Made skill groups remain locked if skill to unlock them not acquired.
2022-01-03 19:55:03 -05:00
Sam
c44c10718b
Split skillset and skills into separate files.
2022-01-03 19:55:00 -05:00
Sam
fe45a158ed
Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp.
2022-01-03 19:55:00 -05:00
DaforLynx
13e87375d6
River sounds and more
2022-01-03 22:40:31 +00:00
Samuel Keiffer
4d85ae4f60
Merge branch 'ubruntu/dagger-ux' into 'master'
...
Dagger UX
See merge request veloren/veloren!3072
2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7
Dagger UX
2021-12-28 22:09:34 +00:00
DoctorKompot
0dba858ca9
fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files
2021-12-27 03:01:26 +02:00
DoctorKompot
1cc69bbca1
fixed Pfau's turbans and manually added back mod.rs files that got deleted previously
2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe
added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry
2021-12-27 03:01:18 +02:00
DoctorKompot
ccc1bdbf1c
updated the Common Quality item displays
2021-12-27 03:00:57 +02:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
DaforLynx
e44478736e
Music additions
2021-12-22 11:20:34 +00:00
Christof Petig
453c4c149e
fix more examples and satisfy code quality checks
2021-12-20 18:09:34 +00:00
Joshua Barretto
3b4fa6b328
Snow for ice
2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
Ben Wallis
9a4e6b81d3
Merge branch 'Character-editting' into 'master'
...
Character editing
See merge request veloren/veloren!3059
2021-12-20 15:24:43 +00:00
ubruntu
59cb9ea7c2
Hide empty stats on item tooltips
2021-12-20 15:07:38 +00:00
Snowram
66a5f9fded
Fixes animation hot reloading (credit to Imbris)
2021-12-18 20:36:14 +01:00
Dr. Dystopia
1719ce8c16
Format
2021-12-18 15:58:17 +01:00
IsseW
65ab92eb78
button spacing
2021-12-18 15:41:11 +01:00
Dr. Dystopia
3329a8df61
Add 'pen' icons for edit buttons
2021-12-18 15:27:14 +01:00
Dr. Dystopia
9a7cc50898
Show current equipment during editing
2021-12-18 12:35:31 +01:00
Dr. Dystopia
48fd9e877d
Use 'confirm' button when finishing editing
2021-12-18 11:45:49 +01:00
Dr. Dystopia
62f9bc5059
Fix redundant pattern matching
2021-12-15 21:05:49 +01:00
Dr. Dystopia
e2f4499d45
Remove debug prints
2021-12-15 20:56:44 +01:00
IsseW
8b258e4e81
Non editable data
2021-12-15 20:40:01 +01:00
Joshua Barretto
dd95d69dc4
Fixed character editing
2021-12-13 00:55:25 +00:00
Dr. Dystopia
408fe1e6b6
Begin creating character editing
2021-12-13 01:13:33 +01:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438
Convert Armor Stats to Options
2021-12-12 00:25:35 +00:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
f4c5abf36b
Resolve all '#[allow(clippy::needless_range_loop)]' error supressions
2021-12-03 10:38:30 +01:00
Dr. Dystopia
a0dfb2e8ad
Resolve all '#[allow(clippy::manual_saturating_arithmetic)]' error supressions
2021-11-30 13:57:47 +01:00
Avi Weinstock
cb4c3eb34e
Bodies of water no longer contain black chunks on the voxel minimap.
...
The heuristic for pruning dungeon ceilings depended on detecting an
air-to-not-air edge, which was not present for chunks whose topmost
layer was water. Sampling 1 layer of the `above` block introduces such
an edge, allowing the water surface to be detected.
2021-11-29 14:39:56 -05:00
Jonathan Berglin
d9dd49552b
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
2021-11-29 09:32:55 +00:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Imbris
0beee17370
Pin cmake crate to 0.1.45, since the newer version uses the --parallel argument which is not available on our CI's cmake version
2021-11-21 09:51:39 -05:00
Marcel Märtens
7a8944ac71
remove additional restriction which is only necessary in egui 0.15
2021-11-20 20:22:45 +01:00
Marcel Märtens
7200cc4ad7
undo egui upgrade try
2021-11-20 20:18:03 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Marcel Märtens
086f9737e4
move server.voxel for airship to common
2021-11-15 16:39:39 +01:00
Joshua Barretto
b1915622b5
Merge branch 'xvar/fix-tooltip-floating-point-rounding' into 'master'
...
Added formatting to round tooltip values for consumables to 1 decimal place
See merge request veloren/veloren!3004
2021-11-13 20:54:05 +00:00
Ben Wallis
022c1417b6
EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies).
...
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.
EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
2021-11-13 20:46:45 +00:00
Ben Wallis
b4c7af1ad1
Added formatting to round tooltip values for consumables to 1 decimal place
2021-11-13 20:25:09 +00:00
Joshua Barretto
c0bf9503bd
Addressed review issues, added cloning docs to BodySpec::Manifests
2021-11-13 17:20:23 +00:00
Joshua Barretto
657ac45288
Updated changelog
2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2
Arbitrary volume airships
2021-11-13 17:13:08 +00:00
Samuel Keiffer
6e57380735
Merge branch 'sam/ability-pool-and-hotbar' into 'master'
...
Ability pool
See merge request veloren/veloren!2996
2021-11-12 05:11:12 +00:00
Sam
b901b97191
Changed fallback ability icon.
2021-11-11 23:41:01 -05:00
Sam
040d70c750
Final fixes.
2021-11-11 23:11:17 -05:00
Sam
a288f9ee43
Addressed further review.
2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519
Addressed review feedback.
2021-11-11 18:10:22 -05:00
Sam
b678f7f46e
Added some client methods for changing abilities to hook into.
2021-11-11 01:55:32 -05:00
Sam
da677e8ea6
Abilities can now be referred to by the asset id.
2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b
Did voxygen stuff for ability pool.
2021-11-09 21:20:41 -05:00
Imbris
a7e1d3218f
Potential fix for leak when inventory is open
2021-11-09 01:21:45 -05:00
Jon Nettleton
836c948086
Update crate for keyboard-keynames
...
This revision includes a fix for supporting Aarch64 platforms
Signed-off-by: Jon Nettleton <jon@solid-run.com>
(cherry picked from commit a5e64af199
2021-11-02 08:49:17 +00:00
Joshua Barretto
80c4e3de19
Merge branch 'tijnvdheuvel/newSFX' into 'master'
...
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX
See merge request veloren/veloren!2977
2021-11-01 21:15:35 +00:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd
headbands
2021-10-30 23:42:13 -04:00
Sam
15a8c31383
Hack to make salvage go away when leaving station.
2021-10-29 13:25:38 -04:00
tijnvdheuvel
a36106eb22
Update mod.rs missed a comma
2021-10-29 13:09:21 +00:00
tijnvdheuvel
3dbd553997
Fixed bug truffler quadruped small
2021-10-28 17:37:29 +00:00
tijnvdheuvel
d4df012835
Added mod.rs entries for truffler and Fungome
2021-10-28 13:48:22 +00:00
Kali
768911aebe
tweak chat scroll issue
2021-10-28 02:55:38 -07:00
Samuel Keiffer
fef9fd5893
Merge branch 'sam/crafting-tweaks' into 'master'
...
Better salvaging and other crafting tweaks
See merge request veloren/veloren!2903
2021-10-27 21:33:21 +00:00
Snowram
02930dd2ed
Uses a list for item tooltips
2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b
Fixed opening salvaging station not showing salvage text.
2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496
crafting station model, explanatory text part 1
2021-10-27 17:02:34 -04:00
Sam
5707377565
Changed tooltips to take iterator. Tooltips also show original item as well as salvage output.
2021-10-27 17:02:34 -04:00
Snowram
2bf16aab63
Make item tooltip accept multiple items for salvage
2021-10-27 17:02:33 -04:00
Sam
e28ca15059
Salvaging now requires a salvaging station.
2021-10-27 17:02:33 -04:00
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -04:00
Sam
5c3021bd0a
Inventory now highlights salvageable items when in salvage mode.
2021-10-27 17:02:31 -04:00
Sam
794b072d3e
Simple recipes now take a vec of slots to look in for the ingredients.
2021-10-27 17:02:30 -04:00
Sam
7a17863988
Salvage works by double clicking from inventory while salvage tab in crafting is open.
2021-10-27 17:02:30 -04:00
Sam
111abbc3bc
Added salvage tags to items, removed old salvage recipes from recipe book.
2021-10-27 17:02:29 -04:00
IsseW
2e27f7f84a
remove print
2021-10-27 23:01:41 +02:00
Joshua Barretto
30604788b9
Merge branch 'isse/loading-tip-fixes' into 'master'
...
Loading screen tip fixes
See merge request veloren/veloren!2961
2021-10-27 20:08:46 +00:00
Kemper
ff56804d8a
Show energy reward and speed as percentages in item tooltips
2021-10-26 23:07:37 +00:00
Joshua Barretto
37056e75f9
Merge branch 'demonic/shrubs' into 'master'
...
Added new Spots, Shrubs and Ships.
See merge request veloren/veloren!2953
2021-10-26 10:06:14 +00:00
IsseW
50d37bc2d4
run clippy
2021-10-26 01:30:27 +02:00
IsseW
3368f43a22
consider key layout
2021-10-26 00:42:30 +02:00
IsseW
047cda179f
Added keybinding shortcut in loading tips
2021-10-25 23:53:27 +02:00
Joshua Barretto
6362c0df32
Fixed non-character point lights
2021-10-25 12:00:02 +00:00
Forest Anderson
15185ef55e
Merge branch 'master' into 'master'
...
Fixes #819 - Prevent lantern from turning off on death
Closes #819
See merge request veloren/veloren!2955
2021-10-24 21:16:34 +00:00
Q-I-U
09028f3261
Add !health.is_dead() check to renderer
2021-10-24 22:28:23 +02:00
DemonicOnPc
b1476071b1
Added new Spots, Shrubs and Ships.
...
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
2021-10-24 08:10:44 -04:00
antoniomuso
cf8d995af7
formatted some tooltips floats
2021-10-24 10:14:54 +02:00
Samuel Keiffer
f92c6fbd49
Merge branch 'ubruntu/sneakwield-state' into 'master'
...
Sneak with weapons drawn
See merge request veloren/veloren!2917
2021-10-18 20:27:02 +00:00
Bryant Deters
b2bd43f4d3
Sneak with weapons drawn
2021-10-18 14:53:55 -05:00
Samuel Keiffer
1e61a279cc
Merge branch 'kaedr/pretty_printing_error_messages' into 'master'
...
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)
See merge request veloren/veloren!2935
2021-10-18 03:35:03 +00:00
Samuel Keiffer
e6a4e53ef3
Merge branch 'MHK/auto_search_in_crafting_menu' into 'master'
...
Add auto searching in crafting menu
See merge request veloren/veloren!2932
2021-10-17 15:16:21 +00:00
MohammadHasanKargar
40073413ae
Add hover effect to auto search in crafting menu
2021-10-17 15:27:27 +03:30
kaedr
cd5aa2d1d8
Fixed redundant to_string() call.
2021-10-16 20:41:13 -04:00
kaedr
c8a1d821e7
Added handling for connection errors that occur before client leaves login screen
2021-10-16 20:17:40 -04:00
kaedr
cc98ccc371
Added localization for server error message display on client
2021-10-16 20:17:38 -04:00
kaedr
eb02a4733d
Fixed obfuscation of error messages caused by previous commits
2021-10-16 20:17:37 -04:00
Joshua Barretto
ef33b2e3ab
Better ambiance slider
2021-10-16 15:12:07 +01:00
Joshua Barretto
3322eeb365
Aurora light tint
2021-10-16 14:32:18 +01:00
Joshua Barretto
b1a1cdde34
Fixed 'Empty' collectable sprite
2021-10-16 14:31:46 +01:00
Joshua Barretto
3357008601
Merge branch 'zesterer/small-fixes' into 'master'
...
Caverns
See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
MohammadHasanKargar
1d7ba57de7
Add auto searching in crafting menu
2021-10-15 23:57:04 +03:30
Henry Corse
e01ce2dcf4
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
Marcel
a4cf875a54
Merge branch 'isse/crafted-from-item' into 'master'
...
use "input:____" for searching by recipe input
See merge request veloren/veloren!2893
2021-10-10 15:44:44 +00:00
Isidor Nielsen
f0864a7b0a
use "input:____" for searching by recipe input
2021-10-10 15:44:43 +00:00
Marcel
94439a4240
Merge branch 'jtriantafylos/background_fps' into 'master'
...
Fixes #1350 - Allow players to cap the game FPS when unfocused
Closes #1350
See merge request veloren/veloren!2890
2021-10-10 15:33:38 +00:00
James Triantafylos
99776a6ebd
Fixes #1350 - Allow players to cap the game FPS when unfocused
2021-10-10 15:33:31 +00:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17
More cavern details
2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7
Added caverns, fixed chunk load performance issue
2021-10-10 13:41:56 +01:00
CapsizeGlimmer
a723406df7
Prevent "Error setting/centering cursor position" message spam
2021-10-06 21:25:14 +00:00
Imbris
26c028975e
Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it
2021-10-06 02:13:02 -04:00
Imbris
66076db7bb
Make map icons fade out quickly when near the edge of the map display
2021-10-06 01:37:11 -04:00
Treeco
305bdf94ef
Various map UI fixes for large worlds
...
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
2021-10-06 02:26:58 +01:00
Marcel
a48b99560c
Merge branch 'imbris/fix-reset-scissor' into 'master'
...
Make sure ui draw commands are cleared if the renderer's resolution changes
Closes #1362
See merge request veloren/veloren!2898
2021-10-05 06:11:01 +00:00
ubruntu
0e2808a8fd
Interactable campfires
2021-10-05 00:55:29 +00:00
Joshua Barretto
bfbca3e517
Added sail boat
2021-10-05 00:02:03 +01:00
Imbris
645bd03142
Make sure ui draw commands are cleared if the renderer's resolution changes
2021-10-04 18:58:28 -04:00
Imbris
c8b55d3dcb
Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged).
2021-10-04 12:23:42 -04:00
Imbris
bb26008074
Remove explicit coreaudio-sys version since we no longer rely on having the older version pinned (in fact it was already updated to the latest version)
2021-10-04 11:15:26 -04:00
