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
Avi Weinstock
9d4a65e8ac
Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.
2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa
icons and naming
2021-06-13 14:34:42 -04:00
Avi Weinstock
43b6780c98
Address MR 2406 comments.
...
- Tweak ore xp values per Slipped's advice.
2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de
Mining skill tree.
2021-06-13 14:34:42 -04:00
Marcel
830b6e802e
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): fix nix builds
See merge request veloren/veloren!2437
2021-06-13 17:11:52 +00:00
Yusuf Bera Ertan
e27a6fcaa1
build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs
2021-06-13 19:33:38 +03:00
Yusuf Bera Ertan
27216d9a5e
build(nix): dont try to compile the recipe_graphviz binary
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
ffad3a5f66
build(nix): dont try to compile i18n-check binary
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
fd480fdfbc
build(nix): fix shaderc lib
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
faf5b3fc9c
chore(deps): update nix flake deps
2021-06-13 19:29:28 +03:00
Marcel
53378929e5
Merge branch 'xMAC94x/flakytests' into 'master'
...
redo slowjobs, fixed #1056
Closes #1056
See merge request veloren/veloren!2063
2021-06-13 16:10:09 +00:00
Marcel Märtens
34f5ff62d4
implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling
2021-06-13 17:42:28 +02:00
Marcel Märtens
e2a9128976
redo slowjobs in order to have a try_run fn
2021-06-13 17:42:21 +02:00
Marcel Märtens
5f2b44002e
make test less flanky, try to avoid absolute comparisions and compare jobs relative.
2021-06-13 17:31:34 +02:00
K. Kisa
883297d4cc
Upload New File
2021-06-13 13:30:42 +00:00
K. Kisa
acb0589277
Полный перевод на русский язык
2021-06-13 13:24:57 +00:00
K. Kisa
2e305744fe
Не полный перевод навыков, исправлены оригинальные описания и названия.
2021-06-13 13:08:52 +00:00
Monty
c17e3ad996
Cactus Colada
...
Made cacti lootable
Cactus colada recipe and item
price balance
fmt
"make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
Marcel
278b64deab
Merge branch 'juliancoffee/item_price_split_consumables' into 'master'
...
Split consumables to different tables in trading
See merge request veloren/veloren!2415
2021-06-13 11:29:47 +00:00
Marcel
e987f9ae10
Merge branch 'xvar/fix-backpack-swap' into 'master'
...
Fixed crash when swapping an equipped item with slots for an item with no slots
See merge request veloren/veloren!2430
2021-06-13 11:16:03 +00:00
Ben Wallis
f47838ee9d
Improved inventory swap
2021-06-12 19:06:39 +01:00
Avi Weinstock
d02ff2db20
Don't apply e2e pushback during a forced movement character state.
2021-06-12 11:10:06 -04:00
