Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,927 Commits 151 Branches 18 Tags 2.1 GiB
880e9044d5
Commit Graph

5419 Commits

Author SHA1 Message Date
Imbris
95a38ff8f6 Merge branch 'imbris/revert-some' into 'master' 
Revert some of the updates to make windows cross compile directx work

See merge request veloren/veloren!3918
 2023-05-06 05:12:20 +00:00
Imbris
af0d0f3ea4 Second attempt (success) 2023-05-06 00:30:54 -04:00
Marcel Märtens
cd7d889c13 get rid of oldtime in chrono 2023-05-05 18:25:49 +02:00
Marcel
223ae7ee98 Merge branch 'xMAC94x/update_deps' into 'master' 
update further dependencies

See merge request veloren/veloren!3913
 2023-05-05 08:42:43 +00:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Joshua Barretto
ee971e4056 Added item merging 2023-05-04 22:12:25 +01:00
Joshua Barretto
a5b1e41d8b Make NPC interaction go via rtsim 2023-05-04 11:23:46 +01:00
Marcel Märtens
054f4f9453 update veloren deps 2023-05-04 11:58:43 +02:00
Isse
44bf8f19f1 combine into one filter_map 2023-05-03 16:29:56 +02:00
Isse
922ba9ed5c add note about using threshold for subtitle duration 2023-05-03 16:15:28 +02:00
Isse
77b7d1a49e localize after distance filter 2023-05-03 16:10:14 +02:00
Isse
54a7367cb2 Maintain all subtitles, limit calls to state.update 2023-05-03 13:07:36 +02:00
Isse
f60c44d812 nicer ui 2023-05-03 13:07:36 +02:00
Isse
99463a37f8 subtitles 2023-05-03 13:07:35 +02:00
Isse
1c9b502f69 move flashing lights to accessability settings tab 2023-05-03 13:07:35 +02:00
Isse
ab4076518f Add multiloot 2023-04-23 19:17:39 +00:00
ubruntu
b53bfd4246 Hide display name of mount while mounted (at full hp) 2023-04-22 18:13:13 +00:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Sam
7fdfc0e71b Addressed review 2023-04-19 18:34:17 -04:00
Sam
c1a64e1d69 Recently unequipped items are now tracked and durability loss on death is applied to them 2023-04-19 18:34:16 -04:00
Imbris
f525be9b3b Update tracy-client to 0.15.2, also use tracy_client through the 
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
 2023-04-18 21:28:15 -04:00
Christof Petig
4c1c84030f introduce optional model indices for drop items as well (fixing orichalcum armor drops) 2023-04-16 22:56:04 +02:00
RunRobDog
a1af50dcdf fixes 2023-04-16 02:47:50 +02:00
RunRobDog
17cd291613 make Spawn Entities tab in admin commands 2023-04-16 01:29:14 +02:00
Sam
9d503d1e1f Debug items no longer have durability 2023-04-14 18:25:24 -04:00
Joshua Barretto
504ea158d2 Merge branch 'zesterer/towns' into 'master' 
Improvements to towns and NPCs

See merge request veloren/veloren!3867
 2023-04-13 21:03:02 +00:00
Joshua Barretto
a835ce7e26 Better starting site choices 2023-04-13 18:32:21 +01:00
Samuel Keiffer
7aa43e9e8a Merge branch 'taoist/better-dullahan' into 'master' 
taoist&floppy/cyclops&dullahan

See merge request veloren/veloren!3859
 2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee taoist&floppy/cyclops&dullahan 2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6 Merge branch 'rtsim2' into 'master' 
Initial implementation of rtsim2

Closes #1476

See merge request veloren/veloren!3517
 2023-04-12 16:17:52 +00:00
