Commits · master · Diaeresis / veloren · GitLab

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
- chore(deps): update nix flake deps · faf5b3fc
  dusk authored Jun 13, 2021
  
  faf5b3fc
- Merge branch 'xMAC94x/flakytests' into 'master' · 53378929
  Marcel authored Jun 13, 2021
  53378929
- implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling · 34f5ff62
  Marcel authored May 21, 2021
  
  34f5ff62
- redo slowjobs in order to have a `try_run` fn · e2a91289
  Marcel authored Apr 12, 2021
  
  e2a91289
- make test less flanky, try to avoid absolute comparisions and compare jobs relative. · 5f2b4400
  Marcel authored Apr 05, 2021
  
  5f2b4400
- Upload New File · 883297d4
  K. Kisa authored Jun 13, 2021
  
  883297d4
- Полный перевод на русский язык · acb05892
  K. Kisa authored Jun 13, 2021
  
  acb05892
- Не полный перевод навыков, исправлены оригинальные описания и названия. · 2e305744
  K. Kisa authored Jun 13, 2021
  
  2e305744
- Cactus Colada · c17e3ad9
  Monty Marz authored Jun 13, 2021
  c17e3ad9
- Merge branch 'juliancoffee/item_price_split_consumables' into 'master' · 278b64de
  Marcel authored Jun 13, 2021
  278b64de
- Merge branch 'xvar/fix-backpack-swap' into 'master' · e987f9ae
  Marcel authored Jun 13, 2021
  e987f9ae
Jun 12, 2021
- Improved inventory swap · f47838ee
  Ben Wallis authored Jun 12, 2021
  
  f47838ee
- Don't apply e2e pushback during a forced movement character state. · d02ff2db
  Avi Weinstock authored Jun 12, 2021
  
  d02ff2db
- Merge branch 'xMAC94x/release_numbers' into 'master' · cf2bdb20
  Marcel authored Jun 12, 2021
  View commits for tag v0.10.0 v0.10.0
  cf2bdb20
- Change the version number to 0.10 · 4167621f
  Marcel authored Jun 12, 2021
  
  4167621f
Jun 11, 2021
- Merge branch 'juliancoffee/small_fixes' into 'master' · f578c56d
  Forest Anderson authored Jun 11, 2021
  f578c56d