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
4,398 Commits 151 Branches 18 Tags
Commit Graph

707 Commits

Author SHA1 Message Date
Joshua Barretto
d5e0a7d351 Added bombs to loot table 2020-07-05 16:15:51 +01:00
Joshua Barretto
40ff4923dc Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
Marcel
79f5d3189c Merge branch 'network-lockless' into 'master' 
Network lockless

See merge request veloren/veloren!1153
 2020-07-05 09:17:29 +00:00
Forest Anderson
b2528b01f6 Merge branch 'xvar/skills' into 'master' 
Initial implementation of skills and skill groups

See merge request veloren/veloren!1135
 2020-07-05 00:33:11 +00:00
Forest Anderson
4bc5fe9cf9 Merge branch 'angel/add-spawn-training-dummy' into 'master' 
Added spawning test dummy

See merge request veloren/veloren!1142
 2020-07-04 19:24:02 +00:00
Piotr Korgól
079a6094cb Correctly load the loot table 2020-07-04 18:40:23 +02:00
Ben Wallis
aadaf83126 Refactored Skills/SkillGroups structure and implemented JSON persistence 2020-07-04 15:25:21 +01:00
Piotr Korgól
3b7e75fde3 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
Marcel Märtens
c40997622a remove Mutex in server as Stream is now 'Sync' 2020-07-04 12:31:59 +02:00
Forest Anderson
30d8f03e7b Added proper training dummy model 2020-07-03 16:53:04 -04:00
Forest Anderson
8e2006c27e Prevent xp gain from training dummy kill 2020-07-03 16:53:04 -04:00
Forest Anderson
d2941fd54e Fixed clippy issues 2020-07-03 16:53:04 -04:00
Forest Anderson
34e3cb5eb5 Added spawning test dummy 2020-07-03 16:53:04 -04:00
Marcel Märtens
a0c4ffcda1 simple fmt in order to make the replacement commit as simple as possible 2020-07-03 13:11:44 +02:00
Marcel Märtens
c877fbe41b network layer switch, doing the stuff that might confict. 
- mostly its the message handling put now in a async wrapper
 - add some fixes to pass without warnings and make clippy happy
 - some network error handling is ignored, this can be improved but is no blocker
 2020-07-03 13:11:38 +02:00
Marcel Märtens
7ba36f6d42 doing a simple 1:1 swap out network coding 
this is the part which prob has less Merge conflics and is easy to rebase
the next commit will have prob alot of merge conflics
followed by a fmt commit
 2020-07-03 13:11:31 +02:00
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
Samuel Keiffer
1bd3fb55b5 Adds a command that allows a username to be added or removed from the whitelist 2020-06-30 12:21:36 +00:00
Ben Wallis
b929e4499f Fixed inventory full message when pressing the pickup item key in quick succession (#651) 2020-06-29 07:48:44 +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 #217

See merge request veloren/veloren!1043
 2020-06-28 14:35:39 +00:00
Monty Marz
cee6e1ae75 changed message type for motd 2020-06-28 16:04:55 +02:00
Forest Anderson
a11c69ec31 Fixed double login message 2020-06-28 09:47:48 -04:00
Monty Marz
533891939d remove unnecessary conversions to make clippy happy 2020-06-28 15:15:00 +02: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
550ad20ade Admin status added when registering; cargo fmt 2020-06-27 17:43:45 -04:00
CapsizeGlimmer
e25c149955 Chat bubble text shadows. Fix panic when re-joining a group or faction 2020-06-27 17:40:03 -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
3a65b76547 cargo fmt; changelog 2020-06-27 17:03:55 -04:00
CapsizeGlimmer
86969c8992 Implement chat mode icons in chat window 2020-06-27 17:03:30 -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
5f8907b5a7 Implement chat filtering for /say /region /group etc. 2020-06-27 17:03:30 -04:00
CapsizeGlimmer
54a3f7e442 Implement /join_group and /join_faction commands 2020-06-27 16:42:26 -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
17c2ec9dde Fmt, fixed chat-cli problem 2020-06-25 19:50:04 +01:00
Joshua Barretto
f2eff640b3 Added settings editing, set_motd command 2020-06-25 18:57:29 +01:00
Joshua Barretto
e64a71d34e Added MOTD on login, MOTD editing 2020-06-25 18:57:26 +01: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 veloren/veloren!1075
 2020-06-25 16:16:15 +00:00
Songtronix
ce5b2b9ffc feat: add server whitelist 2020-06-24 17:36:19 +02:00