Joshua Barretto
16e3227f78 Correct localisation of numeric values, use coordinate conversions in rtsim 2023-04-12 10:36:11 +01:00
Joshua Barretto
3582d86c70 Simplified localisation logic 2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1 Allowed localisation content to be recursive 2023-04-11 23:18:34 +01:00
Joshua Barretto
edcc2f1870 Overhauled chat message representation to allow for more exhaustive localisation 2023-04-11 15:46:36 +01:00
Joshua Barretto
81b52298f0 Addressed review feedback 2023-04-11 10:34:06 +01:00
Imbris
4ea635cc8d Merge branch 'imbris/random-tweaks-35902u8' into 'master' 
Some misc tweaks

See merge request veloren/veloren!3861
 2023-04-11 02:07:35 +00:00
Joshua Barretto
70538dae66 Choose random plaza tile 2023-04-09 19:25:58 +01:00
Joshua Barretto
3e0f5295c0 Added CharacterActivity, made NPCs look at the player when speaking to them 2023-04-09 19:25:57 +01:00
Joshua Barretto
5aaee96cb1 Removed special-casing of merchants 2023-04-09 19:25:56 +01:00
Joshua Barretto
364255c7fe Allowed rtsim NPCs to greet nearby actors 2023-04-09 19:25:55 +01:00
Isse
57efd24573 fix bench 2023-04-09 19:25:55 +01:00
Isse
d53b344c23 make merchants use tell, and general cleanup 2023-04-09 19:25:55 +01:00
Joshua Barretto
b022076a5c Fallback for non-trades 2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702 Cleaning up 2023-04-09 19:25:55 +01:00
Joshua Barretto
acecc62d40 sync 2023-04-09 19:25:53 +01:00
Joshua Barretto
0b4d3c9e20 Fixed scaling of airships 2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a sync 2023-04-09 19:25:53 +01:00
Joshua Barretto
8ff438bb5b Smol animals 2023-04-09 19:25:51 +01:00
Joshua Barretto
c856f2625c Added rtsim sites 2023-04-09 19:25:51 +01:00
Joshua Barretto
f349e99cfb Better camera at smaller scales 2023-04-09 19:25:51 +01:00
Joshua Barretto
87a6143375 Began adding rtsim2 NPCs, scale command 2023-04-09 19:25:51 +01:00
Joshua Barretto
d5e324bded Fixed bad comment 2023-04-09 19:25:51 +01:00
Imbris
54c39c03f7 Merge branch 'imbris/pixel-perfection-v2' into 'master' 
Move image scaling into the UI shaders rather than precomputing it on the CPU

Closes #257

See merge request veloren/veloren!3573
 2023-04-08 07:06:19 +00:00
Imbris
5881e44e61 Address review on 3573 2023-04-08 02:19:14 -04:00
Imbris
2a9a63a60e Clippy fixes 2023-04-08 00:51:50 -04:00
Imbris
132ce72246 Fix some comments that were mis-formatted by rustfmt 
and remove TODO that is now documented as a review comment
 2023-04-08 00:51:50 -04:00
Imbris
9cdfb6a4aa Resolve some remaining TODOs for ui image processing changes 
* Explicitly assert that neither of the requested dimensions for an
  image are 0. (I think this used to fail later on anyway)
