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
15,794 Commits 151 Branches 18 Tags 2.1 GiB
54e3cef223
Commit Graph

5661 Commits

Author SHA1 Message Date
Treeco
948e7e646f Further LOD object additions 
- Airship dock
- Coastal house
- Coastal workshop
 2024-03-27 20:19:12 +00:00
Kay Hemme
f1e1271c7e Fixes #1865 -Item label gets cut-off when trading with Merchant 2024-03-27 14:55:12 +00:00
Treeco
79bd3182eb Added terracotta LOD 2024-03-27 01:48:24 +00:00
Treeco
9d83b046a6 Added savannah settlement lod 2024-03-27 01:42:11 +00:00
crabman
89af8facbe
fix frozen aura particles 2024-03-25 19:56:08 +00:00
crabman
af4f147fda
FriendlyFire and ForcePvP auras 2024-03-25 19:56:08 +00:00
Treeco
36cab14859 Addressed comments 2024-03-23 17:32:54 +00:00
Treeco
954cede352 Add new LOD trees and objects 2024-03-23 17:32:54 +00:00
Treeco
62a99f2466 Use real colours for LOD trees and rooftops, lay groundwork for further additions 2024-03-23 17:32:54 +00:00
Marcel
fbca6d852b Merge branch 'juliancoffee/remove-general-st' into 'master' 
Remove health, energy and roll skills

See merge request veloren/veloren!4382
 2024-03-20 22:12:47 +00:00
juliancoffee
7e4dcfd95a Re-shape General ST UI 2024-03-20 23:11:33 +02:00
juliancoffee
90454b1287 Remove roll skills 2024-03-20 23:11:31 +02:00
juliancoffee
55ae460d1d Remove health/energy increase skills 2024-03-20 23:08:45 +02:00
juliancoffee
1e6e595a87 Comment-out health/energy skills 2024-03-20 23:08:45 +02:00
Marcel Märtens
1ed2895a49 cargo upgrade all 2024-03-20 09:39:13 +01:00
Isse
5abc8e3a1d fix voxygen disabling plugins on server even if plugins are on 2024-03-14 21:57:50 +01:00
Christof Petig
f0194e6d9b more elaborate error handling 2024-03-14 00:46:18 +01:00
Christof Petig
166653b355 report plugin errors to the user 2024-03-14 00:46:18 +01:00
Christof Petig
8dd4729965 make missing plugins a set 2024-03-14 00:46:18 +01:00
Christof Petig
3e0ca7d6d4 Load missing plugins from the server 
individual commits combined here:
send active plugins
compute plugin sha hash
single position for defining Hash type
request plugins from the server
Server sending the plugin to the client
store received plugin in file and use it
handle plugin data at the right place
pass config_dir to client init
load local plugins
operational plugin caching
simplify the interface
clippy suggestions
remove artifacts
fix compilation of test world
ChangeLog entry
code quality fixes
improve readability
adapt to multiple systems
 2024-03-14 00:46:18 +01:00
Javier Pérez
30d924274c Update English translation 2024-03-06 18:36:07 +00:00
Illia Denysenko
840e95f21c Merge branch 'juliancoffee/glider-ability' into 'master' 
Vroom Glider

See merge request veloren/veloren!4282
 2024-03-06 13:13:49 +00:00
juliancoffee
9b1d074b27 Make all_available_abilities charstate-independent 
+ Fix wrong index bug with Auxiliary abilities
 2024-03-06 03:11:07 +02:00
Illia Denysenko
4e4c35f936 Merge branch 'juliancoffee/broom-tweak-v2' into 'master' 
Made broom even better

See merge request veloren/veloren!4365
 2024-03-06 01:07:25 +00:00
juliancoffee
79c2deb38c Made broom even better 
+ Proper particle positioning
+ Set ori from velocity
 2024-03-06 01:24:57 +02:00
crabman
feecd6ea2b
Dynamic merging of dropped items 2024-03-05 20:59:32 +00:00
juliancoffee
3ad227545a Remove char_state from active_auxiliary_key 2024-03-03 17:56:09 +02:00
juliancoffee
4dcf6215d2 Route character state to Diary UI 2024-03-03 17:56:09 +02:00
juliancoffee
3283eb6916 Vroom Glider 
- GlideBoost ability
- Vroom Glider item
- Made possible to attach ability_spec to gliders
- Activate glider ability while Glide/GlideWield

