Branches

• master default protected

  39f5e969 · Merge branch 'update_deps' into 'master' · Mar 10, 2021
• updated_spanish_es_strings

  631fa9ac · Updated strings Added missing translations in Spanish es_ES and retrieving localized text · Mar 08, 2021
  veloren/veloren!1860
• xMAC94x/advanced_systems

  f353f147 · change Name from VSystem to System · Mar 08, 2021
• christof/trading_MVP

  40497930 · fix compilation with latest master · Mar 08, 2021
• imbris/wgpu-master-rebased

  35fa1af6 · Fix texture sampling syntax · Mar 07, 2021
• sam/sceptre-overhaul

  1217f78c · Sceptre skill tree and migration. · Mar 06, 2021
• snowram/items-infos

  ddf52a94 · Armour comparison · Mar 06, 2021
• sam/yeet-inputs

  5143c89f · Primary input now activated from control actions. · Mar 05, 2021
• imbris/worldgen

  c8a89385 · Town hall experiment · Mar 04, 2021
• james/sfx-outcomes

  0c0a80ae · Remove combat sfx mapper in favor of outcomes · Mar 03, 2021
• imbris/worldgen-exp

  270acedb · Experiment with helper trait · Mar 03, 2021
• slipped/poise

  c9a65690 · Merge branch 'snowram/fix-leatherset-objectlights' into 'master' · Mar 02, 2021
• aweinstock/itemsplitting-rebase

  40b0cf4f · MR 1802 review comments. · Mar 01, 2021
• xvar/equippeditems

  36856fab · x · Mar 01, 2021
• christof/trading_MVP_no_ci

  1243c69e · make a merchant carry as many coins as the stock of his site (demo) · Mar 01, 2021
• imbris/sync

  205d798f · temp · Feb 28, 2021
• xvar/switch-from-diesel-to-rusqlite

  f2ccff63 · Merge from master · Feb 28, 2021
• lboklin/cargo-override

  27228958 · Cargo.nix override instead of requiring manual intervention · Feb 28, 2021
• aweinstock/debug-lines-gfx-squashed

  5d2b9d67 · Implement a Debug pipeline for hitboxes and pathfinding lines. · Feb 24, 2021
• aweinstock/debug-lines-gfx

  fce68cb2 · Make debug cylinders work (angle calculation was off by a divide). Split... · Feb 24, 2021