* Don't show the UI alpha premultiply pass in GPU timings in the HUD
  debug info display since it only very transiently appears (since this
  doesn't run every frame).
 2023-04-08 00:29:29 -04:00
Imbris
7205d4c275 Remove extra performance debugging code 2023-04-08 00:28:32 -04:00
Imbris
63096b2042 Complete GPU based alpha premultiplication impl and make the CPU version 
even faster.

* GPU based version started in previous commit, but this fixes errors
  and bugs and gets it actually compiling and running.
* Add a way to batch together images to use the same render pass for GPU
  premultiplication if they all target the same texture.
* Pending premultiplication uploads are automatically done when calling
  `Drawer::third_pass`.
* `fast-srgb8` dep removed, we no longer convert to `f32`s to do the
  premultiplication. Two `[u16; 256]` tables are combined to compute the
  alpa premultiplied color within the same error bounds used by the
  `fast-srgb8` crate. We also no longer use explicit simd.
* Remove explicit lifetimes from `PlayState::render` since `&self` and
  `Drawer<'_>` don't need to have the same lifetime.
* Fix existing bug where invalidated cache entries were never set to
  valid when reusing them.
* `prepare_graphic` now runs some heuristics to determine whether
  premultiplication should be executed CPU side or GPU side and then
  returns a bool indicating if GPU premultiplication is needed.
 2023-04-08 00:28:31 -04:00
Imbris
efd932c71e Progress on GPU premultiplication. 
* General progress in setting up code paths to support GPU
  premultiplication.
* Created `PremultiplyUpload` type to represent an initiated image
  upload where the premultiply pass needs to be ran to complete it.
* Converted from compute pass to render pass since current limitations
  make it difficult to write directly to a srgb image from a compute
  shader.
* Replace `CachedDetails::Immutable` with keeping track of the
  parameters used to create the texture (i.e. the border color).
* Create `TextureRequirements`, `TextureParamters`, and `CacheKey` types
  to encode parameters that go into texture creation and image caching
  and to determine when the space in texture memory should be reused
  when replacing a graphic.
* Add custom texture creation logic for the UI textures since those need
  certain usage combinations.
 2023-04-08 00:28:31 -04:00
Imbris
1d51aae3b2 Start attempt to premultiply alpha on the GPU. 2023-04-08 00:28:31 -04:00
Imbris
7538b04348 Operate on 4 pixels at a time when premultiplying alpha to speed things up a little. 2023-04-08 00:28:31 -04:00
Imbris
f62c2cde70 Use fast-srgb8 crate to efficiently convert between non-linear srgb u8 and 
linear f32 values for performing alpha premultiplication on the CPU.
 2023-04-08 00:28:31 -04:00
Imbris
eb6d16b02c Rename draw_graphic -> prepare_graphic since it is no longer always 
specifically rendering an image at the provided dimensions. Start
working on alpha premultipication which is necessary for being able to
properly sample colors on the GPU with bilinear filtering. Various
tweaks to comments and misc changes.
 2023-04-08 00:28:31 -04:00
Imbris
69a1a661b6 fixes and tweaks (various minor changes related to UI image scaling on 
GPU)
 2023-04-08 00:28:31 -04:00
Imbris
d62bf8a790 init (scaling UI images during sampling on the GPU instead of on the CPU) 2023-04-08 00:28:28 -04:00
Imbris
e20cf5f14f Reduce rand::thread_rng calls, document MeleeConstructor scaled field more, remove extra stances.get() in hud/mod.rs 2023-04-07 01:59:41 -04:00
Samuel Keiffer
162509e1c9 Merge branch 'sam/durability' into 'master' 
Durability

See merge request veloren/veloren!3509
 2023-04-06 22:42:52 +00:00
Hudson
e03406b103 fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one 2023-04-06 13:43:11 -05:00
Hudson
4881d2fd8b fixed a bug where if a group member picks up an item, then the player picks up an item, it would display the incorrect number of items picked up. example: group member picks up an apple, then player picks up an apple, the ui would display that the player picked up two apples, instead of the group member picking up one and the player picking up one 2023-04-06 12:40:08 -05:00
Monty Marz
29a7520a48 adjusted death message, fixed repair bench text 2023-04-06 10:57:17 -04:00
Sam
132f26dbc0 Addressed review 2023-04-06 10:57:16 -04:00
Sam
00710a4eb0 Fixed csv tools 2023-04-06 10:57:13 -04:00
Sam
e4ebd17363 Addressed feedback 2023-04-06 10:57:12 -04:00
Sam
ca879173be Added a repair equipped and a repair all button. Cleaned up some hacks that used to exist. 2023-04-06 10:56:55 -04:00
Sam
658de93c59 Repairing UI 2023-04-06 10:56:53 -04:00
Sam
536d88a2c7 Repair costs scale based on how damaged the item is. 2023-04-06 10:54:50 -04:00
Sam
0966753699 Added repair recipes 2023-04-06 10:54:48 -04:00
Sam
c3f5bc13f1 Equipment can now be repaired at sprites in town. 2023-04-06 10:54:48 -04:00
Sam
a555e08d0b Added durability to item tooltips 2023-04-06 10:54:47 -04:00
Sam
df13741be9 Durability system in place 2023-04-06 10:54:46 -04:00
Christof Petig
e60aace448 realize zesterers proposal 2023-04-05 00:11:26 +02:00
Christof Petig
f4a87e9f0b cargo fmt 2023-04-04 23:47:31 +02:00
Christof Petig
8d2b9b9a9c single file orichalcum armor 2023-04-04 23:46:20 +02:00
Christof Petig
5cb974f770 cargo fmt 2023-04-04 23:46:20 +02:00
Christof Petig
76baf491ec support model indices for humanoids 2023-04-04 23:46:20 +02:00
Christof Petig
0b8bc507ac fix clippy 2023-04-04 23:46:20 +02:00
Christof Petig
9b3bf4c3c8 initial support for multiple models in one vox file 2023-04-04 23:46:20 +02:00
Avi Weinstock
908b2a62fa Change item color in details mode. 2023-04-03 15:40:34 -04:00
Avi Weinstock
6899023fde Sort merchant inventories lexicographically by (quality, name, quantity) 
in details mode.
 2023-04-03 14:43:14 -04:00
Avi Weinstock
8facf7b58d Add a list mode to inventories to make it easier to see item names at merchants. 2023-04-03 14:43:14 -04:00
Joshua Barretto
17cdd3e38d Merge branch 'zesterer/choose-starting-site' into 'master' 
Allow new players to choose their starting site

See merge request veloren/veloren!3848
 2023-04-02 00:45:25 +00:00
Joshua Barretto
ab5561df61 Removed redundant things 2023-04-02 01:09:12 +01:00
Monty Marz
33e643fbfd fmt 2023-04-02 01:21:10 +02:00
Monty Marz
d1f6db9da6 different site name col 2023-04-02 00:55:21 +02:00
Sam
6849f9fc21 Fix function name typo 2023-04-01 18:11:16 -04:00
Joshua Barretto
33ebb0a4a3 Make clippy happy 2023-04-01 22:55:45 +01:00
Sam
352d34557e Fix modular crafting window showing an item output when it is not possible to craft two components together. 2023-04-01 17:22:01 -04:00
Sam
2e6d55a78b Use topographic map for town selection screen. 2023-04-01 17:10:44 -04:00
Monty Marz
ca18da8061 UI tweaks 2023-04-01 21:54:48 +02:00
Maxicarlos08
ac377e2bbf
Hide invites comming from muted players 2023-04-01 18:45:19 +02:00
Joshua Barretto
19db823092 Proper next/prev site buttons 2023-04-01 12:34:58 +01:00
Joshua Barretto
0d7ee4479b Limit starter sites to towns 2023-03-31 21:31:01 +01:00
Joshua Barretto
6add1b851d Simplified map drawing 2023-03-31 20:44:59 +01:00
Joshua Barretto
0f7648aadb Better use of space on char create screen 2023-03-31 18:08:12 +01:00
Joshua Barretto
c28e61383d Added target to starting site map 2023-03-31 16:25:24 +01:00
Joshua Barretto
45644da98a Don't display the world map on character edit 2023-03-31 14:36:30 +01:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master' 
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
 2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Samuel Keiffer
a737a1862c Merge branch 'sam/sword-balance-0' into 'master' 
Sword Tweaks

See merge request veloren/veloren!3838
 2023-03-29 01:26:33 +00:00
Sam
c9af470cc7 Final tweaks 2023-03-28 20:55:21 -04:00
flo
aec35a4792 bird_medium_wing_tweaks 2023-03-27 19:13:19 +00:00
Sam
cdaf9e5c0e Ability changes 2023-03-26 21:41:22 -04:00
Sam
5c675fdbe2 Addressed review 2023-03-21 20:18:34 -04:00
Monty Marz
3e37586ba5 icons 2023-03-21 20:18:32 -04:00
Sam
e962690fb8 Tweaks to various stats and earth splitter animation. 2023-03-21 20:18:31 -04:00
Sam
610d47f787 Effect power now affects more than just poise 2023-03-21 20:16:55 -04:00
Sam
1a58b7a8d4 Balance tweaks 2023-03-21 20:13:48 -04:00
Sam
868a42ba39 Addressed UX feedback 2023-03-21 20:10:40 -04:00
Sam
acde417ca7 Abilities that require a particular stance will be greyed out when not in that stance. 2023-03-21 20:08:21 -04:00
Sam
7386257854 Appease CI 2023-03-21 20:07:37 -04:00
Sam
3caa9dc529 Stances can now be left by interacting with the buff bar. 2023-03-21 20:03:22 -04:00
Sam
34168d9c76 Advanced AI for every stance. 2023-03-21 20:03:21 -04:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Sam
7365fcb530 Rolls cancel recover at the cost of additional energy, sitting ends active stances. 2023-03-21 20:03:15 -04:00
Monty Marz
6b5ae2b6fe Update sword_bg.png 
positioning, wording, more icons

positioning, first icons
 2023-03-21 19:59:06 -04:00
Sam
39b30b3458 Decontextualized some sword abilities, added UI for sword skill tree. 2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe Ability icons 2023-03-21 19:59:04 -04:00
Sam
27463758e5 Finisher abilities 2023-03-21 19:59:03 -04:00
Sam
86dfa34ec9 Cleaving stance required abilities 2023-03-21 19:59:00 -04:00
Sam
fed96b2e15 Crippling stance required abilities 2023-03-21 19:58:13 -04:00
Sam
c3026d388a Defensive stance required abilities 2023-03-21 19:58:11 -04:00
Sam
69665b5418 Agility stance required abilities 2023-03-21 19:56:35 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
e73236819a Cross cut 2023-03-21 19:39:42 -04:00
Sam
d64c155115 Cascade 2023-03-21 19:39:41 -04:00
Sam
f8c246e5fc Skewer 2023-03-21 19:39:41 -04:00
Sam
cdaff6bec1 Fell strike 2023-03-21 19:39:40 -04:00
Sam
e0a7449a99 Crescent slash 2023-03-21 19:39:40 -04:00
Sam
fce9211d49 Secondaries for all stances 2023-03-21 19:39:39 -04:00
Sam
596fe715b8 Cleaving stance skill abilities. 2023-03-21 19:39:39 -04:00
Sam
070c6d94a5 Crippling stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
d544010c05 Defensive stance skill abilities. 2023-03-21 19:39:38 -04:00
Sam
c23139d501 Agile stance skill abilities. 2023-03-21 19:39:37 -04:00
Sam
ed0de15a5a Heavy stance skill abilities. 2023-03-21 19:39:35 -04:00
Sam
57806d7be9 Sword M1 abilities 2023-03-21 19:39:22 -04:00
Sam
61f0b424b9 Old sword mostly torn out, new sword framework in place 2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability. 2023-03-21 19:38:18 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
Sam
9875008efa Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement). 2023-03-21 19:29:34 -04:00
flo666
897d1e5fe5 fix_ngoubou_jaw 2023-03-20 22:07:23 +01:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70 Address review on 3817 2023-03-17 20:17:46 -04:00
flo666
472ef6b823 fix_husk_brute_singlestrike 2023-03-15 20:32:22 +01:00
Imbris
ebffe9317c Merge branch 'catb0t/zoom-defaultbind' into 'master' 
Remove default binding for Camera Zoom Lock