TODO:
- make it visible in voxygen
 2024-03-03 17:56:09 +02:00
juliancoffee
a2119e3d00 Better Admin Broom look & feel 
+ Own animation
+ Add look_dir orientation
+ Boost particles only stay for 0.25 secs
+ Boost particles use ParticleMode::PortalFizz
 2024-03-03 17:09:55 +02:00
juliancoffee
60d47326bd Implement reliable gliding AI 
- Wield glider when falling, but do nothing else
- Safe auto glide when in gliding state
- Agent unwield glider if on ground
 2024-03-01 21:59:08 +02:00
Syniis
392599e586 Addressed review comments and added persistence 2024-03-01 04:10:38 +01:00
Syniis
c3e533d7f1 Cleaner logic, fixed bug preventing chat from being scrolled 2024-03-01 04:09:59 +01:00
Syniis
4caebcf4a3 Revert some changes and fix scrolling bug 2024-03-01 04:09:59 +01:00
Syniis
debbaea83c Store a backlog of messages sent while the chat is hidden 2024-03-01 04:09:59 +01:00
Syniis
b775399235 Respect scale 2024-03-01 04:09:59 +01:00
Syniis
aa35ed9e93 Ability to open chat while hidden 2024-03-01 04:09:59 +01:00
Syniis
1cb0b6a84e Chat tab message notification and disable chat tab fade-out 2024-03-01 04:09:59 +01:00
Syniis
4d638540e0 Better text wrapping and proper out of bounds checks 2024-03-01 04:09:59 +01:00
Syniis
5b78e4eee4 Don't let chat move offscreen 2024-03-01 04:09:59 +01:00
Syniis
4d1d2e58da Added Draggable area widget 2024-03-01 04:09:59 +01:00
Syniis
dfffb658f4 Allow moving chat window 2024-03-01 04:09:59 +01:00
Syniis
eec1b57a5c Basic resize functionality 2024-03-01 04:09:58 +01:00
crabman
036e79284e
transform character state 2024-02-28 22:03:35 +00:00
Syniis
d9c9a671ed
Added substring search for asset path autocomplete 2024-02-28 16:15:51 +01:00
Syniis
50905aebfe Mushroom spore particles 2024-02-27 19:28:03 +01:00
Syniis
17a88acd1c Various tweaks. New ArtLeaves BlockKind 2024-02-24 23:18:14 +01:00
Syniis
3dbbf80bb2 Various tweaks to sprites and colors. Made giant trees influence roots in caves 2024-02-24 23:09:02 +01:00
flo
ab89750a9a Merge branch 'terracotta_tweaks' into 'master' 
terracotta_small_tweaks

See merge request veloren/veloren!4332
 2024-02-21 21:52:09 +00:00
flo
673425f9f1 terracotta_small_tweaks 2024-02-21 21:52:09 +00:00
Samuel Keiffer
94f6c3350c Merge branch 'danielkenji83/block-based-on-poise' into 'master' 
Block based on poise

See merge request veloren/veloren!4283
 2024-02-21 16:53:24 +00:00
Imbris
b05350946a Merge branch 'imbris/shaderc-opt-default-off' into 'master' 
Make shaderc optimization off by default for now

See merge request veloren/veloren!4335
 2024-02-21 16:44:29 +00:00
Imbris
9ff9a535fd Make shaderc optimization off by default for now since wgpu currently rejects if fragment shader inputs are optimized out such that they don't match fragment shader outputs 2024-02-21 00:18:06 -05:00
uniior
e720ee834e Initial 2024-02-20 16:18:01 +01:00
danielkenji83
961edf910d Updates from review 2024-02-19 19:42:37 -03:00
danielkenji83
c449b229d5 Updates from review 2024-02-17 19:09:32 -03:00
danielkenji83
53fddba3ef Remove block_strength stat 2024-02-17 13:12:34 -03:00
danielkenji83
81cfb26059 Updates from review 2024-02-17 00:50:30 -03:00
danielkenji83
5c401215cf Rebase commit 2024-02-17 00:50:23 -03:00
Imbris
8e62c17a81 Merge branch 'imbris/shaderc-opt' into 'master' 
Fix issue with missing capability when enabling shaderc optimizations

