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
5,058 Commits 151 Branches 18 Tags 2.1 GiB
95fcea086b
Commit Graph

5058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
95fcea086b Merge branch 'xMAC94x/better-metrics' into 'master' 
Better Metrics for Server

See merge request veloren/veloren!1381
 2020-09-16 16:58:22 +00:00
Marcel Märtens
3c58b64689 add detailed information on state tick timings 2020-09-16 18:24:18 +02:00
Marcel Märtens
184d405f10 Better Metrics for Server 
- Player online is now seperated into players connected and disconnected and is event driven
 - Metrics for ChunkGeneration: this is the server side for tracking actuall generation
 - Metrics for Chunk Network Requests
 2020-09-16 18:14:04 +02:00
Marcel
00598e6d4b Merge branch 'fix_tracing_spam' into 'master' 
fix spam due to mio tracing

See merge request veloren/veloren!1385
 2020-09-16 09:32:54 +00:00
Marcel Märtens
9833ec91ea fix spam due to mio tracing 2020-09-16 10:13:37 +02:00
Joshua Yanovski
8d829f9c69 Merge branch 'tylerlowrey/add-ban-unban-kick-cmds' into 'master' 
Tylerlowrey/add ban unban kick cmds

See merge request veloren/veloren!1382
 2020-09-14 07:18:33 +00:00
Joshua Yanovski
19485b6a00 Add a DisconnectReason enum. 2020-09-14 08:16:09 +02:00
tylerlowrey
bdff4bc04c Prevent client from ignoring Kicked event 2020-09-14 07:54:05 +02:00
tylerlowrey
9e7ec63800 Converted banlist to use Uuids as the key instead of the username 2020-09-14 07:54:05 +02:00
tylerlowrey
2c55afcfa9 Added username_to_uuid convenience function to LoginProvider 2020-09-14 07:54:05 +02:00
tylerlowrey
2b0c1e89f3 Refactored kicking the player into its own function + ran fmt on project 2020-09-14 07:54:05 +02:00
tylerlowrey
d57adc518e Removed unnecessary clone in ban handling function 2020-09-14 07:54:05 +02:00
tylerlowrey
4653eb63c4 Converted banlist from vector of tuples to HashMap 2020-09-14 07:54:05 +02:00
tylerlowrey
b64f3fa8a9 Removed unnecessary kicked error enum 2020-09-14 07:54:05 +02:00
Tyler Lowrey
c1c995ec39 Update CHANGELOG.md to mention changes 2020-09-14 07:54:04 +02:00
tylerlowrey
30c3146682 Added main menu kick message with kick reason after player is kicked 2020-09-14 07:52:31 +02:00
tylerlowrey
fee79720ee Added ban message with reason when banned user attempts to login to server 2020-09-14 07:52:31 +02:00
tylerlowrey
f171e4e870 Removed usage of AuthProvider as AuthProvider no longer exists 2020-09-14 07:52:31 +02:00
tylerlowrey
c3c4b88fe7 Added banlist check to try_login method 2020-09-14 07:52:31 +02:00
tylerlowrey
f402df2c56 Altered ban so that it kicks the player as well 2020-09-14 07:52:31 +02:00
tylerlowrey
e9348f2fb5 Fixed requiring a restart in order for banlist to take effect 2020-09-14 07:52:31 +02:00
tylerlowrey
ea4f9b9a36 Added unban command functionality 2020-09-14 07:52:31 +02:00
tylerlowrey
c2a7fc1586 Prevent multiple bans of same player 2020-09-14 07:52:31 +02:00
tylerlowrey
def21af02b Added ban command functionality 2020-09-14 07:52:31 +02:00
tylerlowrey
dadb1fbe12 Added kick command functionality 2020-09-14 07:52:31 +02:00
tylerlowrey
07e33286ad Changed reason field for kick & ban from Any to Message 2020-09-14 07:52:31 +02:00
tylerlowrey
c55a66d5ba Added ban, unban, kick usage information and invocation aliases 2020-09-14 07:52:31 +02:00
tylerlowrey
3bc57b4087 Added banlist to server settings and added default value 2020-09-14 07:52:31 +02:00
Imbris
75761b60d9 Merge branch 'imbris/fix-mesh-panic' into 'master' 
Fix #746 and misc cleanup