See merge request veloren/veloren!3823
 2023-03-13 06:15:49 +00:00
cat stevens (catb0t)
e99d2e7ca3 Remove default binding for Camera Zoom Lock 2023-03-13 06:15:49 +00:00
Ben Wallis
45c8934b79 Merge branch 'xvar/queue-char-deletes' into 'master' 
Changed character deletion to go via batch update

See merge request veloren/veloren!3562
 2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Samuel Keiffer
8febcf6b3d Merge branch 'sam/buffs' into 'master' 
Auras and buffs no longer need to tick every tick

See merge request veloren/veloren!3814
 2023-03-12 22:06:48 +00:00
Sam
42388976d7 Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments. 2023-03-12 16:37:02 -04:00
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +00:00
Imbris
6b8e22d6cc Improvements and fixes for interacting/collecting 
* Inert entities like arrows no longer block interactions like picking
  up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
  as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
  instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
  since we were using this enum for two different things.
 2023-03-11 21:17:27 -05:00
Sam
4c79936c07 Added wrapper type to durations related to buffs and auras. 2023-03-11 16:47:11 -05:00
Sam
663db06844 Made auras no longer need to be mutably accessed every tick. 2023-03-11 16:45:12 -05:00
Sam
89aa934c3c Initial work 2023-03-11 16:45:10 -05:00
Monty Marz
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
Marcel
9396fa9741 Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master' 
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...

