Commit Graph

282 Commits

Author SHA1 Message Date
Monty Marz
72d5013a54 Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
Marcel Märtens
df73cb2676 fix various clippy issues 2020-07-01 00:37:06 +02:00
Ben Wallis
1abf25ca71 Moved sfx from common to voxygen 2020-06-28 18:16:22 +01:00
Forest Anderson
0f0e2fadbe Fixed meta chattype error on master 2020-06-28 17:10:01 +00:00
Forest Anderson
719f9680e3 Merge branch 'CapsizeGlimmer/chat_modes' into 'master'
Capsize glimmer/chat modes

Closes 

See merge request 
2020-06-28 14:35:39 +00:00
Ben Wallis
3c9745787e Implemented loot pickup chat messages and the option for playing different sounds for picked up items
* Added chat message when an item is picked up
* Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up
* Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent
* Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages
* Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full
* Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this.
* Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)
2020-06-28 13:05:28 +01:00
Forest Anderson
cf186b865a Fixing errors after rebase 2020-06-27 19:12:12 -04:00
CapsizeGlimmer
ca0c7c0531 cargo fmt 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
85d666c6e2 Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
908c7a2bd5 misc chat mode changes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
0969e33086 Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
CapsizeGlimmer
c07759f3a1 Implement MR!1043 changes suggested by Imbris 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
5fc26b5921 Players are removed from social menu when logged out. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
01e7438d66 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
CapsizeGlimmer
3a65b76547 cargo fmt; changelog 2020-06-27 17:03:55 -04:00
CapsizeGlimmer
f7e4d92679 Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
3742128186 Move message processing and chat bubbles to the client 2020-06-27 16:42:26 -04:00
CapsizeGlimmer
5086a309e8 Re-implement names in chat. It is done client-side now and /alias changes are retroactive. 2020-06-27 16:42:25 -04:00
CapsizeGlimmer
3f43880dc7 Rework chat processing 2020-06-27 16:29:03 -04:00
CapsizeGlimmer
aaf9af16df Base implementation of /group /faction /say /region 2020-06-27 16:26:02 -04:00
Joshua Barretto
888ea1e895 Added server-side maximum view distance setting 2020-06-25 18:46:04 +01:00
Imbris
eccd7f1653 Merge branch 'shandley/character-loading' into 'master'
Move character DB ops off the main thread

See merge request 
2020-06-25 16:16:15 +00:00
Songtronix
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00
Shane Handley
cb937d9e23 - Move the remaining character data loading to the message/thread formatharacter list actions
- Handle/notify the client of errors during character load by returning to character select with the error, clean up client and server states
- Add player_uuid check when loading character data.
2020-06-24 11:47:41 +10:00
Marcel Märtens
f2f3cd2f28 switch to tracing stlye and enhance logs with usefull information
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
2020-06-22 09:53:15 +02:00
Kevin Glasson
cfe09c2f55 Convert all other veloren crates to use tracing
- Completely removed both `log` and `pretty_env_logger` and replaced
with `tracing` and `tracing_subscriber` where necessary.

- Converted all `log::info!(...)` et al. statements to just use the
shorthand macro i.e. `info!`. This was mostly to make renaming easier.
2020-06-21 23:19:41 +08:00
Kevin Glasson
d8d7f07cb5 Add hotbar state persistence.
Persist the hotbar state to disk by writing it out to a `profile.ron`
situated next to the existing `settings.ron`. There are individual
profiles for every character on every server. On creation of a new
character the default hotbar state will be `[None; 10]` i.e. the hotbar
will be empty.

Resolves: https://gitlab.com/veloren/veloren/-/issues/577
2020-06-19 08:00:21 +08:00
scott-c
89eda13b19 Remove wield requirement to swap loadout 2020-06-17 21:34:58 +08:00
Justin Shipsey
ead6494ca6 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
Ben Wallis
3d28f97f51 Globally suppressed clippy lint option_map_unit_fn for 2020-06-14 16:48:07 +00:00
Ben Wallis
52b0585135 Fixed suppressed clippy warnings for - collapsible_if 2020-06-12 20:34:54 +01:00
Marcel Märtens
cb03bc61d7 dependency reduction:
- authc no longer uses reqwest
 - image only supports PNG
 - replace routille with tiny_http
 - several other dependencies
 - cargo upgrade
 - following improvement was measured on R7 1700X:
   before:
    - cargo build: 3076.73s user / 4:45 total / 589 dependencies
    - cargo test: 6118.38s user / 7:30 total / 959 dependencies
   after:
    - cargo build: 2680.54s user / 4:05 total / 480 dependencies
    - cargo test: 5351.81s user / 7:04 total / 791 dependencies
 - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
2020-06-11 20:55:34 +02:00
Ben Wallis
22bcda3e50 Suppressed all existing clippy warnings in preparation for fixes as part of 2020-06-10 22:01:42 +01:00
S Handley
45949e7577 Update CHANGELOG and a TODO, fix safer deserialisation for inventory
data.
2020-06-04 11:44:33 +00:00
scott-c
07e54e9b87 Fix build error 2020-06-01 22:04:44 +08:00
scott-c
a895296e0e Add level up network event 2020-06-01 22:04:44 +08:00
scott-c
1d98a0a4ee Add character select network event 2020-06-01 22:04:44 +08:00
scott-c
fd6911eb27 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
7cf9967e77 Add character name and level to social window 2020-06-01 22:04:44 +08:00
Justin Shipsey
7bbbf74fc2 orientation animation 2020-05-27 06:41:55 +00:00
Marcel Märtens
5e96162ad4 Change the version number to 0.6 2020-05-16 00:50:40 +02:00
CapsizeGlimmer
bb0881253d Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
d988b34c22 - Update the stats of characters individually, reverting the change with
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
2020-05-13 09:14:09 +10:00
Shane Handley
ceb3e26341 Stats persistence
- Update client code to use persisted stats
- Add a system for stats persistence
- Add a basic scheduler to control duration between execution of
persistence systems
2020-05-13 09:14:08 +10:00
CapsizeGlimmer
805c5d651e Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
CapsizeGlimmer
c2e7d3e00a Fixed player list tab completion 2020-05-10 19:17:17 -04:00
S Handley
7a6c392fc3 - Load characters after login.
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
CapsizeGlimmer
fe9deb29af Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Imbris
330b7f3c93 Enable unequipping as well as equipping to specific slots 2020-04-12 18:41:06 +02:00
Imbris
ce619c2aff Use new slot widget for armor slots 2020-04-12 18:40:53 +02:00