Commit Graph

5229 Commits

Author SHA1 Message Date
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Isse
aefead4a31 fmt 2023-01-28 03:10:43 +01:00
Isse
d949348661 Moderator badge 2023-01-28 03:10:24 +01:00
Ellen Sun
d774319cf0 cleanup and fixes + added change to CHANGELOG.md 2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00
poggly
75ccd65ec6 initial commit, todo comment and realphabetized ServerChatCommand enum 2023-01-27 20:31:56 -05:00
Corvella
dcd3fb2077 Correctly apply LoD distance setting and improve documentation on projectile fixes 2023-01-26 14:27:59 +00:00
Joshua Barretto
88ac238121 Merge branch 'joedonofry/dropped_lantern_glow' into 'master'
Add glow to dropped lanterns

See merge request veloren/veloren!3772
2023-01-23 16:13:43 +00:00
Joseph Donofry
74ee861dde Add glow to dropped lanterns 2023-01-23 16:13:43 +00:00
Isse
05dd34e1e8 Merge branch 'isse/update-dot-vox-dependency' into 'master'
Update dot_vox dependency

See merge request veloren/veloren!3776
2023-01-22 22:22:02 +00:00
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01:00
Isse
709b6a9aae Fixed armor stat diff display 2023-01-21 02:40:32 +01:00
Joshua Barretto
75e07c04f0 Merge branch 'zesterer/glowing-sprites' into 'master'
Added support for glowing sprites

See merge request veloren/veloren!3771
2023-01-19 22:31:30 +00:00
Joshua Barretto
d9552f7ff4 Added support for glowing sprites 2023-01-19 21:59:02 +00:00
Avi Weinstock
1cf74cecdb Allocate the correct number of widget ids for multiplicity icons. 2023-01-19 15:06:14 -05:00
Avi Weinstock
aba6f6654e Add a new particle mode for potion sickness. 2023-01-19 15:06:14 -05:00
Avi Weinstock
adaf8ef6f4 Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs. 2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Francesco Vasco
4e19b9cdfa Fix label size of "set as exp bar" checkbox 2023-01-17 19:45:04 +01:00
James Melkonian
9d31baf500 Make bats easier to combat and fix hitbox scaling bug 2023-01-15 16:25:43 -08:00
Joshua Barretto
295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master'
autodelete of summoned sprites

See merge request veloren/veloren!3735
2023-01-15 18:28:38 +00:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
Marcel
beb934a677 Merge branch 'floppy_dark_guitar&icy_talharpa' into 'master'
dark_guitar & icy_talharpa

See merge request veloren/veloren!3753
2023-01-13 13:37:45 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
Joshua Barretto
b127cff26c Merge branch 'zesterer/gbuffers-ssr' into 'master'
Use normal and material gbuffer to improve quality of SSR

See merge request veloren/veloren!3734
2023-01-12 20:26:41 +00:00
Joshua Barretto
4d7526b920 Made point shadows with shadow mapping an experimental shader 2023-01-12 15:39:11 +00:00
Isse
5adaad956b Experimental shader command 2023-01-10 01:57:44 +00:00
Marcel Märtens
25906e05df Change the version number to 0.14 2023-01-06 18:41:03 +01:00
Marcel Märtens
d271c40592 cargo fmt 2023-01-03 08:58:08 +01:00
Imbris
d254e14771 Remove custom keylayout init code since we are back on matching winit version with the keylayout crate. 2023-01-02 22:43:32 +00:00
Marcel
edb34116b4 Merge branch 'xMAC94x/fix_crash' into 'master'
fix crash when clamp mode is used by using min().max() rather than clamp

See merge request veloren/veloren!3742
2023-01-02 16:33:16 +00:00
Marcel Märtens
3c502579db fix crash when clamp mode is used by rearanging the parameters 2023-01-02 15:51:24 +01:00
Marcel
2ff24259be Merge branch 'zesterer/lod-models' into 'master'
New LoD model, wind sway pays attention to wind velocity

See merge request veloren/veloren!3739
2023-01-02 14:51:00 +00:00
Marcel
54176068cf Merge branch 'blinc/voxygen-wayland-fix' into 'master'
Fix wayland permission problem by updating keyboard-keynames

See merge request veloren/veloren!3733
2023-01-02 14:07:06 +00:00
Marcel Märtens
0c10b8ca08 fix Cargo.lock and fmt 2023-01-02 15:06:42 +01:00
Imbris
a123c7ad7f Merge branch 'ashirviskas/advanced_inventory_sorting' into 'master'
Inventory: Improved inventory sorting

See merge request veloren/veloren!3736
2023-01-01 01:14:47 +00:00
DaforLynx
221d6a67ad Minor audio code cleanup 2022-12-31 23:50:38 +00:00
Joshua Barretto
0067825187 Reflection smearing 2022-12-31 19:19:52 +00:00
Joshua Barretto
f48e1ca951 Make wind sway change according to weather wind velocity 2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
Blinc
57b2f3c11c Wayland permission fix - update keyboard-keynames 2022-12-31 17:08:32 +03:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category 2022-12-31 02:32:41 +02:00
Joshua Barretto
367ec3e8f4 Added ViewMaterials experimental shader 2022-12-30 16:42:56 +00:00
Joshua Barretto
26a98a3d9b Use normal and material gbuffer to improve quality of SSR 2022-12-30 15:33:23 +00:00
Joshua Barretto
e87b5739f0 Separated volumetrics and transparents into independent passes to fix UB 2022-12-29 18:38:25 +00:00
Monty Marz
6b74437c8c Bag icon improvement 2022-12-23 15:22:13 +00:00
Marcel
5f4f285523 Merge branch 'christmas-2022' into 'master'
Christmas 2022 changes

See merge request veloren/veloren!3721
2022-12-22 21:06:51 +00:00
DaforLynx
5e282340ba Christmas 2022 changes 2022-12-22 21:06:51 +00:00
Aidar Shaikhiev
cccc796d31 Items images export for wiki 2022-12-15 16:19:49 +00:00
Marcel
b328377979 Merge branch 'assets_manager-0.9' into 'master'
Update to `assets_manager 0.9

See merge request veloren/veloren!3723
2022-12-15 11:34:46 +00:00
James Gayfer
0badaaa4ba Fix Xbox controller mappings on MacOS
After downloading the game onto my M1 Macbook, I wasn't able to get my
Xbox Series X controller to work properly. The mappings seems all over
the place in ways that didn't make sense, like the right analog stick
bound to primary and secondary attack.

I looked deeper into how controller binds work, and saw that they're
mostly all mapped to sane defaults via gilrs. I setup a test project
that mirrored gilrs's "hello world" example for controller inputs, and
noted that the inputs were logged as expected. This is when I noted the
version mismatch, as Veleron was using 0.9, while my project was using
0.10. After rolling back to 0.9 in my test project, I was able to
reproduce the incorrect mappings.

With the bump to 0.10, controller mappings respect our configured
defaults for my Xbox Series X controller on MacOS.
2022-12-13 21:42:32 -08:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01:00
IsseW
54bad4b205 Creature viewpoint 2022-11-30 16:51:02 +01:00
Marcel
44bca9a1b0 Merge branch 'floppy_dagon_kit' into 'master'
dagon_kit

See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
Marcel Märtens
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
DaforLynx
d338906b19 More music and artist links 2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
Justin Shipsey
a75b1bc21c Merge branch 'mossdrake_and_wood_fix' into 'master'
reduce mossdrake, fix woodgolem loottable

See merge request veloren/veloren!3700
2022-11-21 14:22:16 +00:00
flo
e7b802712d reduce mossdrake, fix woodgolem loottable 2022-11-21 14:22:15 +00:00
Joshua Barretto
5638934a0d Fixed TimeOfDay interpolation 2022-11-18 11:27:37 +00:00
Samuel Keiffer
5709427e63 Merge branch 'sam/small-fixes' into 'master'
Small fixes for sword

See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Sam
b2b8ea1772 Made calculation of prim count more accurate 2022-11-15 19:54:08 -05:00
Imbris
dfbb8fa1a9 Merge branch 'hjalle2000/snappy_ui' into 'master'
snappy ui scaling by having a addtional dropdown menu

See merge request veloren/veloren!3695
2022-11-15 13:56:28 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit

See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Marcel Märtens
e10df6ec58 snappy ui scaling by having a addtional dropdown menu 2022-11-15 10:28:57 +01:00
Eternalisime
7113befe88 removed useless check 2022-11-13 22:21:32 +01:00
Eternalisime
71e59e4b81 combat: tweaks and modified shockwave animation 2022-11-13 22:04:00 +01:00
Sam
4784b61656 Small fixes 2022-11-13 14:03:37 -05:00
flo666
a64236f50f quadruped_medium shockwave animation WIP 2022-11-13 19:41:18 +01:00
Justin Shipsey
aa2fabcd45 Merge branch 'mossdrake' into 'master'
Moss Drake

See merge request veloren/veloren!3693
2022-11-12 13:00:44 +00:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Justin Shipsey
420e824a3e Merge branch 'train-track-shadows' into 'master'
Train track shadows

See merge request veloren/veloren!3688
2022-11-12 13:00:24 +00:00
Christof Petig
a820eee289 Merge branch 'floppy-bat-wing-tweaks' into 'master'
tweak bat wing animation

See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
flo
df70381a7c tweak bat wing animation 2022-11-12 10:18:10 +00:00
Marcel
7a75b72aa3 Merge branch 'KingPEPSALT/improve_time_command' into 'master'
FIX #1622, /time command will not allow time going backwards as rtsim cannot...

See merge request veloren/veloren!3570
2022-11-11 10:30:44 +00:00
Avi Weinstock
e72719ddf1 Hitboxes no longer cast shadows. 2022-11-10 18:26:11 -05:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
LunarEclipse
f6e2c6885c Cargo fmt 2022-11-10 17:19:43 +01:00
pepsalt
5294603431 changed {:?}s to {}s in format strings 2022-11-10 17:18:59 +01:00
pepsalt
f22a9d030d CHANGE: moved time of day interpolation logic out of Client and into Scene for semantics and accessing the settings logically 2022-11-10 17:16:48 +01:00
pepsalt
775025ac63 CHANGE, client time lerp would cause flashing lights for large discrepancies, it now no longer lerps if the flashing lights setting is not on 2022-11-10 17:16:45 +01:00
DaforLynx
b2b14e7ab4 Event music can use more than one event at a time. Added test for soundtracks. 2022-11-07 22:39:25 +00:00
Avi Weinstock
18657fdb66 Render train tracks to the shadow map. 2022-11-06 20:54:58 -05:00
Avi Weinstock
db251273ed Apply shadow map shadows to train tracks. 2022-11-06 18:09:07 -05:00
Samuel Keiffer
72bffe0df8 Merge branch 'train-tracks' into 'master'
Train tracks

See merge request veloren/veloren!3679
2022-11-05 22:56:07 +00:00
Avi Weinstock
f5c1293e9f Address review comments for MR 3679:
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
Avi Weinstock
ff5acf18d7 Doors now animate opening when entities are near them. 2022-11-01 19:29:51 -04:00
Avi Weinstock
f83afcd5a8 Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt. 2022-10-29 14:50:52 -04:00
Avi Weinstock
372ffe45d7 Add command for debugging ways. 2022-10-29 14:32:48 -04:00
Joshua Barretto
1c1ff2189e Merge branch 'zesterer/fxupscale' into 'master'
Fixed window scale reset bug

See merge request veloren/veloren!3675
2022-10-29 12:59:06 +00:00
Avi Weinstock
08a50afd9f Mostly working train tracks. 2022-10-28 21:36:42 -04:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
b5682c4682 Addressed review comments 2022-10-27 20:07:09 -04:00
Sam
1782408676 Address UX issues of contextual abilities. 2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc Activated abilities can now be contextualized 2022-10-27 20:07:07 -04:00
Sam
273949369f Fix unit tests 2022-10-27 20:07:06 -04:00
Sam
2e8ad96121 Stances now require a small amount of time to enter them 2022-10-27 20:07:05 -04:00
Sam
df9ef691fd Cleaving stance AI 2022-10-27 20:07:03 -04:00
Sam
c97bfdfb94 Defensive stance AI 2022-10-27 20:07:01 -04:00
Sam
937db8706c Made animations when dual wielding less bad 2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2 Made combo melee more ergonomic to use when it is a stance 2022-10-27 20:06:59 -04:00
Sam
191174aa30 The currently active stance shows as a buff 2022-10-27 20:06:56 -04:00
Sam
d3a52bd63b Buffed cleaving spin 2022-10-27 20:06:56 -04:00
Sam
ac2e2fd724 Added animations for recover section of all abilities 2022-10-27 20:06:55 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed.
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
356c26cc66 UI for sword skill tree. 2022-10-27 20:06:54 -04:00
Sam
b09b0222c4 Animation for reaching flurry, tweaked animation for balanced combo. 2022-10-27 20:06:54 -04:00
Sam
9091d46554 Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge. 2022-10-27 20:06:53 -04:00
Sam
2e5dfd86de Animation for reaching skewer 2022-10-27 20:06:53 -04:00
Sam
035f9135d6 Animation for reaching combo 2022-10-27 20:06:52 -04:00
Sam
77f891dc99 Animation for mobility agility 2022-10-27 20:06:52 -04:00
Sam
73a36235fc Animation for mobility feint 2022-10-27 20:06:52 -04:00
Sam
09de0ec483 Animation for mobility combo 2022-10-27 20:06:51 -04:00
Sam
1621521232 Animation for heavy fortitude. Tweaked animation for defensive bulwark. 2022-10-27 20:06:51 -04:00
Sam
eb7c2337dd Animation for heavy finisher 2022-10-27 20:06:50 -04:00
Sam
871d480639 Combo related skill icons 2022-10-27 20:06:50 -04:00
Sam
be3f2dca92 Animation for heavy pommel strike 2022-10-27 20:06:49 -04:00
Sam
ba4c28e83a Animation for heavy combo 2022-10-27 20:06:49 -04:00
Sam
d7a0a6e743 Animation for parrying counter 2022-10-27 20:06:49 -04:00
Sam
632941e99d Animation for parrying riposte 2022-10-27 20:06:48 -04:00
Sam
7c22847009 Animation for parrying parry 2022-10-27 20:06:48 -04:00
Sam
dd37a699c0 Animation for parrying combo 2022-10-27 20:06:47 -04:00
Sam
571c64a4bb Animation for defensive bulwark 2022-10-27 20:06:47 -04:00
Sam
0c8480ac92 Defensive retreat animation 2022-10-27 20:06:47 -04:00
Sam
19948ad6fd Animation for defensive combo 2022-10-27 20:06:46 -04:00
Sam
0dea91e57f Animation for cleaving dive 2022-10-27 20:06:46 -04:00
Sam
d907cd5e51 Animation for cleaving finisher 2022-10-27 20:06:45 -04:00
Sam
83829d1e1b Animation for cleaving spin 2022-10-27 20:06:45 -04:00
Sam
8d252b7168 Cleaving combo animation 2022-10-27 20:06:44 -04:00
Sam
36287b7469 Animation for crippling strike 2022-10-27 20:06:44 -04:00
Sam
43b2e6bb70 Crippling gouge animation 2022-10-27 20:06:44 -04:00
Sam
4bbd7da929 Crippling finisher animation 2022-10-27 20:06:43 -04:00
Sam
919e515098 Animation for crippling combo 2022-10-27 20:06:43 -04:00
Sam
2bfc222793 Offensive finisher animation 2022-10-27 20:06:42 -04:00
Sam
894710d8c6 Offensive advance animation 2022-10-27 20:06:42 -04:00
Sam
1e959706a5 Animation for offensive combo 2022-10-27 20:06:41 -04:00
Sam
a64895d8c5 Animations for balanced abilities 2022-10-27 20:06:41 -04:00
Sam
da21e1cb02 Removed air slash stance and abilities 2022-10-27 20:06:40 -04:00
Sam
67fa03dc23 Fixed unintentional recovery from preceding strikes 2022-10-27 20:06:40 -04:00
jshipsey
1ae230c194 anim testing 2022-10-27 20:06:39 -04:00
Sam
4f2b1d37f8 Fixed consecutive strikes carrying animation over 2022-10-27 20:06:39 -04:00
Sam
c4987c3c48 Animations should use the state from the previous strike 2022-10-27 20:06:38 -04:00
jshipsey
0c054837f9 animation setup 2022-10-27 20:06:38 -04:00
Sam
ea287136cf Hot anim fix 2022-10-27 20:06:37 -04:00
Sam
2116842d30 Bin program to generate dot files for skill trees 2022-10-27 20:06:37 -04:00
IsseW
20dea211d1 Riposte anim 2022-10-27 20:06:36 -04:00
Sam
2fcd876e3f Air slash abilities 2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6 Parrying abilities 2022-10-27 20:06:34 -04:00
Sam
ec03bd7032 Cleaving abilities 2022-10-27 20:06:33 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc Balanced abilities and insert ability id into animations. 2022-10-27 20:06:30 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Joshua Barretto
5634d63759 Fixed window scale reset bug 2022-10-27 13:31:32 +01:00
DaforLynx
926c1bc533 Halloween soundtrack with automatic functionality 2022-10-27 06:56:39 +00:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Joshua Barretto
f29b1da583 Implemented FxUpscale 2022-10-27 01:15:20 +01:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master'
Halloween event

See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
9b692d072f Added checkbox in the settings for poisebar
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
2022-10-24 22:05:11 +05:30
kitswas
b35225a13d Used constant POISEBAR_TICK_COLOR
Should have done it earlier.
2022-10-24 22:05:11 +05:30
kitswas
e472632426 Rebased and implemented a TODO
Converted individual poise bar tick values to a list.

Co-authored-by: Samuel Keiffer <samuelkeiffer@gmail.com>
2022-10-24 22:05:11 +05:30
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
6ff5f540bf Colour changes by poise state 2022-10-24 22:05:11 +05:30
kitswas
6b2a41ade7 Ticks at every threshold 2022-10-24 22:05:11 +05:30
kitswas
78ce257d87 Removed numbers from the poisebar 2022-10-24 22:05:11 +05:30
kitswas
4a8536672c Removed unused import 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
202ac7ced8 Changed the poisebar's position 2022-10-24 22:05:11 +05:30
kitswas
65e6db9ef8 Separated the poise images
The energy images were duplicated.
2022-10-24 22:05:11 +05:30
kitswas
0f3d6b3e3e Poisebar for the player 2022-10-24 22:05:11 +05:30
Joshua Barretto
428816c65e Addressed review comments 2022-10-23 23:54:55 +01:00
Joshua Barretto
40e47b4f3e Added reflection mode settings 2022-10-23 20:03:21 +01:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
Joshua Barretto
b85fd11443 Added refraction 2022-10-23 15:15:25 +01:00
Joshua Barretto
c072dc4082 Place puddle details behind extra experimental shader 2022-10-23 01:42:01 +01:00
Joshua Barretto
5c4090f099 Updated README 2022-10-23 01:42:01 +01:00
Joshua Barretto
0a5e257b77 Remove close-up camera jitter 2022-10-23 01:42:01 +01:00
Joshua Barretto
0561a168de Added tracing to SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
daef86d813 Make screen-space reflections an experimental shader 2022-10-23 01:42:00 +01:00
Joshua Barretto
f00cc5f2de The worst SSR 2022-10-23 01:42:00 +01:00
Joshua Barretto
db4cc21ec3 Fixed seams 2022-10-23 01:42:00 +01:00
Joshua Barretto
3f2efea4f2 Experimental river velocity in shaders 2022-10-23 01:42:00 +01:00
flo
050150e7e8 floppy_instruments_foot_animation_fix 2022-10-22 22:47:25 +00:00
flo
698a00bae3 savannah_pit 2022-10-22 19:48:50 +00:00
4ydx
4ae332b8d1 Fix int overflows causing crash when using /goto 2022-10-13 13:58:02 +00:00
Marcel
3d8cd6fb04 Merge branch 'juliancoffee/fix-i18n' into 'master'
Follow-up from i18n-helpers MR

See merge request veloren/veloren!3643
2022-10-01 16:01:23 +00:00
juliancoffee
9dc07a38db Follow-up from i18n-helpers MR 2022-10-01 18:35:36 +03:00
Avi Weinstock
c62bc0dd0d Allow pets to be traded with. 2022-09-30 14:51:49 -04:00
Marcel Märtens
0fe0192a2d get rid of string replacements in template strings 2022-09-29 17:33:53 +02:00
Marcel Märtens
81cdcfc1a0 move voxygen/i18n to client/i18n to indicate that it can be used by more frontends if they want to make use of our helpers 2022-09-27 14:09:20 +02:00
Marcel Märtens
7f46bc5b78 switch name to i18n-helpers 2022-09-27 13:46:13 +02:00
Marcel Märtens
ba260e8419 translate MOD and YOU messages 2022-09-27 13:46:12 +02:00
Marcel Märtens
cc3fcfce8c initial approach of utelising chat-i18n crate by chat-cli bot 2022-09-27 13:46:12 +02:00
Marcel Märtens
a0ef3be9ac remove hardcoded localisation from client 2022-09-27 13:46:12 +02:00
Marcel
17c940e0f8 Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `2022-09-23`

See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f remove enum_iterator with strum, fixes #1723 2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d update dependencies 2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1 Parallelize ingame messages. 2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Marcel
f590e68f7e Merge branch 'mckol/mute-keybinds' into 'master'
Mute audio keybinds (and respective buttons in settings)

See merge request veloren/veloren!3361
2022-09-21 09:22:45 +00:00
Samuel Keiffer
188db01a7b Merge branch 'sam/hot-agent' into 'master'
Agent combat tactics hot reloading

See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Koboo
bb0382e76c Koboo/update de de 2022-09-18 18:58:34 +00:00
LunarEclipse
2d092635ed Moved some code around to put it in logical order 2022-09-17 12:48:38 +02:00
Sam
3d6c9a780d Removed redundant package parameter from init function of hot reloading 2022-09-17 00:55:28 -04:00
Sam
cfeb197f85 Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead. 2022-09-17 00:50:59 -04:00
Sam
23c51af437 Consolidated voxygen and server dynlibs into a common dynlib 2022-09-16 23:43:26 -04:00
LunarEclipse
22c99af9d1 Now when master volume is muted other volume icons are grayed out. 2022-09-16 21:30:31 +02:00
Ben Wallis
7aa1feea22 Merge branch 'xvar/better-voxygen-panic-messages' into 'master'
Reworked panic dialog to support displaying the likely cause of common panics

See merge request veloren/veloren!3589
2022-09-16 09:59:02 +00:00
Joshua Yanovski
e9a463d459 Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
f481e8cd4f Unrevert fix to shaderc. 2022-09-15 17:24:47 +01:00
Joshua Yanovski
cafdcad8ce Merge branch 'sharp/improve-msg' into 'master'
Improve some server system performance

See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56 Reduce overhead of messaging systems. 2022-09-14 21:04:53 -07:00
Marcel
725fd09ed7 Merge branch 'yusdacra/nix' into 'master'
!2951 with fixed runtime panic

See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
Ben Wallis
f1a2031f22 Reworked panic dialog to support displaying the likely cause of common panics 2022-09-12 21:03:30 +01:00
Joshua Yanovski
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
Marcel Märtens
6c9deee491 revert wgpu/shaderc changes 2022-09-11 16:38:08 +02:00
Marcel Märtens
a32b269252 steal sharps clippy improvements to the old nightly 2022-09-11 16:10:56 +02:00
Samuel Keiffer
513b135d58 Merge branch 'floppy_instrument_sample_edits' into 'master'
add guitar & instrument sample edits

See merge request veloren/veloren!3574
2022-09-10 17:23:38 +00:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Barretto
b3b2f404e5 Fixed FXAA at non-1.0x scales 2022-09-10 13:33:38 +01:00
Joshua Barretto
80fa0baf09 Added HQX anti-aliasing 2022-09-10 10:56:22 +01:00
Joshua Barretto
03e8eb42ad Added experimental BetterAA shader 2022-09-09 11:59:40 +01:00
LunarEclipse
796a5f2f90 Added the possibility to toggle muting of any volume category via a keybind 2022-09-09 11:39:27 +02:00
Joshua Yanovski
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688 update dependencies 2022-09-08 23:29:08 +02:00
Joshua Yanovski
5bb27d9292 Fix swallowed network error messages. 2022-09-08 04:00:46 -07:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
This reverts commit f170da4da6, reversing
changes made to aa7569061b.
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b Merge branch 'juliancoffee/more-buffs' into 'master'
Add Golden Cheese debug potion

See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Joshua Yanovski
c95c08ee54 Merge branch 'sharp/fix-full-server' into 'master'
Allow mods/admins to log in when server is full.

See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
Joshua Yanovski
f5aee1d2a7 Allow mods/admins to log in when server is full.
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).

Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen.  This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
Imbris
441acd3e48 Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): refactor and update nix flake

See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00:00
juliancoffee
34c5e95d8a Add Energy regen buff
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master'
Creature model updates

See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
Imbris
9dbff4c342 [voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing) 2022-09-03 20:24:50 -04:00
Imbris
1888863915 Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu. 2022-09-03 17:26:07 -04:00
LunarEclipse
be9e0497d1 Fixed the ambience volume ui element positions 2022-09-03 21:56:25 +02:00
LunarEclipse
24c50fab3b Updated the code to use the new hover icons 2022-09-03 21:56:25 +02:00
LunarEclipse
36167f2e3a Renamed some files, added missing img_ids. 2022-09-03 21:56:25 +02:00
Mckol
e9ba3ffa4a Added the possibility to not assign a default keybind to a GameInput 2022-09-03 21:56:00 +02:00
Mckol
e4b213cac5 Added a keybind for muting the music [F8] 2022-09-03 20:33:08 +02:00
Mckol
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation 2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen 2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
juliancoffee
b892e00699 Fix hud-skill-sc_wardaura_duration key 2022-08-30 00:49:40 +03:00
Marcel
60f05f45a7 Merge branch 'juliancoffee/better-i18n-keys' into 'master'
Remake price-tips internationalization

See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Samuel Keiffer
52ce12f383 Merge branch 'floppy-music-instruments' into 'master'
Music Instruments

See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
Joshua Yanovski
6032dbd22a Merge branch 'seachapel_fixes' into 'master'
seachapel_fixes

See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
flo666
eae1c5ff69 set difficulty indicator to 4 2022-08-27 08:11:35 +02:00
juliancoffee
76cd36b179 Remake price-tips internationalization 2022-08-26 17:56:32 +03:00
Imbris
e626519ec0 Replace "Present Mode" options with more user friendly terms:
'Fifo'       ->  'Vsync capped'
'Mailbox'    ->  'Vsync uncapped'
'Immediate'  ->  'Vsync off'
2022-08-25 23:24:43 -04:00
Imbris
37caab539c Replace uses of "65" with client::MAX_SELECTABLE_VD in client and
voxygen crates.
2022-08-25 23:24:43 -04:00
Imbris
334937568e Add an entity view distance setting that allows limiting the distance
entities are synced from and displayed in.

NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.

Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
  terrain and entity view distances (the entity view distance will be
  clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
  type.
* When requesting the character or spectate state the client now passes
  its desired view distances. This is exposed as a new parameter on
  `Client::request_character`/`Client::request_spectate`. And the client
  no longer needs to send a view distance request after entering these
  states. This also allows us to avoid needing to initialize `Presence`
  with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
  change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
  Show the clamped value as well as the selected value next to the
  slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
  the distance at which different LOD levels apply to figures) to
  "Entities Detail Distance" so we can use the former name for this new
  slider.
2022-08-25 23:24:43 -04:00
Imbris
895d6a2d8b Impove UX of server limits on the view distance
* When client gets its view distance set by the server it stores that as
  the max view distance allowed by the server.
* This is used to avoid skip sending requests if `set_view_distance` is
  called with larger values.
* This is then also displayed in the UI via greying out the slider when
  it goes past the limit and drawing another slide at the limit.
* The server clamping the client's view distance no longer leads to
  edits in voxygen's view distance settings (the view distance setting
  is instead preserved).
2022-08-25 23:24:43 -04:00
flo666
b1176aa9d3 set difficulty indicator to 3 2022-08-25 16:32:31 +02:00
Ben Wallis
a00a92def1 Merge branch 'juliancoffee/fix-i18n-keys' into 'master'
Fix i18n keys

See merge request veloren/veloren!3567
2022-08-25 14:15:21 +00:00
juliancoffee
49e8cec5eb Fix i18n keys 2022-08-25 16:30:26 +03:00
juliancoffee
ae399b3c7c Remove cfg(feature = stat) for localization test 2022-08-25 14:23:27 +03:00
juliancoffee
f2eb1fe7c8 Make i18n csv own binary
* Put file that needs care back into csv
2022-08-25 14:23:26 +03:00
juliancoffee
9a0ac8dcce Make test_all_localizations run at unittest 2022-08-25 13:18:06 +03:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Imbris
2f24da7339 Merge branch 'parzivale/issue-#1652-Remove-i18n-keys' into 'master'
Parzivale/issue #1652 remove i18n keys

Closes #1652

See merge request veloren/veloren!3560
2022-08-24 19:17:09 +00:00
parzivale
1fb981a09a updated header_i18n_key 2022-08-24 17:19:23 +02:00
parzivale
e456137b4c updated icon_button_tooltip to new format 2022-08-24 16:52:08 +02:00
parzivale
feca285665 ammended code quality issues from last commit 2022-08-24 16:29:42 +02:00
parzivale
06f5aa70f0 removed unecesarry .replace in dairy.rs 2022-08-24 16:16:30 +02:00
parzivale
0ca2e64772 formtaed code with cargo fmt 2022-08-23 19:18:18 +02:00
parzivale
e7f472059d tidied up code 2022-08-23 14:23:31 +02:00
parzivale
a3388bdd2e final cleanup for issue #1652 2022-08-23 13:35:16 +02:00
parzivale
cf09348306 second cleaning pass after removing i18n.get 2022-08-23 13:14:29 +02:00
parzivale
4a71698048 removed i18n.get 2022-08-23 11:19:39 +02:00
parzivale
9e22ae01a0 finished first pass removing i18n.get 2022-08-23 11:17:21 +02:00
parzivale
16a3794686 in the process of cleaning up i18n.gte calls 2022-08-23 10:04:21 +02:00
Imbris
5e8adb3c80 Make the present mode default to Fifo instead of Immediate since it uses
less power and in my own experience is generally a better experience when
the GPU is under significant load.
2022-08-23 02:17:39 -04:00
DaforLynx
656727ecbd Miscellaneous audio fixes 2022-08-21 05:32:02 +00:00
Marcel
e4c9634b76 Merge branch 'juliancoffee/workaround-isolation-marks' into 'master'
Don't produce isolation marks in fluent

See merge request veloren/veloren!3553
2022-08-20 13:16:25 +00:00
Marcel
cafef52b01 Merge branch 'socksonme/fix_coverage_shell_script' into 'master'
Fix coverage shell script

See merge request veloren/veloren!3552
2022-08-20 13:14:32 +00:00
juliancoffee
64c909cba0 Don't produce isolation marks in fluent 2022-08-20 13:36:16 +03:00
Socksonme
0e5b472d1d Fix sed regex 2022-08-19 19:45:22 +03:00
juliancoffee
e15c375cb5 Use fluent attributes for abilities
* Better translation logic and ergonomics
* Cut two format!-s
2022-08-19 18:35:44 +03:00
Imbris
ca928a9fec Merge branch 'juliancoffee/fix-convert-to-unicode' into 'master'
Resurrect convert_utf8_to_ascii

See merge request veloren/veloren!3548
2022-08-18 23:23:34 +00:00
juliancoffee
f104085a85 Adress review
1) Add NOTE about brute-force deunicode
2) Fix ut8 -> utf8 typo in comment
2022-08-19 01:46:41 +03:00
juliancoffee
d26422dc29 Resurrect convert_utf8_to_ascii 2022-08-19 00:09:39 +03:00
Marcel Märtens
fdaaa24338 fix coverage 2022-08-18 09:00:16 +02:00
Marcel
c6bcdd7a2c Merge branch 'juliancoffee/i18n-tooling-fluent' into 'master'
Implement i18n-tooling

See merge request veloren/veloren!3536
2022-08-17 20:39:00 +00:00
juliancoffee
847ee1c1b1 Implement i18n-tooling
* Working csv export
* Working i18n-check
2022-08-17 22:46:48 +03:00
Joshua Barretto
dfe2e1c085 Merge branch 'AldanTanneo/discord-presence' into 'master'
Discord Activity

See merge request veloren/veloren!3529
2022-08-15 15:58:38 +00:00
AldanTanneo
ba87a405af Discord Activity 2022-08-15 15:58:37 +00:00
IsseW
911be0113d camera movement changes 2022-08-14 22:41:08 +02:00
IsseW
f77cce68d5 fix viewpoint meshing 2022-08-14 22:41:08 +02:00
IsseW
9b7a67c80e fix viewpoint rotation 2022-08-14 22:41:07 +02:00
IsseW
689376ec70 save spectate position 2022-08-14 22:41:07 +02:00
DaforLynx
daadf3abdb Gnarling Fort music; more specific sites; fix music spacing; new sfx 2022-08-14 01:57:58 +00:00
IsseW
50274fbc0c add newline to flashing lights option 2022-08-12 20:30:32 +02:00
Samuel Keiffer
a1b5f53d15 Merge branch 'craft-all' into 'master'
Craft all

See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +00:00
Isse
e81dade43f Fix compilation with worldgen turned off. 2022-08-11 20:27:25 +00:00
Joshua Barretto
52bd7b2485 Added automod 2022-08-11 11:09:52 +01:00
Imbris
2d2d6b5c64 Merge branch 'DaforLynx/music-gap-fix' into 'master'
Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing

See merge request veloren/veloren!3528
2022-08-11 02:56:40 +00:00
DaforLynx
258feee634 Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing 2022-08-11 02:56:40 +00:00
Julio Cezar Silva
177fbcb0bc Login screen's first detected tab triggers username focus 2022-08-11 00:12:42 +00:00
Marcel
c2847bbbf2 Merge branch 'juliancoffee/boost-skills-ui' into 'master'
Force no digits after dot printing for boosts

See merge request veloren/veloren!3523
2022-08-09 22:29:20 +00:00
juliancoffee
02c78c28f4 Force no digits after dot printing for boosts 2022-08-10 01:06:17 +03:00
IsseW
a165bc09bc character viewpoint 2022-08-09 18:45:45 +02:00
IsseW
bf44ebd12b spectate speedup key 2022-08-09 18:44:10 +02:00
Isse
0471e78f41 spectate mode :D 2022-08-09 18:43:13 +02:00
juliancoffee
56dc490903 Fix tutorial key i18n 2022-08-09 18:31:46 +03:00
juliancoffee
fe1ea00246 Fix died_of_buff typo bug 2022-08-09 14:40:26 +03:00
Imbris
d5b59c2bb7 Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage 2022-08-08 00:38:20 -04:00
Samuel Keiffer
1066553f21 Merge branch 'juliancoffee/fluent-i18n' into 'master'
Use Fluent for localisation (l10n) and internationalisation (i18n)

See merge request veloren/veloren!3508
2022-08-07 18:21:31 +00:00
juliancoffee
38d3bdeeee Pre-merge activity
* Add CHANGELOG
* Remove script to convert .ron files to .ftl files
2022-08-07 20:42:33 +03:00
Tavo Annus
8a132d0726 Add zoom cap to admin to keep zoom in a sensible range
By clamping zoom, panic due to float overflow is avoided

Regular player zoom cap is also reduced to a more sensible range
2022-08-07 20:04:07 +03:00
juliancoffee
eed5aef1d0 fix wording 2022-08-07 18:09:30 +03:00
juliancoffee
67df7a1e74 fmt 2022-08-07 16:45:18 +03:00
juliancoffee
445b748e1a Improve ability i18n algorithm 2022-08-07 16:21:58 +03:00
juliancoffee
c10f722e25 Improve loading-tips args 2022-08-07 16:21:58 +03:00
juliancoffee
05caa2d3a8 Fix rebase error 2022-08-07 16:21:58 +03:00
juliancoffee
e22babc51b Improve error diagnostic in LocalizationHandle 2022-08-07 16:21:58 +03:00
juliancoffee
f2df1adf27 Improve documentation 2022-08-07 16:21:58 +03:00
juliancoffee
c38d94e504 Refactor try_variaton and error handling in i18n 2022-08-07 16:21:53 +03:00
juliancoffee
b5436872ed Adress review, remove redundant .into_owned 2022-08-07 13:54:58 +03:00
juliancoffee
94dbd4cb25 Respond to review, make char_slider take String 2022-08-07 13:38:36 +03:00
DaforLynx
9a8c288580 Lower volume of river sfx 2022-08-06 21:29:38 +00:00
juliancoffee
d000cc90a1 Migrate code to new i18n API 2022-08-06 21:56:01 +03:00
juliancoffee
8ba50e62d5 New i18n implementation based on Fluent 2022-08-06 21:45:23 +03:00
DaforLynx
bf4a582cf7 WIP: New music, "now playing" line in debug overlay, and music frequency slider 2022-08-01 17:41:44 +00:00
Isse
cfdc2a8ae6 Add setting to disable flashing lights 2022-07-31 21:53:25 +00:00
Sam
ea0192b7e3 Tweaked tooltips so that item name and kind are next to image, to reduce amount of empty space. 2022-07-30 11:38:28 -04:00
Sam
29dd9eac9b Remvoed CR from UI. Changed all stats in tools and armor to be same size. Cleaned up item stats UI code. 2022-07-28 19:19:20 -04:00
Marcel Märtens
bfcc2cb802 Change the version number to 0.13 2022-07-23 14:06:08 +02:00
John Heath
edc10519c6 fix for #1604 : use correct values in calculation 2022-07-21 18:34:06 +01:00
DaforLynx
d2710635d8 Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout 2022-07-21 08:27:35 +00:00
Avi Weinstock
7f6ba8e492 Closing a subwindow (such as inventory or the list of online players) only regrabs the cursor if no other subwindow requires it.
Fixes #1116.
2022-07-17 14:58:02 -04:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master'
Tygyh/clean up

See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Joshua Barretto
79ad06ab60 Early light filter 2022-07-16 15:54:12 +01:00
Joshua Barretto
cda6c031b8 Limit number of minor lights applied to entities to solve performance problems 2022-07-16 15:39:06 +01:00
Treeco
7efddc33f7 Merge branch 'more_humanoid_models' into 'master'
Humanoid Model Overhaul

See merge request veloren/veloren!3478
2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Joshua Barretto
ea39f78dfd Minimised rain occlusion problems 2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
tygyh
9f6df715e7 Readd needed qualifiers 2022-07-15 19:36:36 +02:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
tygyh
abdd5e3906 Lift return out of if-statements 2022-07-15 16:36:11 +02:00
tygyh
25e20b5fa0 Remove unecesssary lifetimes 2022-07-15 16:20:15 +02:00
tygyh
fb7bdd8bf8 Fix deprecated imports 2022-07-15 16:17:19 +02:00
tygyh
fefe745508 Reorder impl member order to match trait member order 2022-07-15 15:54:32 +02:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
59655451c9 Made particle spawning use interpolated position 2022-07-15 08:42:56 +01:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master'
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
2022-07-14 18:24:21 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Isse
1e3b5383cf Merge branch 'zesterer/better-rain' into 'master'
Better rain

See merge request veloren/veloren!3464
2022-07-13 23:25:33 +00:00
Joshua Barretto
f48665366b More lightning position variety 2022-07-13 21:45:37 +01:00
Christof Petig
5bbb73bc17 changelog + remove dead code, but the test still fails 2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403 use ItemDefintionId across trade_pricing 2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79 WIP modular weapon pricing. 2022-07-13 20:15:27 +02:00
Joshua Barretto
25c55b6a25 Better rain performance, wetness 2022-07-13 18:34:34 +01:00
Marcel
80d491f003 Merge branch 'socksonme/small_fixes' into 'master'
Small fixes

See merge request veloren/veloren!3465
2022-07-12 21:01:47 +00:00
Socksonme
3f0f1c423c Small fixes 2022-07-12 21:01:47 +00:00
Awkor
6233db8682 Bump shaderc version to 0.8.0 2022-07-10 21:46:30 +02:00
Joshua Barretto
d4906f55bc Fixed rain occlusion issues 2022-07-10 16:40:49 +01:00
Ben Wallis
af04843a20 Re-enabled mimalloc for non msvc builds 2022-07-10 14:50:35 +01:00
Joshua Barretto
6fea7205fa Better lightning at distance 2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
6d1b46956d Better storms 2022-07-09 00:14:59 +01:00
Joshua Barretto
6796fe2745 Better lightning attenuation 2022-07-08 23:45:08 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
DaforLynx
0d1bf3efe6 fmt 2022-07-07 16:10:51 -07:00
DaforLynx
fc80a6278c Fixing looping issues 2022-07-07 16:09:13 -07:00
DaforLynx
00f1e9c407 Music, reorganization, metadata, and fixes 2022-07-07 04:14:20 +00:00
Marcel
7ae65f2c13 Merge branch 'windows-gnu-linking-fix' into 'master'
Disable mimalloc for non msvc builds

See merge request veloren/veloren!3460
2022-07-06 20:21:25 +00:00
Isse
7e18384e1c Disable mimalloc for non msvc builds 2022-07-06 19:08:19 +02:00
Marcel Märtens
e4909650e1 update hashbrown, specs, and tracy 2022-07-06 15:41:59 +02:00
IsseW
5a0cdc2528 add rain threshold that depends on chunk moisture 2022-07-04 18:18:43 +02:00
IsseW
6d8cbe6f0f remove relative rain direction and increase FALL_RATE 2022-07-04 18:18:43 +02:00
IsseW
6562c7076f remove fluid model todo 2022-07-04 18:18:42 +02:00
Imbris
b2d3759105 Cleanup profiling comments and commented code 2022-07-04 18:18:39 +02:00
Imbris
5866e23e32 Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader 2022-07-04 18:18:38 +02:00
IsseW
80e29e2c20 put rain_density in uniform 2022-07-04 18:18:37 +02:00
IsseW
5b7b13adce Add medium check to rain 2022-07-04 18:18:36 +02:00
IsseW
ab707b6df1 sample weather at correct position for occlusion 2022-07-04 18:18:36 +02:00
IsseW
a7c724a46d Limit figures drawn for rain occlusion 2022-07-04 18:18:35 +02:00
DaforLynx
ac82689f83 Clean up audio code, fix egui bug 2022-07-04 18:18:34 +02:00
IsseW
9f26afb4a5 refactor rain_dir to rain_vel 2022-07-04 18:11:45 +02:00
DaforLynx
9104a07530 Code cleanup, doubled volume of leaves.ogg 2022-07-04 18:11:43 +02:00
Treeco
0d21361e05 Add player-relative rain direction 2022-07-04 18:11:42 +02:00
IsseW
fa589e915e make rain view distance smaller, dont put wind in texture 2022-07-04 18:11:41 +02:00
DaforLynx
dc8424c549 Moving audio code 2022-07-04 18:10:05 +02:00
IsseW
6215ccd522 Remove dead code 2022-07-04 18:07:24 +02:00
DaforLynx
05e7de5629 Adjust some values for ambience volume 2022-07-04 18:07:23 +02:00
IsseW
b82bb5b247 Don't have rain be behind an expiremental shader 2022-07-04 18:07:22 +02:00
IsseW
6274d54e56 fix todos 2022-07-04 18:07:21 +02:00
IsseW
a93240d2a6 cleaner get_ambient_channel 2022-07-04 18:07:20 +02:00
IsseW
3eabe24f12 base occlusion texture size of off voxels 2022-07-04 18:07:19 +02:00
DaforLynx
a6fd5d5c8b Some organization. Faster volume lerping. 2022-07-04 18:07:19 +02:00
IsseW
08b0989789 add slider for rain map resolution 2022-07-04 18:07:18 +02:00
DaforLynx
6059a30f27 Rain diminishes with distance above terrain 2022-07-04 18:07:16 +02:00
IsseW
54f958acc7 more correct occlusion 2022-07-04 18:07:16 +02:00
DaforLynx
83ee54001e Ambience slider; fix to utterances 2022-07-04 18:07:15 +02:00
DaforLynx
365f45397b At this point all sfx should be able to detect underwater 2022-07-04 18:07:14 +02:00
DaforLynx
088d1cfe9d Remove debug lines, re-mix some sfx, add crafting sfx, separate inv event sfx into spatial and nonspatial 2022-07-04 18:07:13 +02:00
IsseW
234ed5afb2 Rain occlusion projection matrix 2022-07-04 18:07:13 +02:00
IsseW
79cac935c8 Added rain occlusion 2022-07-04 18:07:11 +02:00
DaforLynx
b3200ed89f More ambience :) 2022-07-04 18:07:10 +02:00
DaforLynx
c4239e074f Prevent unnecessary running of code 2022-07-04 18:07:09 +02:00
DaforLynx
aafd13508d Completely redoing ambient sound again. 2022-07-04 18:07:08 +02:00
DaforLynx
16ca1410be Remove extraneous sfx code 2022-07-04 18:07:08 +02:00
DaforLynx
ca815f25a1 merging some UI sfx from a now-dead branch
Merge part 2

merge part 3

Merge part 4

merge part 5
2022-07-04 18:07:07 +02:00
IsseW
b578f0231f Interpolate in client 2022-07-04 18:07:06 +02:00
IsseW
4fa2644507 Interpolate weather in voxygen 2022-07-04 18:07:04 +02:00
IsseW
e37f2be820 Put rainbows behind experimental 2022-07-04 18:07:03 +02:00
Benjam Soule H. Walker
99c76be297 added sound for rain 2022-07-04 18:07:02 +02:00
IsseW
273c5ed2f0 Temporary noise solution 2022-07-04 18:07:00 +02:00
IsseW
67683f315f Put rain behind expiremental shader 2022-07-04 18:06:59 +02:00
IsseW
9c84a20cef better sim 2022-07-04 18:06:58 +02:00
IsseW
78c1de19cf More accurate weather sim 2022-07-04 18:04:39 +02:00
IsseW
6585ef1513 weather dependant music 2022-07-04 18:11:43 +02:00
IsseW
b7c0196129 Server weather sim 2022-07-04 18:11:41 +02:00
Isse
16c5c657cc Fix mimalloc for hot reloading 2022-07-04 10:08:27 +00:00
IsseW
57d6b4a55f Switch to mimalloc on windows 2022-07-04 09:15:18 +02:00
Imbris
54f6f278a0 Include an associated Config type in the atlas trait which is provided when creating the atlas 2022-07-01 23:47:42 -04:00
Imbris
95f17a6d22 General cleanup, remove local dependency, switch to u16 from i32 in several places, avoid guillotiere types in atlas API (one spot still remains) 2022-07-01 23:47:42 -04:00
Imbris
16461cfcba Cleanup atlas allocator work, remaining TODO:
* refactor meshing and trait API to replace guillotiere types
* associated config type on atlas trait
* investigate other areas of sprite performance like LOD scaling (i.e.
  there are now significant gaps in between meshing)
2022-07-01 23:47:41 -04:00
Imbris
5e5f7885e5 Tiled guillotiere allocator for sprites working 2022-07-01 23:47:41 -04:00
Imbris
b1f5fc01db Before removing variable size edge tiles 2022-07-01 23:47:41 -04:00