Joshua Yanovski
4e02024670
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-07-04 16:17:40 +02:00
Joshua Yanovski
50a64d927e
Fix far plane.
2020-07-04 13:07:03 +02:00
Marcel
1f05446ce6
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
85d1d4b3ff
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
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
95a799cf85
fix artifacts, cleanup
2020-07-03 12:17:55 +02:00
Joshua Yanovski
618a18c998
Adding shadows, greedy meshing, and more.
2020-07-02 22:10:22 +02:00
Monty Marz
89400264dc
Loot ChatType, Update german translation, map zooming
2020-07-01 19:05:44 +00:00
Marcel
f9a7dbaa77
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
d53b51954b
Added ability to use 2 x 1h weapons or shields
2020-07-01 17:51:06 +08:00
Marcel Märtens
e1b27c51f5
fix clippy issues in tests and add it to CI
2020-07-01 00:37:15 +02:00
Kevin Glasson
bb5d91edca
Use find folder to locate debug dir
2020-06-30 18:54:42 +08:00
Kevin Glasson
2a42949df1
Refactor hot reloading
...
- Remove conditional compilation in regards to the copying of an
`_active` file so that the behaviour is the same accross all
platforms.
- Simplify code slightly.
- Add documentation.
2020-06-30 18:54:42 +08:00
unknown
7f02fa8132
Fixed glider animation so glider does not block view in first person.
2020-06-28 16:47:31 -04:00
Ben Wallis
dc1844b489
Moved sfx from common to voxygen
2020-06-28 18:16:22 +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
Joshua Barretto
1d06df9d79
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
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
Joshua Barretto
41b03208cb
Merge branch 'xvar/mouse-button-names' into 'master'
...
Fixed long mouse button names overflowing hotbar slots (#637 )
See merge request veloren/veloren!1120
2020-06-28 11:11:29 +00: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
92127292d4
Added option to disable speech bubble icons. Aligned settings>gameplay menu again.
2020-06-27 17:40:03 -04:00
Monty Marz
a204072e78
fix
2020-06-27 17:40:03 -04:00
Monty Marz
3ed646b512
icon frame
2020-06-27 17:40:03 -04:00
Monty Marz
0969c236d6
fix dark bubble tail not being displayed correctly
2020-06-27 17:40:03 -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
Pfauenauge90
a497fb92d3
icons
2020-06-27 17:20:26 -04:00
Pfauenauge90
f83c58498f
bubble colors
2020-06-27 17:20:26 -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
aabf9d7b21
fix chat-cli name formatting.
2020-06-27 17:20:26 -04:00
Delyth Williams
6644375764
Fix sprites w/o models
2020-06-27 21:08:21 +00:00
CapsizeGlimmer
2a0f0053d4
Added chat mode icons to speech bubbles
2020-06-27 17:03:30 -04:00
CapsizeGlimmer
35ed03aa18
Implement chat mode icons in chat window
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
Ben Wallis
8434957d01
Fixed long mouse button names overflowing hotbar slots ( #637 )
2020-06-27 20:48:10 +01:00
Delyth Williams
94164b7839
Welsh pixie/armour
2020-06-26 16:26:00 +00:00
Delyth Williams
9a79101f57
Welsh pixie/grassets
2020-06-25 21:12:31 +00:00
Joshua Barretto
b46e080ade
Added server-side maximum view distance setting
2020-06-25 18:46:04 +01:00
Imbris
6501611372
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