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

1189 Commits

Author SHA1 Message Date
Marcel
93bba77b2e Merge branch 'xMAC94x/network-switch' into 'master' 
xmac94x/network switch

See merge request veloren/veloren!1139
 2020-07-03 17:13:58 +00:00
Samuel Keiffer
c745b3abfd Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00: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
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
3342e5293b Merge branch 'scott-c/daggers' into 'master' 
Scott-c/1h-wielding #185

See merge request veloren/veloren!1095
 2020-07-01 12:07:35 +00:00
scott-c
3d6a4ae462 Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Marcel Märtens
e9e8d48a6e fix clippy issues in tests and add it to CI 2020-07-01 00:37:15 +02: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
Forest Anderson
3474222f07 Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master' 
Moved sfx from common to voxygen

See merge request veloren/veloren!1125
 2020-06-28 18:38:25 +00:00
Forest Anderson
74f668f0b6 Merge branch 'yusdacra/crate2nix' into 'master' 
nix: Switch to crate2nix for building, and niv for dependency management

See merge request veloren/veloren!1090
 2020-06-28 18:28:29 +00:00
Ben Wallis
1abf25ca71 Moved sfx from common to voxygen 2020-06-28 18:16:22 +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
Joshua Barretto
7eeb22a7b3 Merge branch 'xvar/loot-pickup-msgs' into 'master' 
Implemented loot pickup chat messages (#616) and the option for playing different sounds for picked up items

See merge request veloren/veloren!1118
 2020-06-28 12:34:58 +00: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
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
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
Pfauenauge90
aaf8aaca13 icons 2020-06-27 17:20:26 -04:00
Pfauenauge90
8be76d0dd9 bubble colors 2020-06-27 17:20:26 -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
01e7438d66 fix chat-cli name formatting. 2020-06-27 17:20:26 -04:00
Delyth Williams
87d81c42fe Fix sprites w/o models 2020-06-27 21:08:21 +00:00
CapsizeGlimmer
f7be000e39 Added chat mode icons to speech bubbles 2020-06-27 17:03:30 -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
Delyth Williams
c4c8235c6b Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
0ff533b149 Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' 
Added fluffy jackalope slippers

See merge request veloren/veloren!1114
 2020-06-25 22:07:47 +00:00
Monty Marz
508d23c4db Merge branch 'WelshPixie/grassets' into 'master' 
Welsh pixie/grassets

See merge request veloren/veloren!1106
 2020-06-25 21:12:31 +00:00
Delyth Williams
d646a07ee6 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
Monty Marz
5505176baf Merge branch 'WelshPixie/spaulders' into 'master' 
added seven new shoulder armour types

See merge request veloren/veloren!1115
 2020-06-25 20:50:06 +00:00
WelshPixie
bdec773d29 Added fluffy jackalope slippers 2020-06-25 22:47:17 +02: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
WelshPixie
126c93d72b added seven new shoulder armour types 2020-06-25 18:36:24 +02: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