Joshua Barretto
fd39ee97bc
Added training dummies
2020-07-05 16:15:51 +01:00
Joshua Barretto
92c9db5291
Made fluids block explosions
2020-07-05 16:15:51 +01:00
Joshua Barretto
38c422bef7
Added bombs to loot table
2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a
Added bombs, throwable items, more block kinds, weaker explosions
2020-07-05 16:15:48 +01:00
Marcel
2a7a8b05e6
Merge branch 'network-lockless' into 'master'
...
Network lockless
See merge request veloren/veloren!1153
2020-07-05 09:17:29 +00:00
Forest Anderson
7ac5876743
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
3e830aa0ca
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
27440e16c4
Correctly load the loot table
2020-07-04 18:40:23 +02:00
Ben Wallis
538598eb08
Refactored Skills/SkillGroups structure and implemented JSON persistence
2020-07-04 15:25:21 +01:00
Piotr Korgól
aefa7e2f11
Make chests and enemies use the basic loot table
2020-07-04 14:07:10 +02:00
Marcel Märtens
cbfd398035
remove Mutex in server as Stream is now 'Sync'
2020-07-04 12:31:59 +02:00
Forest Anderson
954a4857c4
Added proper training dummy model
2020-07-03 16:53:04 -04:00
Forest Anderson
c525358637
Prevent xp gain from training dummy kill
2020-07-03 16:53:04 -04:00
Forest Anderson
6140555e43
Fixed clippy issues
2020-07-03 16:53:04 -04:00
Forest Anderson
e73ec7a4d2
Added spawning test dummy
2020-07-03 16:53:04 -04:00
Marcel Märtens
15ff58cd6a
simple fmt in order to make the replacement commit as simple as possible
2020-07-03 13:11:44 +02:00
Marcel Märtens
4e92c0160e
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
77c90b2c7c
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
89400264dc
Loot ChatType, Update german translation, map zooming
2020-07-01 19:05:44 +00:00
Marcel Märtens
6535fa5744
fix various clippy issues
2020-07-01 00:37:06 +02:00
Samuel Keiffer
44203ab817
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
48a23e5f4c
Fixed inventory full message when pressing the pickup item key in quick succession ( #651 )
2020-06-29 07:48:44 +01:00
Forest Anderson
201f513737
Fixed meta chattype error on master
2020-06-28 17:10:01 +00:00
Forest Anderson
9246e34c1b
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
f3a84e07a7
changed message type for motd
2020-06-28 16:04:55 +02:00
Forest Anderson
48f70bd088
Fixed double login message
2020-06-28 09:47:48 -04:00
Monty Marz
670d9e8736
remove unnecessary conversions to make clippy happy
2020-06-28 15:15:00 +02:00
Ben Wallis
a9d3f984f0
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
2665159790
Fixing errors after rebase
2020-06-27 19:12:12 -04:00
CapsizeGlimmer
883d9acf30
cargo fmt
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
3d29c3254a
Add setting for displaying character names in chat. Placate cargo clippy.
2020-06-27 17:43:46 -04:00
CapsizeGlimmer
59db2fcd3b
Admin status added when registering; cargo fmt
2020-06-27 17:43:45 -04:00
CapsizeGlimmer
2d2aba3a5d
Chat bubble text shadows. Fix panic when re-joining a group or faction
2020-06-27 17:40:03 -04:00
CapsizeGlimmer
b04810cae5
misc chat mode changes
2020-06-27 17:40:03 -04:00
CapsizeGlimmer
5ad212b7ed
Add chat types for offline, online. Implement Pfau's fixes
2020-06-27 17:40:03 -04:00
CapsizeGlimmer
b7d7696d89
Implement MR!1043 changes suggested by Imbris
2020-06-27 17:20:26 -04:00
CapsizeGlimmer
34acc4ddf3
Players are removed from social menu when logged out.
2020-06-27 17:20:26 -04:00
CapsizeGlimmer
4117f2f2a8
cargo fmt; changelog
2020-06-27 17:03:55 -04:00
CapsizeGlimmer
35ed03aa18
Implement chat mode icons in chat window
2020-06-27 17:03:30 -04:00
CapsizeGlimmer
22315a6e1d
Added shortcut for chat commands /g=>/group, /s=>/say, /w=>/world, etc.
2020-06-27 17:03:30 -04:00
CapsizeGlimmer
c984bdcdf1
Implement chat filtering for /say /region /group etc.
2020-06-27 17:03:30 -04:00
CapsizeGlimmer
5cbecb29e6
Implement /join_group and /join_faction commands
2020-06-27 16:42:26 -04:00
CapsizeGlimmer
289ef5d6b2
Move message processing and chat bubbles to the client
2020-06-27 16:42:26 -04:00
CapsizeGlimmer
0b2a3ebe8b
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
b08d717eac
Rework chat processing
2020-06-27 16:29:03 -04:00
CapsizeGlimmer
702a21302c
Base implementation of /group /faction /say /region
2020-06-27 16:26:02 -04:00
Joshua Barretto
1cca7bf4a8
Fmt, fixed chat-cli problem
2020-06-25 19:50:04 +01:00
Joshua Barretto
d9cd37056d
Added settings editing, set_motd command
2020-06-25 18:57:29 +01:00
Joshua Barretto
83a96c24ec
Added MOTD on login, MOTD editing
2020-06-25 18:57:26 +01:00
Joshua Barretto
b46e080ade
Added server-side maximum view distance setting
2020-06-25 18:46:04 +01:00
