Marcel
82d2859e92
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
153c6c3b13
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
35ff4b7b84
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
071ce08b69
Removed else branch and ran fmt and clippy
2020-10-25 16:43:07 -04:00
Brad
cfbdbf14aa
Updated code to be more consistent with codebase
2020-10-25 15:54:08 -04:00
Brad
11f747cc5f
Added is_dead check to item pickup
2020-10-25 03:40:34 -04:00
Imbris
4a7eb7f786
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
39feb6baa1
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
4dcac28f8a
Ensure leap melee swing animation and hit are sync
2020-10-24 20:15:19 +00:00
Imbris
2be87f6ea8
Fix crash with unicode characters
2020-10-24 16:03:53 -04:00
Marcel
26d174fd81
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
e77cc3eae2
Fixed the server cli dropping new lines
2020-10-23 20:30:33 +01:00
Imbris
20ee9c77f6
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
7e92e21f8b
Address issue #808 : Add Frame Time in DebugInfo
2020-10-22 16:42:10 -06:00
Forest Anderson
14b5d01af3
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
ff57d2a79d
Merge branch 'zesterer/clouds' into 'master'
...
Clouds
See merge request veloren/veloren!1442
2020-10-21 21:05:26 +00:00
Joshua Barretto
2237500743
Clouds
2020-10-21 21:05:25 +00:00
Forest Anderson
709cef2665
More small fixes
2020-10-21 19:02:59 +00:00
Forest Anderson
4d22b93863
Some fixes by @Jurre
2020-10-21 18:45:00 +00:00
Forest Anderson
f79e13135e
Added Dutch translation, created by @Namp007
2020-10-21 13:39:36 -04:00
Justin Shipsey
9d19a2ec63
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
da7a3454bf
Merge branch 'xMAC94x/netfixC' into 'master'
...
xmac94x/netfixc
See merge request veloren/veloren!1440
2020-10-19 15:24:07 +00:00
jiminycrick
b98e2a924d
Fixed hammer AI and added axe AI
2020-10-19 16:20:59 +02:00
Snowram
34ce8bb042
Addressed comments
2020-10-19 16:20:59 +02:00
jiminycrick
64ef7f39d6
Addressed comments on agent code
2020-10-19 16:20:59 +02:00
jshipsey
c74133740e
remove commented code
2020-10-19 16:20:59 +02:00
Snowram
d5e60d93b4
Add missing biped_large anims
2020-10-19 16:20:59 +02:00
jshipsey
9c003cf572
bipedlarge hammer fixes
2020-10-19 16:20:59 +02:00
jshipsey
64d73abdec
roshwalr fix
2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5
small fixes
2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f
Add BeastClaw npc weapontype
2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8
Add roshwalr npc
2020-10-19 16:20:59 +02:00
jiminycrick
be1596a703
fixed agent code for staff rework
2020-10-19 16:20:59 +02:00
jshipsey
66b1fe67dc
rebase
2020-10-19 16:20:58 +02:00
Snowram
c9985e14cb
Rename Saurok, various anim fixes
2020-10-19 16:20:58 +02:00
jshipsey
6a86567301
fix agent bug
2020-10-19 16:20:58 +02:00
jshipsey
65df398672
werewolf work
2020-10-19 16:20:58 +02:00
jiminycrick
50aac17d94
Added secondary skills to agent code (except bow)
2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe
Add sand, snow and wood raptor npcs
2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee
Add treant npc
2020-10-19 16:20:58 +02:00
Snowram
290adcfad8
Standardizes character bone names
2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad
More bipedlarge anim work
2020-10-19 16:20:58 +02:00
Snowram
c1c2c9dc07
Add bipedlarge spin and beta anims
2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4
Better bipedlarge weild, charge and shoot anims
2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0
Assigns a ToolKind to bipedlarge weapons
2020-10-19 16:20:58 +02:00
jshipsey
0e628ef67f
rebase fix
2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7
add lizardman npcs
2020-10-19 16:20:58 +02:00
Snowram
4dcd450382
Add beast attributes
2020-10-19 16:20:57 +02:00
Snowram
a4f4fa38e2
Improve bipedlarge beast walk animation
2020-10-19 16:20:57 +02:00
Snowram
f4a068c422
Initial bipedlarge beast walk animation
2020-10-19 16:20:57 +02:00
