jh0l
403a523ec7
refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade
2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:21 +02:00
jh0l
991cfcaa47
feat: 🌐 add i18n for trade amount input placeholder
2022-03-27 20:24:20 +02:00
jh0l
6f22f31376
feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing
2022-03-27 20:24:18 +02:00
Andrzej Drabarek
fa5555a348
Fixed Tutorial HUD being covered up by other HUD elements.
2022-03-20 19:05:10 +01:00
Mehmet-dev
903e216d32
fixing blood particles on bodies not supposed to bleed from gameplay perspective
2022-03-20 15:45:50 +00:00
Marcel
aa244b23c4
Merge branch 'Melonai/apply_mount_offset_to_weapon_trails' into 'master'
...
Apply mount transform position to weapon trails
Closes #1489
See merge request veloren/veloren!3279
2022-03-15 21:24:49 +00:00
Imbris
1ff8fffa1d
Merge branch 'olexorus/2021_cleanup' into 'master'
...
Simplifications made possible by the 2021 Edition
Closes #1447
See merge request veloren/veloren!3277
2022-03-15 21:05:53 +00:00
Mel
0ba3a806c0
Apply mount transform position to weapon trails
2022-03-15 21:47:17 +01:00
DaforLynx
e936a27d40
Small sound fixes
2022-03-15 16:23:10 +00:00
Olexorus
2212c3d70c
Remove borrow-checker appeasing code that's no longer necessary in Rust 2021
2022-03-15 16:49:03 +01:00
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
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
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
6a0458ddf1
Move voxygen to 2021 edition
2022-01-26 15:47:39 +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
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
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
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
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
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
1e6ead4005
Arthropod charge
2022-01-19 19:01:13 +01:00
