Commits · master · Chris Polderman / veloren

Browse files

Dec 23, 2020
- Merge branch 'snowram/npcs-names-json-to-ron' into 'master' · be4d8a71
  Justin Shipsey authored Dec 23, 2020
  be4d8a71
- Merge branch 'entropy9s/irontyouforgettingsomething' into 'master' · e04fa481
  Monty Marz authored Dec 23, 2020
  e04fa481
Dec 22, 2020
- Converts npcs names file to ron · 3c1e1c67
  Snowram authored Dec 23, 2020
  
  3c1e1c67
- i am stupid and forgot iron ingots, whoops. · e62c77f4
  Entropy9s authored Dec 22, 2020
  
  e62c77f4
- Merge branch 'Frinksy/fix-buff-flickering' into 'master' · 4a8d8c2c
  Joshua Barretto authored Dec 22, 2020
  4a8d8c2c
- fixing #881 · 53d5a937
  Frinksy authored Dec 22, 2020 and Joshua Barretto committed Dec 22, 2020
  53d5a937
Dec 18, 2020
- Merge branch 'gliding-energy-cost' into 'master' · 3466d638
  Justin Shipsey authored Dec 18, 2020
  3466d638
- Merge branch 'entropy9s/BasicIngredients' into 'master' · 9af232c6
  Justin Shipsey authored Dec 18, 2020
  9af232c6
- Merge branch 'a1phyr/fix_debug_items' into 'master' · 44ffd749
  Ben Wallis authored Dec 18, 2020
  44ffd749
- Glider mid-air deploy and gliding energy-cost · 8f9db19a
  Ludvig Böklin authored Dec 13, 2020
  
  8f9db19a
- Fix debug items · 1ace001f
  Benoît du Garreau authored Dec 18, 2020
  
  1ace001f
- Merge branch 'Frinksy/scancodes' into 'master' · ace47766
  Imbris authored Dec 18, 2020
  ace47766
- working towards #861 - · 5f9984df
  Frinksy authored Dec 16, 2020
  5f9984df
Dec 17, 2020
- changed sec count to be consistent w/ other foods · 6f331e04
  Entropy9s authored Dec 17, 2020
  
  6f331e04
- Merge branch 'entropy9s/BasicIngredients' of... · 5a633666
  Entropy9s authored Dec 17, 2020
  5a633666
- Merge branch 'a1phyr/fix_windows_build' into 'master' · 55c49f88
  Ben Wallis authored Dec 17, 2020
  55c49f88
- Fix bad specifier breaking on Windows · 8aac030e
  Benoît du Garreau authored Dec 17, 2020 and Ben Wallis committed Dec 17, 2020
  
  8aac030e
- Merge branch 'a1phyr/use_assets_manager' into 'master' · d2da8d67
  Marcel authored Dec 17, 2020
  d2da8d67
- Merge branch 'entropicdrifter/refactor-attacker-name' into 'master' · 37d6fbc3
  Marcel authored Dec 17, 2020
  37d6fbc3
- Merge branch 'test_util' into 'master' · 78e9f3de
  Marcel authored Dec 17, 2020
  78e9f3de
- Improve world::Index · 989683d2
  Benoît du Garreau authored Dec 17, 2020 and Marcel committed Dec 17, 2020
  
  989683d2
- Apply suggestion · 1c4e334c
  Benoît du Garreau authored Dec 14, 2020 and Marcel committed Dec 17, 2020
  1c4e334c
- Fix clippy lints · ce9d706e
  Benoît du Garreau authored Dec 13, 2020 and Marcel committed Dec 17, 2020
  
  ce9d706e
- Update CHANGELOG · 850eb1c2
  Benoît du Garreau authored Dec 13, 2020 and Marcel committed Dec 17, 2020
  
  850eb1c2
- cargo fmt · 7b4aa6d4
  Benoît du Garreau authored Dec 13, 2020 and Marcel committed Dec 17, 2020
  
  7b4aa6d4
- Move the asset module to a single file · d090eefb
  Benoît du Garreau authored Dec 13, 2020 and Marcel committed Dec 17, 2020
  
  d090eefb
- Use assets_manager to load assets · 0cf164f3
  Benoît du Garreau authored Dec 12, 2020 and Marcel committed Dec 17, 2020
  
  0cf164f3
- Merge branch 'james/hashbrown' into 'master' · 6ecff460
  Marcel authored Dec 17, 2020
  6ecff460
- Switched to hashbrown everywhere · 60d5d62e
  James Melkonian authored Dec 11, 2020 and Marcel committed Dec 17, 2020
  
  60d5d62e
- Merge branch 'yusdacra/update-cargonix' into 'master' · 52c37e1d
  Marcel authored Dec 17, 2020
  52c37e1d
Dec 16, 2020
- Merge branch 'xMAC94x/dependencies' into 'master' · f12c0de6
  Marcel authored Dec 16, 2020
  f12c0de6
- fix wrong alignment · ea84cb13
  Marcel authored Dec 16, 2020
  
  ea84cb13
- update specs · e8003a44
  Marcel authored Dec 16, 2020
  
  e8003a44
- Merge branch 'xMAC94x/dependencies' into 'master' · 4196f0ad
  Marcel authored Dec 16, 2020
  4196f0ad
- update guillotiere · a1b50a86
  Marcel authored Dec 16, 2020
  
  a1b50a86
- get rid of some insecure dependencies · e3307344
  Marcel authored Dec 16, 2020
  
  e3307344
- Merge branch 'xMAC94x/dependencies' into 'master' · 24a840bc
  Marcel authored Dec 16, 2020
  24a840bc
- Merge branch 'slipped/animtweaks' into 'master' · a365ca7e
  Justin Shipsey authored Dec 16, 2020
  a365ca7e
- accel based run · e7249210
  Justin Shipsey authored Dec 16, 2020
  
  e7249210
- update further crates · 107fd432
  Marcel authored Dec 16, 2020
  
  107fd432