Commits · master · Jesus Bracho / veloren · GitLab

Jan 18, 2021
- Merge branch 'friendly-auras' into 'master' · 1312dc92
  Samuel Keiffer authored Jan 18, 2021
  1312dc92
- Set up aura filtering · 42679201
  Jesus Bracho authored Jan 18, 2021 and Samuel Keiffer committed Jan 18, 2021
  
  42679201
- Merge branch 'provide-buff-information-on-killed-entities' into 'master' · 1dd47bc6
  Samuel Keiffer authored Jan 18, 2021
  1dd47bc6
- Provide buff information on killed entities · ec798903
  Jesus Bracho authored Jan 18, 2021 and Samuel Keiffer committed Jan 18, 2021
  
  ec798903
Jan 15, 2021
- Merge branch 'ubruntu/bird-pathing' into 'master' · 16c865ac
  Joshua Barretto authored Jan 15, 2021
  16c865ac
- Slightly better bird pathing · 74d17ff4
  ubruntu authored Jan 15, 2021 and Joshua Barretto committed Jan 15, 2021
  
  74d17ff4
Jan 14, 2021
- Merge branch 'mailmap' into 'master' · c54aa354
  LunarEclipse authored Jan 14, 2021
  c54aa354
- Added a `.mailmap` file to unify my name in commits made with my email address · 331f19dd
  LunarEclipse authored Jan 15, 2021
  
  331f19dd
- Merge branch 'acrimon/925-campfire-fix' into 'master' · 69476f46
  Acrimon authored Jan 14, 2021
  69476f46
- Merge branch 'xMAC94x/remove_cargo_check' into 'master' · 0ce08906
  Marcel authored Jan 14, 2021
  0ce08906
- Merge branch 'master' into 'master' · c5e3828c
  Acrimon authored Jan 14, 2021
  c5e3828c
- fix #925 · ceae51b0
  Acrimon authored Jan 14, 2021
  
  ceae51b0
- use `--all-targets` which is the same as before AND `--lib`. · 0826707b
  Marcel authored Jan 14, 2021
  0826707b
Jan 13, 2021
- fix clippy in all examples. · 6390e758
  Marcel authored Jan 13, 2021
  6390e758
- After some discussion with XVar, Song and Yakei we found out that `cargo... · 68be4671
  Marcel authored Jan 13, 2021
  68be4671
Jan 12, 2021
- Merge branch 'xMAC94x/fix-cache-check' into 'master' · 11deb97d
  Marcel authored Jan 12, 2021
  11deb97d
- running `cargo check` with -D warnings seems to trigger a complete cache invalidation. · a3351be2
  Marcel authored Jan 12, 2021
  a3351be2
Jan 10, 2021
- Merge branch 'ccgauche/fix-test-for-plugins' into 'master' · 8539b67d
  Joshua Barretto authored Jan 10, 2021
  8539b67d
- Fixed tests on WIndows due to target arch wasm32 · 19eb7d18
  ccgauche authored Jan 10, 2021
  
  19eb7d18
- Merge branch 'xvar/inventory-followup' into 'master' · 109a76e1
  Ben Wallis authored Jan 10, 2021
  109a76e1
- Follow-up fixes from review of inventory MR · c785e75e
  Ben Wallis authored Jan 09, 2021
  
  c785e75e
Jan 09, 2021
- Merge branch 'pfau/hotfix-drops' into 'master' · 9f7ccbb2
  Monty Marz authored Jan 09, 2021
  9f7ccbb2
- fix loot tables, enemy bar color change · 06e7ac25
  Monty Marz authored Jan 09, 2021
  
  06e7ac25
- Merge branch 'xvar/fix-stackable-item-pickup' into 'master' · 3d46d518
  Joshua Barretto authored Jan 09, 2021
  3d46d518
Jan 08, 2021
- Fixed a bug which prevented picking up stackable items with a full inventory · d7cbf479
  Ben Wallis authored Jan 08, 2021
  
  d7cbf479
- Merge branch 'swilliams/camera_smooth_default' into 'master' · 4507ebda
  Imbris authored Jan 08, 2021
  4507ebda
- Changed default option to false for smooth_pan_enable. · c09098ee
  Scott Williams authored Jan 08, 2021 and Imbris committed Jan 08, 2021
  
  c09098ee
- Merge branch 'xvar/item-storage' into 'master' · fcdeca34
  Ben Wallis authored Jan 08, 2021
  fcdeca34
- Refactored loadout to have public functions for each slot instead of requiring... · aef26372
  Ben Wallis authored Jan 08, 2021
  aef26372
- Merge branch 'ccgauche/wasmer1.0.0' into 'master' · 9deeefbd
  Joshua Barretto authored Jan 08, 2021
  9deeefbd
- Update lock · 885c0b3b
  ccgauche authored Jan 08, 2021
  
  885c0b3b
- Updated changelog · 7ab85a8d
  ccgauche authored Jan 08, 2021
  
  7ab85a8d
- updated to wasmer 1.0.0 · 5ff2f5bc
  ccgauche authored Jan 08, 2021
  5ff2f5bc
- Merge branch 'ccgauche/new-wasmer-backend' into 'master' · 16046167
  Joshua Barretto authored Jan 08, 2021
  16046167
- Added feature flag · 06ffe612
  ccgauche authored Jan 08, 2021 and Joshua Barretto committed Jan 08, 2021
  06ffe612
- Merge branch 'imbris/switch-wheel-event' into 'master' · 88f994b2
  Imbris authored Jan 08, 2021
  88f994b2
- Move to WindowEvent from DeviceEvent for zooming · 58ec4760
  Imbris authored Dec 18, 2020
  
  58ec4760
Jan 07, 2021
- Merge branch 'zesterer/better-flagged-storage' into 'master' · d35f31b9
  Marcel authored Jan 07, 2021
  d35f31b9
- fixed Cargo.lock conflict · a4b9230f
  Joshua Barretto authored Jan 07, 2021 and Marcel committed Jan 07, 2021
  a4b9230f
Jan 05, 2021
- Merge branch 'james/dependency-dupes' into 'master' · 1d55dbd2
  Joshua Barretto authored Jan 05, 2021
  1d55dbd2