Closes #1936

See merge request veloren/veloren!4322
 2024-02-15 17:25:12 +00:00
flo
ed4fd55bc3 terracotta 2024-02-15 06:08:03 +00:00
Youssef Fahmy
0d2938d8f1 Beginner balance tweaks 2024-02-14 23:23:29 +00:00
Imbris
ab24cf3732 Switch to using an experimental shader option to toggle shaderc optimizations 2024-02-14 16:36:59 -05:00
Imbris
5434ce546b Fix issue with missing capability when enabling shaderc optimizations 
See https://github.com/gfx-rs/wgpu/issues/4915

Also:
* Remove unused vert-out frag-in variables from shaders (naga doesn't
  like this probably because they are optimized out on the fragment
  side). This restriction from naga may be relaxed in the future
  see https://github.com/gfx-rs/wgpu/issues/3748.
* Enable OptimizationLevel::Performance for shaderc by default
* Add a environment variable VOXYGEN_SHADERC_OPTS for disabling this
  (e.g. to test if it actually makes a difference on any platform).
  (TODO: testing might be easier if there was a way to do toggle it
  without restarting...)
 2024-02-14 16:36:59 -05:00
evgenkot
f4ce05a657 I18n move stats 2024-02-13 17:01:27 +05:00
evgenkot
eb4911f60d I18n pickup-msg correction for en uk ru 2024-02-12 23:26:14 +05:00
evgenkot
eee330c9e9 I18n loot_scroller correct name 2024-02-12 21:24:57 +05:00
evgenkot
f9ee398a17 I18n loot_scroller user_gender 2024-02-12 21:24:57 +05:00
Imbris
59596874e1 Don't include compute in shadow push constant shader stages 
(avoids panic on metal backend: https://gitlab.com/veloren/veloren/-/issues/1951)
 2024-02-11 12:29:07 -05:00
Joshua Barretto
cdd94c899f Minor tweaks to aiming 2024-02-09 22:43:35 +00:00
juliancoffee
ce98de4370 Move debug_vectors_enabled flag to Scene 2024-02-08 16:25:40 +02:00
juliancoffee
ff3f1b9b1c Re-enable glider trails 2024-02-08 16:25:40 +02:00
juliancoffee
1dee12af85 Improve airflow particles 2024-02-08 16:25:39 +02:00
juliancoffee
16c41109d3 Add Air Velocity to debug info 2024-02-08 16:25:39 +02:00
juliancoffee
52328b89d2 rebase 2024-02-08 16:25:39 +02:00
laundmo
283b404724 Working wind/lift particles 
+ clippy fixes
 2024-02-08 16:25:39 +02:00
laundmo
2ae7c68dde move sun/moon direction to common 2024-02-08 16:25:39 +02:00
laundmo
4e37430189 draw debug vectors, and toggle them in egui 2024-02-08 16:25:39 +02:00
laundmo
761953513b Initial work for gliding lift, updraft, thermals 2024-02-08 16:25:38 +02:00
Nadja von Reitzenstein Čerpnjak
2d2ffa2b10 Add SRV lookup functionality to voxygen 
This will make voxygen issue a SRV lookup when connecting to a host, allowing server owners to configure non-standard ports for servers and host servers using vanity domains easily. It additionally allows servers to be hosted on both QUIC and TCP at the same time, with the client connecting to the preferred protocol automatically, but gracefully falling back if a connection is not possible.
 2024-02-07 14:28:37 +01:00
juliancoffee
895d0e604e Fix /tell messages 2024-02-06 14:44:52 +02:00
Marcel
56f8587ce1 Merge branch 'xMAC94x/update_toolchain' into 'master' 
update toolchain to `nightly-2024-01-17`

See merge request veloren/veloren!4257
 2024-02-06 09:48:04 +00:00
Marcel Märtens
6ebbb89d4d update toolchain to nightly-2024-01-17 2024-02-05 19:51:50 +01:00
juliancoffee
c8fa6f8b74 Widen Item Tooltip 2024-02-05 00:40:27 +02:00
juliancoffee
30717f46af Remove tracing::error! to avoid log-spam 
This error shouldn't be possible to trigger, unless you're playing as
spectator in which case you don't have a character, so we can't pick
right gender.
This should be fixed when we do add UI to pick the gender.
 2024-02-04 18:45:07 +02:00
juliancoffee
0d69a258b1 Address review 2024-02-03 22:19:03 +02:00
juliancoffee
913cc169d8 Refactor buff handling in kill message match expr 2024-02-03 19:56:17 +02:00
juliancoffee
5aa88ac223 Store the gender in CharacterInfo 2024-02-03 18:58:46 +02:00
juliancoffee
eeb7cab8c3 Implement gender, kind of 2024-02-03 18:58:46 +02:00
juliancoffee
450de681e4 Refactor chat message i18n 
- All message types now use i18n to declare format, similar to /tell
- hud-chat-you is removed for now, along with its usage in
  insert_alias()
 2024-02-03 18:58:46 +02:00
juliancoffee
96681cd448 Remove/Deprecate KillSource::Environment 2024-02-03 18:58:46 +02:00
juliancoffee
f7b8e079b4 Expose player gender to existing chat messages 
TODO: localize /tell and expose gender in 'hud-chat-you'
 2024-02-03 18:58:46 +02:00
Tim Vincent
87ff55e938 resets the cursor position instead of centering it when grabbed 2024-02-02 21:46:37 -08:00
Sam
b87d1b649d Overflwo slots now appear as red in the inventory. 2024-02-02 20:06:59 -05:00
Sam
632e922db6 Overflow slots displayed in bag 2024-02-02 20:06:58 -05:00
Sam
d01997ca56 Overflow slots as slots 2024-02-02 20:06:55 -05:00
Woeful_Wolf
7b843444be Renamed closest_points_ls3 to closest_points_3d, added comments, disable raycast aiming in FPV, get shortest between entity and terrain raycast 2024-02-02 18:11:37 +02:00
Woeful_Wolf
63394719a1 Make camera offsets and aiming system only apply when wielding ranged 2024-02-01 23:33:05 +02:00
Woeful_Wolf
1c69614b4e Cleanup and comments 2024-02-01 23:32:24 +02:00
Woeful_Wolf
c86f000881 Moved closest_line_seg_line_seg to common/systems/src/phys.rs and renamed to closest_points_ls3 2024-02-01 22:34:42 +02:00
Woeful_Wolf
c89e3f2b5e Settings labels use i18n 2024-02-01 20:36:34 +02:00
Woeful_Wolf
f4aa9ecbe3 code-quality edits 2024-02-01 20:36:33 +02:00
Woeful_Wolf
5b00d41cd4 Cleaned up some extra imports and debug code 2024-02-01 20:36:32 +02:00
Woeful_Wolf
1660d703ac Changed how look_dir is calculated when aiming, now ray casts entities and terrain to find target point 2024-02-01 20:36:32 +02:00
Woeful_Wolf
e270992bda Added x and y aiming offsets to settings 2024-02-01 20:36:31 +02:00
Woeful_Wolf
43566bca32 Added x and y camera offsets when aiming in third person 2024-02-01 20:36:30 +02:00
Woeful_Wolf
c78f6c0bc2 Added basic ray_entities and closest_line_seg_line_seg methods 2024-02-01 20:36:29 +02:00
Marcel
6d412089c7 Merge branch 'isse/wgpu-update' into 'master' 
Update wgpu

See merge request veloren/veloren!4245
 2024-02-01 12:14:32 +00:00
Marcel Märtens
94df06ca19 remove outdated comment and make use of more constants 2024-02-01 12:17:19 +01:00
Marcel Märtens
dfb8715aed make map_async function slim and handle the other stuff inside the download_and_handle_internal fn which is only called from a seperate thread 2024-02-01 12:05:11 +01:00
Marcel Märtens
db9eca031c use constants in dummy_scene 2024-02-01 12:05:11 +01:00
Isse
95c7e6bd82 list opengl for list-wgpu-backends 2024-02-01 12:05:11 +01:00
Isse
64eda770fb cache max texture size 2024-02-01 12:05:11 +01:00
Isse
2f544868ef various fixes 
- Renames `Drawer::view` to `Drawer::surface_view`.
- Only set present mode if it's supported in `set_render_mode`.
- Don't create view in `Drawer::drop`.
- Format changes.
 2024-02-01 12:05:11 +01:00
Isse
a9ea5d31bd remove resolved todo question 2024-02-01 12:05:11 +01:00
Isse
1e40fa55c2 expect on profiler creation error 2024-02-01 12:05:11 +01:00
Isse
3192ed037f remove unnecessary lifetime 2024-02-01 12:05:11 +01:00
Isse
89d70cc932 cache present modes, add check for present modes in set_render_mode and move present mode localization to hud 2024-02-01 12:05:11 +01:00
Isse
cfd0ffd7f6 don't create view in draw_egui 2024-02-01 12:05:11 +01:00
Isse
25c4d65b5d Remove ThirdPassDrawerPrepared, change from Discard to Store 2024-02-01 12:05:11 +01:00
Isse
1d48bfff31 Revert atlas texture name 2024-02-01 12:05:11 +01:00
Isse
ba2e7f6b1d add vk as key for vulkan 2024-02-01 12:05:10 +01:00
Marcel Märtens
856c64c9ee smaller code cleanups, copy paste errors, or wrong merge resolutions fixed according to MR reviews 2024-02-01 12:05:10 +01:00
Isse
b7a56e895a Only show available present modes in graphic settings 2024-02-01 12:05:06 +01:00
Isse
82989979a6 try to fix windows build 2024-02-01 12:01:51 +01:00
Isse
165c88bd74 patch wgpu to 18.2 2024-02-01 12:01:03 +01:00
Treeco
7496aa5357 Added LOD objects for new forest types 2024-01-31 23:01:44 +00:00
Isse
9903d2c545 more testing 2024-01-30 00:52:49 +01:00
João Capucho
d29d22dd0a update to wgpu 0.18 2024-01-30 00:52:49 +01:00
Isse
5e987efe99 Merge branch 'isse/list-backends' into 'master' 
Voxygen list backends subcommand

See merge request veloren/veloren!4288
 2024-01-29 17:48:55 +00:00
Imbris
e3b0044186 Add period to comment 2024-01-29 17:02:10 +00:00
Marcel Märtens
272837d4e5 add documentation for list-wgpu-backends 2024-01-29 17:23:45 +01:00
Christof Petig
eaba303670 Merge branch 'christof/hot-reload-fix' into 'master' 
Fix hot reloading for plugin combined manifests

See merge request veloren/veloren!4280
 2024-01-28 20:02:02 +00:00
Isse
b523423404 Voxygen list backends subcommand 2024-01-28 18:44:18 +01:00
maxicarlos08
d11c58b75b Merge branch 'synis/item-tabcomplete' into 'master' 
Incremental item path autocomplete

See merge request veloren/veloren!4281
 2024-01-27 18:03:21 +00:00
Isse
2023786f5e Merge branch 'isse/optimize-weather' into 'master' 
Optimize weather

See merge request veloren/veloren!4270
 2024-01-27 17:20:53 +00:00
Syniis
04acb82d75 Fix asset prefix not working with sudo 2024-01-27 17:34:25 +01:00
Syniis
488922ac94 Cleaner code 2024-01-27 16:16:30 +01:00
Syniis
b97e27df9a Allow specifiying prefix for AssetPath command argument 2024-01-27 15:44:03 +01:00
Syniis
d46dbb9708 Incremental item path autocomplete 2024-01-27 13:41:39 +01:00
Christof Petig
cc93474c2f fix hot reloading of combined manifests 2024-01-27 12:40:34 +01:00
Tim Vincent
2ac2f2d45e stops centering the cursor to prevent camera jumping when the cursor grab is released 2024-01-23 20:09:23 -08:00
Isse
497cb13e50 always use players weather, and fix weather fr this time 2024-01-23 23:18:14 +01:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 2024-01-21 21:30:08 +00:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Joshua Barretto
e231b8f9c1 Apply watcher properties more sensibly 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
Samuel Keiffer
9998dbd587 Merge branch 'sam/expose-charms' into 'master' 
Charms now have crafting recipes.

See merge request veloren/veloren!4179
 2024-01-21 17:39:37 +00:00
Isse
0755f339a2 Merge branch 'woeful/1923-wrong-digging-tooltip' into 'master' 
Fixes #1923 - Pickaxe tooltip wrong for digging

Closes #1923

See merge request veloren/veloren!4263
 2024-01-21 14:21:46 +00:00
Maxicarlos08
0b1f8dc29a
add charm buff icons 2024-01-21 15:05:31 +01:00