Closes #746

See merge request veloren/veloren!1380
 2020-09-13 01:48:27 +00:00
Imbris
3fbf8d7ca0 Remove chunk from mesh todo if neighbour is deleted, be more careful with z_start and z_end in terrain meshing 2020-09-12 21:02:00 -04:00
Imbris
e59439cd8b Merge branch 'remove_warning' into 'master' 
fix windows result check

See merge request veloren/veloren!1378
 2020-09-12 16:23:03 +00:00
Marcel Märtens
ad63c65d2f fix windows result check 2020-09-11 16:24:15 +02:00
Imbris
518e4e3a5d Merge branch 'TheThirdSpartan/chat-fixes' into 'master' 
fixed empty chat messages for cli clients

See merge request veloren/veloren!1376
 2020-09-10 05:10:53 +00:00
Imbris
c3ae641fbb Merge branch 'imbris/tracy' into 'master' 
Add more tracing instrumentation and tracy support

See merge request veloren/veloren!1359
 2020-09-10 05:07:51 +00:00
Justin Shipsey
9cab5de99d Merge branch 'healing' into 'master' 
#753 Do not make pets think they are attacked when healed

See merge request veloren/veloren!1374
 2020-09-09 23:43:19 +00:00
TheThirdSpartan
0fb2d1cd5a fixed empty chat messages for cli clients 2020-09-09 18:50:45 -04:00
Matthew Martin
57c6160b72 * Set the KillType to Other for HealthSource::Healing 
* Extend logic to projectiles and explosions
 2020-09-09 23:34:10 +02:00
Matthew Martin
a9086b27a0 Do not make healing items deal damage 2020-09-09 23:22:49 +02:00
Imbris
b0dc35aa21 Merge branch 'TheThirdSpartan/chat-features' into 'master' 
Added localization config options for new death messages

See merge request veloren/veloren!1372
 2020-09-09 20:26:20 +00:00
TheThirdSpartan
7fd673ecb2 Added localization config options for new death messages 2020-09-09 20:26:20 +00:00
Marcel
8eee8dfa1f Merge branch 'xMAC94x/make_veloren_small.fixes' into 'master' 
replace heavy msgbox with light native-dialog

See merge request veloren/veloren!1373
 2020-09-09 11:16:13 +00:00
Marcel Märtens
018d03d860 fix panic for macos 2020-09-09 12:11:56 +02:00
Marcel Märtens
68168b0ae4 replace heavy msgbox with light native-dialog 2020-09-08 23:49:49 +02:00
Marcel
b285f714e4 Merge branch 'fix' into 'master' 
fix comment

See merge request veloren/veloren!1371
 2020-09-07 15:52:18 +00:00
Marcel Märtens
a50757b88b fix comment 2020-09-07 17:45:00 +02:00
Marcel
def983bb9d Merge branch 'fixed#757' into 'master' 
fixed #757

Closes #757

See merge request veloren/veloren!1370
 2020-09-07 15:21:44 +00:00
Marcel Märtens
a0eebf15d0 fixed #757 2020-09-07 17:20:52 +02:00
Marcel
4bd41ddd9c Merge branch 'xMAC94x/remove_busy_waiting' into 'master' 
detect EOL on stdin and no longer try to read commands.

See merge request veloren/veloren!1369
 2020-09-07 15:04:05 +00:00
Marcel Märtens
4cf86c725e detect EOL on stdin and no longer try to read commands. 
This can be locally tested with CTRL+D on basic mode.
RUST_LOG=trace might help
 2020-09-07 16:28:13 +02:00
Marcel
a531aeca13 Merge branch 'tui_performance' into 'master' 
decrease TUI to only draw 10 frames on idle.

See merge request veloren/veloren!1368
 2020-09-07 13:06:37 +00:00