diff --git a/.gitignore b/.gitignore index 8d269ace87..c2123aca2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,80 +1,94 @@ -# Rust -target +# Project-specific +## Veloren +*.log +*.rar +assets/tweak/ +maps +notes.md +notes.txt +run.sh +screenshots +server_settings.ron +settings.ron +temp +todo.md +todo.txt +userdata -# Vim +## Allow asset hud settings +!assets/voxygen/i18n/*/hud/settings.ron +## Export data +*.csv +img-export/**/*.png + +## Game data stored with SQLite +*.sqlite +*.sqlite-journal +*.sqlite-shm +*.sqlite-wal + +## Plugins +/assets/plugins/* + + +# Integrated development environments (IDEs) and text editors +## Eclipse +.project + +## JetBrains +**/.idea/ +**/*.iml + +## Vim and Neovim **/.nvimrc **/*.vi **/*.vim **/*.swp **/*tags -# IntelliJ - -**/.idea/ -**/*.iml - -# VSCode +## Visual Studio Code .vscode/ -/.vscode/* !/.vscode/launch.json *.code-workspace -# Eclipse -.project - -# Veloren -*.rar -*.log -assets/tweak/ -settings.ron -server_settings.ron -run.sh -maps -screenshots -notes.md -notes.txt -todo.md -todo.txt -userdata -temp - -# Profiling and traces -heaptrack.* -cargo-timing* -flamegraph.* -perf.* -wgpu-trace/ - -# allow asset hud settings -!assets/voxygen/i18n/*/hud/settings.ron - -# Export data -*.csv -img-export/**/*.png - -# Game data -*.sqlite -*.sqlite-journal -*.sqlite-wal -*.sqlite-shm - -# direnv -/.direnv -/.envrc -*.bat - -# Mac +# Operating systems +## macOS .DS_Store -# Nix +## NixOS nix/result* /result* /shell.nix -# Bash + +# Programming and scripting languages +## Bash .history -# Plugins -/assets/plugins/* +## Rust +target + + +# Shell extensions +## direnv +/.envrc +/.direnv + + +# Profiling and tracing tools +## Cargo build with --timings option +cargo-timing* + +## FlameGraph +flamegraph.* + +## heaptrack +heaptrack.* + +## perf tool for Linux +perf.* + +## wgpu with the "trace" feature enabled +wgpu-trace/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8528091887..b42020042f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog + + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), @@ -65,9 +70,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allow moving and resizing the chat with left and right mouse button respectively. - Missing plugins are requested from the server and cached locally. - Support for adding spots in plugins. -- Added real colours to LOD trees and rooftops, unique models for most tree kinds, and models for several buildings -- `/aura` command -- Friendly Fire and Forced PvP auras to desert city arenas +- Added real colours to LOD trees and rooftops, unique models for most tree kinds, and models for several buildings. +- `/aura` command. +- Friendly Fire and Forced PvP auras to desert city arenas. ### Changed @@ -117,7 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Dropped items now merge dynamically (including non-stackables). - You no longer need to unlock health, energy and roll skills to get to max. - Rolls now don't skip recovery, and instead have increased buildup during ability interrupts. -- Changed default world map +- Changed default world map. ### Removed @@ -158,8 +163,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Unlockable door blocks. - Sprite rotation for Spots. - Better entity placement options for spots. -- Camera zoom can now be locked, to prevent accidental zooming while rolling in combat. It comes -with a key bind to enable/disable the setting, and an Auto/Toggle behavior setting. Auto behavior +- Camera zoom can now be locked, to prevent accidental zooming while rolling in combat. + It comes with a key bind to enable/disable the setting, + and an Auto/Toggle behavior setting. Auto behavior. will only lock the camera zoom while movement and combat inputs are also being pressed. - Custom spots can be added without recompilation (only ron and vox files). - Setting in userdata/server/server_config/settings.ron that controls the length of each day/night cycle. @@ -202,9 +208,10 @@ will only lock the camera zoom while movement and combat inputs are also being p - Climbing no longer requires having 10 energy. - Castles will now be placed close to towns. - Sword skill tree overhaul. -- Rescaling of images for the UI is now done when sampling from them on the GPU. Improvements are -particularly noticeable when opening the map screen (which involves rescaling a few large -images) and also when using the voxel minimap view (where a medium size image is updated often). +- Rescaling of images for the UI is now done when sampling from them on the GPU. + Improvements are particularly noticeable when opening the map screen + (which involves rescaling a few large images) and also when using the voxel minimap view + (where a medium size image is updated often). - Towns now have a variety of sizes. - The game now starts in fullscreen by default. - Default audio volume should be less likely to destroy ear drums. @@ -257,11 +264,13 @@ images) and also when using the voxel minimap view (where a medium size image is - Added a Craft All button. - Server: Vacuum database on startup. - SeaChapel, Greek/Latin inspired dungeon for ocean biome coasts. -- Entity view distance setting added (shown in graphics and network tabs). This setting controls - the distance at which entities are synced to the client and which entities are displayed in. +- Entity view distance setting added (shown in graphics and network tabs). + This setting controls the distance at which entities are synced to the client + and which entities are displayed in. This is clamped to be no more than the current overall view distance setting. -- View distance settings that are lowered by the server limit (or other factors) now display an - extra ghost slider cursor when set above the limit (instead of snapping back to the limit). +- View distance settings that are lowered by the server limit (or other factors) + now display an extra ghost slider cursor when set above the limit + (instead of snapping back to the limit). Limits on the view distance by the server no longer affect the settings saved on the client. - HQX upscaling shader for people playing on low internal resolutions. - Pets can now be traded with. @@ -288,10 +297,9 @@ images) and also when using the voxel minimap view (where a medium size image is - First tab on Login screen triggers username focus. - Certain NPCs will now attack when alone with victim. - `/kill_npcs` no longer leaves drops behind and also has bug causing it to not destroy entities. - fixed. - Default present mode changed to FIFO (also known as 'Vsync capped'). -- Old "Entity View Distance" setting renamed to "Entity Detail Distance" (since this controls the - distance at which lower detail models are used for entities). +- Old "Entity View Distance" setting renamed to "Entity Detail Distance" + (since this controls the distance at which lower detail models are used for entities). - Present mode options renamed for clarity: FIFO -> 'Vsync capped', Mailbox -> 'Vsync uncapped', Immediate -> 'Vsync off'. - Item pickup UI now displays items that members of your group pick up. @@ -306,13 +314,14 @@ images) and also when using the voxel minimap view (where a medium size image is - Fixed bug where you would still be burning after dying in lava. - Workaround for rayon bug that caused lag spikes in slow jobs. - Fixed crash due to zooming out very far. -- Client properly knows trade was cancelled when exiting to the character screen (and no longer - tries to display the trade window when rejoining). -- Cancel trades for an entity when it is deleted (note this doesn't effect trades between players - since their entities are not removed). -- Fixed bug where the view distance selection was not immediately applied to entity syncing when - first joining a server and when changing the view distance (previously this required moving to a - new chunk for the initial setting or subsequent change to apply). +- Client properly knows trade was cancelled when exiting to the character screen + (and no longer tries to display the trade window when rejoining). +- Cancel trades for an entity when it is deleted + (note this doesn't effect trades between players since their entities are not removed). +- Fixed bug where the view distance selection was not immediately applied to entity + syncing when first joining a server and when changing the view distance + (previously this required moving to a new chunk for the initial setting or + subsequent change to apply). - Moderators and admins are no longer blocked from logging in when there are too many players. - FXAA now behaves correctly at non-1.0x internal resolutions. - Pets no longer aggro on pet owners after being healed. @@ -376,8 +385,8 @@ images) and also when using the voxel minimap view (where a medium size image is - Damage from the same source dealt in the same tick will now be grouped up. - Critical hits are now shown differently in the damage numbers. - Fall damage and some (extra) buffs/debuffs now show up in the damage numbers. -- Optimized sprite processing decreasing the startup time of voxygen (and long freezes when trying - to enter the world when this hasn't finished). +- Optimized sprite processing decreasing the startup time of voxygen + (and long freezes when trying to enter the world when this hasn't finished). - Metadata added to music files. Listen to the soundtrack more easily! - Overhauled caves: they're now a multi-layer network spanning the entire world. @@ -841,9 +850,9 @@ images) and also when using the voxel minimap view (where a medium size image is ### Fixed - Fixed a bug that would cause a server crash when a player levelled up or fired - a projectile in very specific circumstances + a projectile in very specific circumstances. - Fixed a bug where buff/debuff UI elements would flicker when you had more than - one of them active at the same time + one of them active at the same time. - Made zooming work on Wayland. - Fixed AI behavior so only humanoids will attempt to roll. - Fixed missing GameInputs (sneak, swimup, swimdown) in controller mapping. @@ -1174,7 +1183,7 @@ images) and also when using the voxel minimap view (where a medium size image is - Added randomly selected Loading Screen background images. - Added options to disable clouds and to use cheaper water rendering. - Added client-side character saving. -- Added a localization system to provide multi-language support to voxygen +- Added a localization system to provide multi-language support to voxygen. - Added French language for Voxygen. - Added rivers and lakes which follow realistic physical paths. - Added a sophisticated erosion system for world generation which dramatically changes the world layout. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ae7649df2..5f0095e5ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -To learn about how to contribute, take a look at the [Veloren book](https://book.veloren.net). \ No newline at end of file +To learn about how to contribute, take a look at the [Veloren book](https://book.veloren.net). diff --git a/README.md b/README.md index 647f6ab8b2..bb7eebdc69 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![discord](https://badgen.net/discord/members/veloren-community-449602562165833758?icon=discord&label=discord)](https://discord.gg/veloren-community-449602562165833758) [![matrix](https://badgen.net/matrix/members/veloren-space/matrix.org)](https://matrix.to/#/#veloren-space:fachschaften.org) - + @@ -81,7 +81,7 @@ If you prefer to compile the game yourself, follow the instructions in our [book ## Credit -Our Weblate instance is hosted by [Codeberg](https://codeberg.org/). +Our Weblate project is hosted by [Codeberg](https://codeberg.org/). Many thanks to: