Commits · master · Zakru / veloren · GitLab

Jun 15, 2021
- Merge branch 'juliancoffee/i18n_tests' into 'master' · ad92d4de
  Marcel authored Jun 15, 2021
  ad92d4de
- Merge branch 'veloren/veloren/master' into 'master' · f1f3a625
  Marcel authored Jun 15, 2021
  f1f3a625
- Veloren/veloren/master · fbb34b73
  K. Kisa authored Jun 15, 2021 and Marcel committed Jun 15, 2021
  
  fbb34b73
- Panic if can't parse file · 3f176ca0
  Illia Denysenko authored Jun 15, 2021
  
  3f176ca0
- Merge branch 'snowram/more-trolls' into 'master' · 8fde0021
  Snowram authored Jun 15, 2021
  8fde0021
- Merge branch 'imbris/resize-tweaks' into 'master' · a41c7a9a
  Imbris authored Jun 15, 2021
  a41c7a9a
- Addresses comments about roc AI · 8351aab2
  Snowram authored Jun 15, 2021 and Robin Gilh committed Jun 15, 2021
  
  8351aab2
- Makes summon range inclusive · f2c78361
  Snowram authored Jun 11, 2021 and Robin Gilh committed Jun 15, 2021
  
  f2c78361
- Make tornado (and empty models in general) work on WGPU. · cb056629
  Avi Weinstock authored Jun 03, 2021 and Robin Gilh committed Jun 15, 2021
  
  cb056629
- Tornado summoning attack · 3ba0500b
  Snowram authored Jun 04, 2021 and Robin Gilh committed Jun 15, 2021
  
  3ba0500b
- Add troll variants and roc npcs · 97ce50e5
  Snowram authored May 26, 2021 and Robin Gilh committed Jun 15, 2021
  
  97ce50e5
- [iced renderer] Skip content processing if the clip intersection is zero sized or invalid · f3657903
  Imbris authored Jun 15, 2021
  
  f3657903
- Fix trying to create a zero sized shadow texture when resizing window down to a small size · cbf0a6ba
  Imbris authored Jun 15, 2021
  
  cbf0a6ba
- Merge branch 'imbris/userdata-tweak' into 'master' · 11994b57
  Imbris authored Jun 15, 2021
  11994b57
- Merge branch 'juliancoffee/swing_fix' into 'master' · fec328a6
  Samuel Keiffer authored Jun 15, 2021
  fec328a6
- Fallback to executable strategy for the userdata rather than panicking when... · 6fe3a3c7
  Imbris authored Jun 14, 2021
  6fe3a3c7
Jun 14, 2021
- Merge branch 'aweinstock/hotfix-pick-icon' into 'master' · 109d87bf
  Marcel authored Jun 14, 2021
  109d87bf
- Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller. · c5f82b24
  Avi Weinstock authored Jun 14, 2021
  
  c5f82b24
- Merge branch 'dungeon_voxel_export' into 'master' · bc681688
  Marcel authored Jun 14, 2021
  bc681688
- Merge branch 'aweinstock/forcemove-no-pushback' into 'master' · 1b36f6ca
  Marcel authored Jun 14, 2021
  1b36f6ca
- Merge branch 'aweinstock/mining-skill-tree' into 'master' · 4cafdb3b
  Marcel authored Jun 14, 2021
  4cafdb3b
- Merge branch 'juliancoffee/asset_entity' into 'master' · b0702d79
  Marcel authored Jun 14, 2021
  b0702d79
- Added dungeon shape to MagicaVoxel export example · a77b156c
  SpecificProtagonist authored May 31, 2021
  
  a77b156c
- Responding to review · d5cbe276
  Illia Denysenko authored Jun 14, 2021
  d5cbe276
- Move force-movement e2e check so that it doesn't confer immunity to arrows. · 1af9ac56
  Avi Weinstock authored Jun 13, 2021
  
  1af9ac56
Jun 13, 2021
- Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' · 0ef6cc65
  Marcel authored Jun 13, 2021
  0ef6cc65
- Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' · 4ea189f0
  Marcel authored Jun 13, 2021
  4ea189f0
- Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' · f791f19e
  Marcel authored Jun 13, 2021
  f791f19e
- Merge branch 'pfau/cactus_drink' into 'master' · 068d78ba
  Monty Marz authored Jun 13, 2021
  068d78ba
- Move changelog entry for mining to 0.10 section. · 104de523
  Avi Weinstock authored Jun 13, 2021
  
  104de523
- mining exp sct color and icon; add mining to skill_preset · 45f79059
  Monty Marz authored Jun 10, 2021 and Avi Weinstock committed Jun 13, 2021
  
  45f79059
- Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. · 9d4a65e8
  Avi Weinstock authored Jun 09, 2021
  
  9d4a65e8
- icons and naming · 01a04a80
  Monty Marz authored Jun 09, 2021 and Avi Weinstock committed Jun 13, 2021
  
  01a04a80
- Address MR 2406 comments. · 43b6780c
  Avi Weinstock authored Jun 09, 2021
  43b6780c
- Mining skill tree. · 0e394029
  Avi Weinstock authored Jun 09, 2021
  
  0e394029
- Merge branch 'yusdacra/chore/nix' into 'master' · 830b6e80
  Marcel authored Jun 13, 2021
  830b6e80
- build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs · e27a6fca
  dusk authored Jun 13, 2021
  
  e27a6fca
- build(nix): dont try to compile the recipe_graphviz binary · 27216d9a
  dusk authored Jun 13, 2021
  
  27216d9a
- build(nix): dont try to compile i18n-check binary · ffad3a5f
  dusk authored Jun 13, 2021
  
  ffad3a5f
- build(nix): fix shaderc lib · fd480fdf
  dusk authored Jun 13, 2021
  
  fd480fdf