Snowram
c7df12d2ea
Set new lion model offsets, fix some jaws
2020-07-05 09:38:13 -04:00
unknown
4b493b196c
Add asp mob
2020-07-05 09:38:13 -04:00
jshipsey
59777ee688
more quadmed run work
2020-07-05 09:38:13 -04:00
jshipsey
e362749fc7
more progress on on quad_med run
2020-07-05 09:38:13 -04:00
jshipsey
9f45d5525d
tarasque work
2020-07-05 09:38:12 -04:00
Snowram
1ffefde739
Run anim progress
2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4
Tiger offsets, lion new model
2020-07-05 09:38:12 -04:00
jshipsey
967343ced6
finished quadlow run, positioning work on quadmed
2020-07-05 09:38:12 -04:00
Snowram
390f516e13
Homogenizes quadmed bones names
2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14
Add tiger mob
2020-07-05 09:38:12 -04:00
jshipsey
76354aa3cf
small placement tweaks
2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269
starting run anim
2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd
manifests, skeleton, basic placement
2020-07-05 09:38:12 -04:00
Snowram
c527484597
Add alligator, salamander and monitor npcs
2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a
Remove quad_low mobs from quad_medium
2020-07-05 09:38:12 -04:00
Snowram
fe1656931c
Add legs to quadruped_medium
2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5
Add quadruped_low skeleton
2020-07-05 09:38:11 -04: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
Marcel Märtens
fe47b11345
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
e7195b57ad
extend network with better Error codes for Network
2020-07-04 12:32:52 +02:00
Forest Anderson
954a4857c4
Added proper training dummy model
2020-07-03 16:53:04 -04: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
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
