Marcel
|
d2cea4e2be
|
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
|
69bf76e5b5
|
fix spam due to mio tracing
|
2020-09-16 10:13:37 +02:00 |
|
Joshua Yanovski
|
465f30eacf
|
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
|
aa430416ad
|
Add a DisconnectReason enum.
|
2020-09-14 08:16:09 +02:00 |
|
tylerlowrey
|
10ad6dac0d
|
Prevent client from ignoring Kicked event
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
d379f3ecd8
|
Converted banlist to use Uuids as the key instead of the username
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
06a15aac5a
|
Added username_to_uuid convenience function to LoginProvider
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
6d427068ed
|
Refactored kicking the player into its own function + ran fmt on project
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
f3c869a219
|
Removed unnecessary clone in ban handling function
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
c2943a5a2d
|
Converted banlist from vector of tuples to HashMap
|
2020-09-14 07:54:05 +02:00 |
|
tylerlowrey
|
cdd033ef63
|
Removed unnecessary kicked error enum
|
2020-09-14 07:54:05 +02:00 |
|
Tyler Lowrey
|
fadd54c0fd
|
Update CHANGELOG.md to mention changes
|
2020-09-14 07:54:04 +02:00 |
|
tylerlowrey
|
b33f758557
|
Added main menu kick message with kick reason after player is kicked
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
9bb4dc4894
|
Added ban message with reason when banned user attempts to login to server
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
74a01800ff
|
Removed usage of AuthProvider as AuthProvider no longer exists
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
66f5e8ab7c
|
Added banlist check to try_login method
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
54dfc531f3
|
Altered ban so that it kicks the player as well
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
39c5bb8e96
|
Fixed requiring a restart in order for banlist to take effect
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
0ceb1f7729
|
Added unban command functionality
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
0f4903f1c1
|
Prevent multiple bans of same player
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
7ae9e79cf8
|
Added ban command functionality
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
6b7ae7c114
|
Added kick command functionality
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
0c77ec0eb4
|
Changed reason field for kick & ban from Any to Message
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
52a3cafa7c
|
Added ban, unban, kick usage information and invocation aliases
|
2020-09-14 07:52:31 +02:00 |
|
tylerlowrey
|
a4e234b686
|
Added banlist to server settings and added default value
|
2020-09-14 07:52:31 +02:00 |
|
Imbris
|
4684c1255e
|
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
|
57e85cec37
|
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
|
bf40d605d6
|
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
|
5ada082755
|
fix windows result check
|
2020-09-11 16:24:15 +02:00 |
|
Imbris
|
111fb89ef2
|
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
|
58e78686d2
|
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
|
f00dca9a7e
|
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
|
e0c0cce336
|
fixed empty chat messages for cli clients
|
2020-09-09 18:50:45 -04:00 |
|
Matthew Martin
|
0d773905ff
|
* Set the KillType to Other for HealthSource::Healing
* Extend logic to projectiles and explosions
|
2020-09-09 23:34:10 +02:00 |
|
Matthew Martin
|
fe3a214578
|
Do not make healing items deal damage
|
2020-09-09 23:22:49 +02:00 |
|
Imbris
|
ef73bb3d2a
|
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
|
09f054f2cd
|
Added localization config options for new death messages
|
2020-09-09 20:26:20 +00:00 |
|
Marcel
|
88d72f1e12
|
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
|
e900a5bb7a
|
fix panic for macos
|
2020-09-09 12:11:56 +02:00 |
|
Marcel Märtens
|
fea6182aa0
|
replace heavy msgbox with light native-dialog
|
2020-09-08 23:49:49 +02:00 |
|
Marcel
|
8a69b7342f
|
Merge branch 'fix' into 'master'
fix comment
See merge request veloren/veloren!1371
|
2020-09-07 15:52:18 +00:00 |
|
Marcel Märtens
|
f65fcd87db
|
fix comment
|
2020-09-07 17:45:00 +02:00 |
|
Marcel
|
ff477908f1
|
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
|
3f70baa90c
|
fixed #757
|
2020-09-07 17:20:52 +02:00 |
|
Marcel
|
4baf965117
|
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
|
3897f59848
|
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
|
1e245c665c
|
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 |
|
Marcel Märtens
|
e59f67b8c0
|
decrease TUI to only draw 10 frames on idle.
add tracing when a cmd is entered
|
2020-09-07 14:32:46 +02:00 |
|
Imbris
|
0c9191f979
|
Merge branch 'doctaray/adding-borderless-fullscreen-option' into 'master'
added option for borderless fullscreen in setting -> graphics menu
See merge request veloren/veloren!1270
|
2020-09-07 05:12:15 +00:00 |
|
Raiyan Sayeed
|
af0aecda32
|
added option for borderless fullscreen in setting -> graphics menu
|
2020-09-07 05:12:15 +00:00 |
|