jshipsey
c0c86a74dc
more quadmed run work
2020-07-05 09:38:13 -04:00
jshipsey
549793faef
more progress on on quad_med run
2020-07-05 09:38:13 -04:00
jshipsey
8c43c958a7
tarasque work
2020-07-05 09:38:12 -04:00
Snowram
b7b209627c
Run anim progress
2020-07-05 09:38:12 -04:00
Snowram
1548b3a167
Tiger offsets, lion new model
2020-07-05 09:38:12 -04:00
jshipsey
657c477eea
finished quadlow run, positioning work on quadmed
2020-07-05 09:38:12 -04:00
Snowram
bcaea3a52f
Homogenizes quadmed bones names
2020-07-05 09:38:12 -04:00
Snowram
12ca502a1d
Add tiger mob
2020-07-05 09:38:12 -04:00
jshipsey
5e2aa81aba
small placement tweaks
2020-07-05 09:38:12 -04:00
jshipsey
3d936e6872
starting run anim
2020-07-05 09:38:12 -04:00
jshipsey
cdb91e95c1
manifests, skeleton, basic placement
2020-07-05 09:38:12 -04:00
Snowram
955e348a53
Add alligator, salamander and monitor npcs
2020-07-05 09:38:12 -04:00
Snowram
6e0e3d094f
Remove quad_low mobs from quad_medium
2020-07-05 09:38:12 -04:00
Snowram
e08e9b8a9a
Add legs to quadruped_medium
2020-07-05 09:38:12 -04:00
Snowram
6b6e9d5c8d
Add quadruped_low skeleton
2020-07-05 09:38:11 -04: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
Marcel Märtens
cb74e3822b
instead of trying to connect for 80 minutes, just try 4 mins, added Changelog
2020-07-04 12:37:50 +02:00
Marcel Märtens
1d93b1d682
extend network with better Error codes for Network
2020-07-04 12:32:52 +02:00
Forest Anderson
30d8f03e7b
Added proper training dummy model
2020-07-03 16:53:04 -04:00
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
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
2152737f18
fix artifacts, cleanup
2020-07-03 12:17:55 +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
Kevin Glasson
e281fb6af2
Use find folder to locate debug dir
2020-06-30 18:54:42 +08:00
Kevin Glasson
0df1b177f7
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
d88b849150
Fixed glider animation so glider does not block view in first person.
2020-06-28 16:47:31 -04: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
Joshua Barretto
2c1c00a7be
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
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
b985531e59
Added option to disable speech bubble icons. Aligned settings>gameplay menu again.
2020-06-27 17:40:03 -04:00
Monty Marz
edaf32b393
fix
2020-06-27 17:40:03 -04:00
Monty Marz
142a92fca8
icon frame
2020-06-27 17:40:03 -04:00
Monty Marz
69cb03a6be
fix dark bubble tail not being displayed correctly
2020-06-27 17:40:03 -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
Pfauenauge90
aaf8aaca13
icons
2020-06-27 17:20:26 -04:00
Pfauenauge90
8be76d0dd9
bubble colors
2020-06-27 17:20:26 -04:00
