Marcel Märtens
b02f8428fb
fix clippy after toolchain update
2020-10-26 22:30:51 +01:00
Marcel
5b50819436
Merge branch 'xMAC94x/fix-tarpaulin' into 'master'
...
xMAC94x/fixTarpaulin
See merge request veloren/veloren!1427
2020-10-26 16:54:37 +00:00
Marcel Märtens
27cf6d8439
Fixing Tarpaulin isn't easy.
...
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
- need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
- use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
- update conrod to use modern copypasta 0.7
- use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
- adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
It was called `convert_event`
- make a `simd` feature which is default and introduce conditional compiling.
AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
- tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-10-26 17:04:20 +01:00
Samuel Keiffer
31021d5f87
Merge branch 'bbenton91/fix-item-pickup-when-dead' into 'master'
...
Fix for issue #809 . Added is_dead check to item pickup
See merge request veloren/veloren!1453
2020-10-25 22:27:30 +00:00
Brad
08c74d1322
Removed else branch and ran fmt and clippy
2020-10-25 16:43:07 -04:00
Brad
29daae6cc2
Updated code to be more consistent with codebase
2020-10-25 15:54:08 -04:00
Brad
f7f1445b2a
Added is_dead check to item pickup
2020-10-25 03:40:34 -04:00
Imbris
127652c361
Merge branch 'imbris/fix' into 'master'
...
Fix crash with unicode characters
See merge request veloren/veloren!1452
2020-10-24 21:41:52 +00:00
Samuel Keiffer
24f42bbae2
Merge branch 'tweak-leap_melee' into 'master'
...
Ensure leap melee swing animation and hit are sync
See merge request veloren/veloren!1451
2020-10-24 20:15:19 +00:00
Adam Whitehurst
5efb7232bd
Ensure leap melee swing animation and hit are sync
2020-10-24 20:15:19 +00:00
Imbris
c83cb2707f
Fix crash with unicode characters
2020-10-24 16:03:53 -04:00
Marcel
d9e09e6604
Merge branch 'capucho/cli-scroll-fix' into 'master'
...
Fixed the server cli dropping new lines
See merge request veloren/veloren!1449
2020-10-24 14:27:33 +00:00
Capucho
a05bc46e32
Fixed the server cli dropping new lines
2020-10-23 20:30:33 +01:00
Imbris
2e12ef17e6
Merge branch 'nward/debug-hud-frame-time' into 'master'
...
Address issue #808 : Add Frame Time in DebugInfo
See merge request veloren/veloren!1448
2020-10-23 02:01:50 +00:00
NathanW
dd2fe90d94
Address issue #808 : Add Frame Time in DebugInfo
2020-10-22 16:42:10 -06:00
Forest Anderson
2751c171d6
Merge branch 'angel/add-dutch-translation' into 'master'
...
Added Dutch translation
See merge request veloren/veloren!1446
2020-10-22 18:09:52 +00:00
Joshua Barretto
e038491e9e
Merge branch 'zesterer/clouds' into 'master'
...
Clouds
See merge request veloren/veloren!1442
2020-10-21 21:05:26 +00:00
Joshua Barretto
b7215c9bf1
Clouds
2020-10-21 21:05:25 +00:00
Forest Anderson
114140abf2
More small fixes
2020-10-21 19:02:59 +00:00
Forest Anderson
173247d5f5
Some fixes by @Jurre
2020-10-21 18:45:00 +00:00
Forest Anderson
a1d5184e9e
Added Dutch translation, created by @Namp007
2020-10-21 13:39:36 -04:00
Justin Shipsey
0047af93cf
Merge branch 'snowram/beast-animation' into 'master'
...
Snowram/beast animation
See merge request veloren/veloren!1297
2020-10-19 15:59:18 +00:00
Marcel
c8b4b3c3f5
Merge branch 'xMAC94x/netfixC' into 'master'
...
xmac94x/netfixc
See merge request veloren/veloren!1440
2020-10-19 15:24:07 +00:00
jiminycrick
b78a75293b
Fixed hammer AI and added axe AI
2020-10-19 16:20:59 +02:00
Snowram
0cfa7d5c3e
Addressed comments
2020-10-19 16:20:59 +02:00
jiminycrick
4111fb117e
Addressed comments on agent code
2020-10-19 16:20:59 +02:00
jshipsey
e7079456c7
remove commented code
2020-10-19 16:20:59 +02:00
Snowram
4491996e9d
Add missing biped_large anims
2020-10-19 16:20:59 +02:00
jshipsey
3ab0385cea
bipedlarge hammer fixes
2020-10-19 16:20:59 +02:00
jshipsey
9503cf9cb9
roshwalr fix
2020-10-19 16:20:59 +02:00
jshipsey
c5e61f7d7c
small fixes
2020-10-19 16:20:59 +02:00
Snowram
f17ea65135
Add BeastClaw npc weapontype
2020-10-19 16:20:59 +02:00
Snowram
7ac662b82e
Add roshwalr npc
2020-10-19 16:20:59 +02:00
jiminycrick
23df57627d
fixed agent code for staff rework
2020-10-19 16:20:59 +02:00
jshipsey
dc3454cceb
rebase
2020-10-19 16:20:58 +02:00
Snowram
8d5742776f
Rename Saurok, various anim fixes
2020-10-19 16:20:58 +02:00
jshipsey
a2ee32140c
fix agent bug
2020-10-19 16:20:58 +02:00
jshipsey
f81a4446af
werewolf work
2020-10-19 16:20:58 +02:00
jiminycrick
ad5dd0b043
Added secondary skills to agent code (except bow)
2020-10-19 16:20:58 +02:00
Snowram
e2308ef96e
Add sand, snow and wood raptor npcs
2020-10-19 16:20:58 +02:00
Snowram
dbac820034
Add treant npc
2020-10-19 16:20:58 +02:00
Snowram
6bc72f7f0b
Standardizes character bone names
2020-10-19 16:20:58 +02:00
Snowram
472dc2b2b2
More bipedlarge anim work
2020-10-19 16:20:58 +02:00
Snowram
ca98fd6512
Add bipedlarge spin and beta anims
2020-10-19 16:20:58 +02:00
unknown
aac897d11b
Better bipedlarge weild, charge and shoot anims
2020-10-19 16:20:58 +02:00
unknown
5f1ff1de99
Assigns a ToolKind to bipedlarge weapons
2020-10-19 16:20:58 +02:00
jshipsey
11e9a0bb34
rebase fix
2020-10-19 16:20:58 +02:00
Snowram
996e295be6
add lizardman npcs
2020-10-19 16:20:58 +02:00
Snowram
f9884b8a56
Add beast attributes
2020-10-19 16:20:57 +02:00
Snowram
feef00dc5d
Improve bipedlarge beast walk animation
2020-10-19 16:20:57 +02:00