See merge request veloren/veloren!3807
 2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52 replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove... 2023-03-06 21:03:35 +00:00
Cat Stevens
83e4cdfe76 Allow locking camera zoom 
Allow the camera's zoom to be locked by a keybind
	or a Gameplay setting. The zoom lock
	behavior can be changed between Toggle
	and Auto, where Auto only locks the camera
	zoom while specific movement/combat inputs
	are being pressed. (closes !1528)

A temporary fading notification is shown at the
	top of the screen, informing the player of
	the setting change (when the keybind is
	used) or that the zoom is locked (when
	the player might have forgotten the zoom
	is locked, and is trying to zoom).

i18n strings are added for English and German,
	but no other languages.

To implement the simplistic fading text, the
	behavior was extracted into an impl
	called `ChangeNotification`, where
	reasons are quantified by `NotificationReason`.
 2023-03-05 11:30:27 -05:00
Monty Marz
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
Joshua Barretto
175ae0da7b Cleaned up implementation, addressed review comments 2023-03-01 12:54:43 +00:00
Joshua Barretto
81ec1f726c Reduced light volume bounds according to underground depth 2023-03-01 12:09:41 +00:00
Joshua Barretto
fc05638490 Fix rain in caves 2023-03-01 12:09:41 +00:00
Joshua Barretto
4699569eae Made directed shadows take advantage of culling 2023-03-01 12:09:41 +00:00
Joshua Barretto
0d0b7a8889 Got rid of the worst of the cull popping 2023-03-01 12:09:41 +00:00
Joshua Barretto
7fa654ae4c Clippy fixes 2023-03-01 12:09:40 +00:00
Joshua Barretto
124c7e1496 Switch to camera position for culling 2023-03-01 12:09:40 +00:00
Joshua Barretto
661b587c9f Added basic culling of underground terrain and sprites 2023-03-01 12:09:40 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
Imbris
b9a6742ee6 Fix cursor not hiding when closing bag while both the bag and crafting window are displayed by delaying the want_grab calculation to after the crafting window is hidden 2023-02-03 00:26:49 -05:00
flo666
9c09000256 - change bristlemane to bristleback 
- axebeak tweaks
 2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
João Capucho
277528355b
Fix depth textures being bound as float textures 
Webgpu defines that a texture depth format can only be sampled as a
depth texture or as an "unfilterable-float", however both the clouds and
postprocess pipeline were declaring in their bind group that the depth
source was a texture with a sample type of float (filterable).

This is forbidden by the webgpu specification and should be caught by
validation, but the version of wgpu we are using doesn't have that check
(older versions have the check), so we can only assume that this is
undefined behavior.

Relevant sources:
- [Bind Group Creation](https://gpuweb.github.io/gpuweb/#bind-group-creation)
includes the rules that explicitly forbid this situation
- [Depth-stencil formats](https://gpuweb.github.io/gpuweb/#depth-formats)
defines which sample types we are allowed to use with depth textures
 2023-01-31 16:46:24 +00:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master' 
wyverns

See merge request veloren/veloren!3720
 2023-01-28 21:25:17 +00:00
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