Commit Graph

5269 Commits

Author SHA1 Message Date
jshipsey
b514fb4159 fix for animal attack motion bug 2020-09-17 22:32:09 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
7525479a4c fit dt issue 2020-09-17 22:18:49 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
jshipsey
bd1984bf28 golem addition, fix for axe attack 2020-09-17 22:18:49 -04:00
Joshua Yanovski
4e07258319 Merge branch 'xvar/item-persistence' into 'master'
Persistence overhaul

Closes #678

See merge request veloren/veloren!1342
2020-09-17 23:02:14 +00:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation
* Added migrations for entity ID changes to existing tables
2020-09-17 23:02:14 +00:00
Marcel
3ce5a9d0e7 Merge branch 'reenable_ci' into 'master'
partially fix pages

See merge request veloren/veloren!1388
2020-09-17 10:40:03 +00:00
Marcel Märtens
b12af1d00c partially fix pages 2020-09-17 12:03:50 +02:00
Marcel
74caa01185 Merge branch 'fix_metrics' into 'master'
fix client stats, difference client/player

See merge request veloren/veloren!1387
2020-09-16 23:07:32 +00:00
Marcel Märtens
cb6fa52eae fix client stats, difference client/player 2020-09-17 00:19:48 +02:00
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