Imbris
8f429d532a
Add note on the reasoning for the visual position interpolation rate value in voxygen
2021-06-16 03:24:10 -04:00
Justin Shipsey
dd6b5ffa38
Merge branch 'karmicknight/swordspin_poise_damage' into 'master'
...
lowered spin.ron base poise damage to 13 from 25
See merge request veloren/veloren!2462
2021-06-16 06:17:30 +00:00
donovanlank
f26de7bbe9
lowered spin.ron base poise damage to 13 from 25
2021-06-15 22:26:45 -07:00
Imbris
02c974da52
Merge branch 'imbris/winit-0.25' into 'master'
...
Upgrade to winit 0.25
See merge request veloren/veloren!2449
2021-06-16 05:21:13 +00:00
Imbris
b7162ac15c
Upgrade to winit 0.25
2021-06-15 22:59:54 -04:00
Imbris
9d9c0a045d
Merge branch 'imbris/release-tweak' into 'master'
...
Add debug line tables and avoid building unwinding landing pads in release builds
See merge request veloren/veloren!2446
2021-06-16 02:17:49 +00:00
Imbris
3e79972061
Merge branch 'capucho/wgpu-format-fixes' into 'master'
...
Update wgpu and check for best swap chain format
See merge request veloren/veloren!2454
2021-06-16 01:24:05 +00:00
Imbris
e5f23eb41a
Add debug line tables and avoid building unwinding landing pads in release builds
2021-06-15 21:14:49 -04:00
Joshua Barretto
9ed788bb50
Merge branch 'revert-1a2f1127' into 'master'
...
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
See merge request veloren/veloren!2459
2021-06-15 22:51:32 +00:00
Snowram
b82dde2332
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
...
This reverts merge request !2457
2021-06-15 22:12:11 +00:00
Marcel
1a2f112729
Merge branch 'snowram/snappier-pos-interp' into 'master'
...
Double the speed factor of pos interp
See merge request veloren/veloren!2457
2021-06-15 20:52:22 +00:00
Snowram
4d3362586f
Double the speed factor of pos interp
2021-06-15 22:11:57 +02:00
Imbris
1ed6a04a34
Merge branch 'zakru/fix/1193' into 'master'
...
Avoid saving settings if maps are not updating
Closes #1193
See merge request veloren/veloren!2456
2021-06-15 19:55:14 +00:00
Imbris
343b35b9cd
Merge branch 'rodio014' into 'master'
...
bump rodio to 0.14
See merge request veloren/veloren!2443
2021-06-15 19:04:28 +00:00
Zakru
afc04ae22f
Fix settings not saving when zooming map with keys
2021-06-15 21:20:10 +03:00
Zakru
52c965fb6d
Avoid saving settings if maps are not updating
...
Fixes #1193
2021-06-15 21:19:52 +03:00
Marcel
ee26df5915
Merge branch 'snowram/fix-consumables-desc' into 'master'
...
Truncates consumables value to the first decimal place
See merge request veloren/veloren!2455
2021-06-15 18:13:27 +00:00
Snowram
84080607cd
Truncates consumables value to the first decimal place
2021-06-15 19:36:20 +02:00
Marcel
ad92d4deb0
Merge branch 'juliancoffee/i18n_tests' into 'master'
...
Panic in tests if can't parse i18n file
See merge request veloren/veloren!2453
2021-06-15 17:26:16 +00:00
Marcel
f1f3a625a4
Merge branch 'veloren/veloren/master' into 'master'
...
Veloren/veloren/master
See merge request veloren/veloren!2452
2021-06-15 16:36:41 +00:00
K. Kisa
fbb34b7331
Veloren/veloren/master
2021-06-15 16:36:41 +00:00
juliancoffee
3f176ca068
Panic if can't parse file
2021-06-15 19:15:17 +03:00
Snowram
8fde002189
Merge branch 'snowram/more-trolls' into 'master'
...
Add more trolls npcs, and roc npc with tornado attack
See merge request veloren/veloren!2384
2021-06-15 08:35:30 +00:00
Imbris
a41c7a9a5b
Merge branch 'imbris/resize-tweaks' into 'master'
...
Resize related tweaks
See merge request veloren/veloren!2448
2021-06-15 07:53:12 +00:00
Snowram
8351aab25d
Addresses comments about roc AI
2021-06-15 09:50:23 +02:00
Snowram
f2c7836161
Makes summon range inclusive
2021-06-15 09:49:13 +02:00
Avi Weinstock
cb0566299a
Make tornado (and empty models in general) work on WGPU.
2021-06-15 09:49:13 +02:00
Snowram
3ba0500b90
Tornado summoning attack
2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4
Add troll variants and roc npcs
2021-06-15 09:49:13 +02:00
Imbris
f3657903c9
[iced renderer] Skip content processing if the clip intersection is zero sized or invalid
2021-06-15 02:02:10 -04:00
Imbris
cbf0a6baf1
Fix trying to create a zero sized shadow texture when resizing window down to a small size
2021-06-15 01:53:00 -04:00
Imbris
11994b5735
Merge branch 'imbris/userdata-tweak' into 'master'
...
Fallback to executable strategy for the userdata rather than panicking when...
See merge request veloren/veloren!2445
2021-06-15 03:22:51 +00:00
Samuel Keiffer
fec328a617
Merge branch 'juliancoffee/swing_fix' into 'master'
...
Introduce hit_timing for combo_melee
See merge request veloren/veloren!2426
2021-06-15 02:38:23 +00:00
Imbris
6fe3a3c77f
Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder
2021-06-14 21:42:50 -04:00
asumface
8568dfb38e
Bump rodio to 0.14
2021-06-14 22:04:23 +02:00
Marcel
109d87bf81
Merge branch 'aweinstock/hotfix-pick-icon' into 'master'
...
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.
See merge request veloren/veloren!2442
2021-06-14 18:02:56 +00:00
Avi Weinstock
c5f82b241d
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.
2021-06-14 13:39:50 -04:00
Marcel
bc68168801
Merge branch 'dungeon_voxel_export' into 'master'
...
Add dungeon shape to MagicaVoxel export example
See merge request veloren/veloren!2412
2021-06-14 15:07:25 +00:00
Marcel
1b36f6cab3
Merge branch 'aweinstock/forcemove-no-pushback' into 'master'
...
Don't apply e2e pushback during a forced movement character state.
See merge request veloren/veloren!2429
2021-06-14 14:42:01 +00:00
Marcel
4cafdb3bfd
Merge branch 'aweinstock/mining-skill-tree' into 'master'
...
Mining skill tree.
See merge request veloren/veloren!2406
2021-06-14 14:19:06 +00:00
Marcel
b0702d792a
Merge branch 'juliancoffee/asset_entity' into 'master'
...
EntityInfo assetization.
See merge request veloren/veloren!2382
2021-06-14 12:56:28 +00:00
Vincent Junge
a77b156cd2
Added dungeon shape to MagicaVoxel export example
2021-06-14 14:43:00 +02:00
juliancoffee
d5cbe27612
Responding to review
...
- make `skillset_builder::Preset` void enum and left comment about how to
extend it
- add `.with_default_equipment()` in case if preset is missing to `basic_summon`
loadout creation to match old `build_loadout()` behaviour
2021-06-14 15:40:02 +03:00
Avi Weinstock
1af9ac568f
Move force-movement e2e check so that it doesn't confer immunity to arrows.
2021-06-13 20:38:03 -04:00
Marcel
0ef6cc6576
Merge branch 'Veloren_Kisa-master-patch-51169' into 'master'
...
Не полный перевод навыков, исправлены оригинальные описания и названия.
See merge request veloren/veloren!2432
2021-06-13 21:55:57 +00:00
Marcel
4ea189f056
Merge branch 'Veloren_Kisa-master-patch-14791' into 'master'
...
Полный перевод на русский язык
See merge request veloren/veloren!2434
2021-06-13 21:55:55 +00:00
Marcel
f791f19edb
Merge branch 'Veloren_Kisa-master-patch-17326' into 'master'
...
Upload New File
See merge request veloren/veloren!2435
2021-06-13 21:55:53 +00:00
Monty Marz
068d78bae8
Merge branch 'pfau/cactus_drink' into 'master'
...
Cactus Colada
See merge request veloren/veloren!2431
2021-06-13 20:03:58 +00:00
Avi Weinstock
104de523b7
Move changelog entry for mining to 0.10 section.
2021-06-13 14:35:44 -04:00
Monty Marz
45f79059d0
mining exp sct color and icon; add mining to skill_preset
2021-06-13 14:34:42 -04:00
