Commits · master · Matthew Kalasky2 / veloren

Browse files

Jan 01, 2023
- Merge branch 'thanosfisherman/add_music_track' into 'master' · 081f48e7
  Marcel authored Jan 01, 2023
  081f48e7
- Thanosfisherman/add music track · 2608e633
  Thanos Psaridis authored Jan 01, 2023 and Marcel committed Jan 01, 2023
  
  2608e633
- Merge branch 'ashirviskas/advanced_inventory_sorting' into 'master' · a123c7ad
  Imbris authored Jan 01, 2023
  a123c7ad
- Inventory sorting MR fixes and slight improvements · 3850d3e8
  Matas Minelga authored Dec 31, 2022
  
  3850d3e8
Dec 31, 2022
- Merge branch 'DaforLynx/last-minute-fixes' into 'master' · 7579b86d
  Joshua Barretto authored Dec 31, 2022
  7579b86d
- Minor audio code cleanup · 221d6a67
  DaforLynx authored Dec 31, 2022 and Joshua Barretto committed Dec 31, 2022
  
  221d6a67
- Merge branch 'yusdacra/nix-update' into 'master' · e6ed8805
  Imbris authored Dec 31, 2022
  View commits for tag nightly nightly
  e6ed8805
- Inventory: Implemented dynamic and better ordering by Category · 040c9fe6
  Matas Minelga authored Dec 31, 2022
  
  040c9fe6
Dec 29, 2022
- Merge branch 'zesterer/separate-volumetrics-and-transparents' into 'master' · 0052af85
  Joshua Barretto authored Dec 29, 2022
  0052af85
- Separated volumetrics and transparents into independent passes to fix UB · e87b5739
  Joshua Barretto authored Dec 29, 2022
  
  e87b5739
- Merge branch 'master' into 'master' · 6070bd65
  Joshua Barretto authored Dec 29, 2022
  6070bd65
- Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master' · 0fba3a73
  Christof Petig authored Dec 29, 2022
  0fba3a73
Dec 23, 2022
- Merge branch 'pfau/bag_icon' into 'master' · b19d02f7
  Monty Marz authored Dec 23, 2022
  View commits for tag weekly weekly
  b19d02f7
- Bag icon improvement · 6b74437c
  Monty Marz authored Dec 23, 2022
  
  6b74437c
Dec 22, 2022
- Merge branch 'christmas-2022' into 'master' · 5f4f2855
  Marcel authored Dec 22, 2022
  5f4f2855
- Christmas 2022 changes · 5e282340
  DaforLynx authored Dec 22, 2022 and Marcel committed Dec 22, 2022
  
  5e282340
Dec 18, 2022
- build(nix): update flake deps · 4191b341
  dusk authored Dec 19, 2022
  
  4191b341
- fix: update flake · dd6c33ba
  dusk authored Dec 18, 2022
  
  dd6c33ba
Dec 17, 2022
- Merge branch 'zesterer/floofy-clouds' into 'master' · 1798cdcf
  Joshua Barretto authored Dec 17, 2022
  1798cdcf
- Fixed moon lighting of clouds · dcc47621
  Joshua Barretto authored Dec 17, 2022
  
  dcc47621
- Better storm clouds · 5cf3aefb
  Joshua Barretto authored Dec 17, 2022
  
  5cf3aefb
Dec 16, 2022
- Update description of the flashing lights setting · d63f8850
  Rares authored Dec 16, 2022
  d63f8850
Dec 15, 2022
- Improved cloud visuals and performance · 94c0e374
  Joshua Barretto authored Dec 15, 2022
  
  94c0e374
- Merge branch 'fix_spanish' into 'master' · 836ae17b
  Marcel authored Dec 15, 2022
  836ae17b
- fix spanish file movement · b8afaafe
  Marcel authored Dec 15, 2022
  
  b8afaafe
- Merge branch 'muphblu/item-img-export' into 'master' · c90be1b5
  Imbris authored Dec 15, 2022
  c90be1b5
- Items images export for wiki · cccc796d
  Aidar Shaikhiev authored Dec 15, 2022 and Imbris committed Dec 15, 2022
  
  cccc796d
- Merge branch 'assets_manager-0.9' into 'master' · b3283779
  Marcel authored Dec 15, 2022
  b3283779
- Merge branch 'jgayfer/fix-macos-controller-input' into 'master' · 719520e2
  LunarEclipse authored Dec 15, 2022
  719520e2
Dec 14, 2022
- Fix Xbox controller mappings on MacOS · 0badaaa4
  James Gayfer authored Dec 13, 2022
  0badaaa4
Dec 13, 2022
- Update to `assets_manager 0.9 · 4fbb0b9a
  Benoît du Garreau authored Dec 04, 2022
  
  4fbb0b9a
- Merge branch 'mentos1386/fix_llama_standing_kick' into 'master' · 4a5bc050
  Joshua Barretto authored Dec 13, 2022
  4a5bc050
- Fixes #1563 - Implements Quad Med Hoof tactic/attack · e7753736
  Tine Jozelj authored Dec 13, 2022
  
  e7753736
- Italian: hud-map-bridge · 03fae4f4
  Francesco Vasco authored Dec 04, 2022
  
  03fae4f4
Dec 05, 2022
- Merge branch 'GammaJPG-master-patch-08316' into 'master' · 80a4d7f1
  Marcel authored Dec 05, 2022
  80a4d7f1
Dec 04, 2022
- update the Spanish translation · 0e2fe6ff
  Gamma authored Dec 04, 2022
  
  0e2fe6ff
- Merge branch 'master' into 'master' · 0ba5558d
  Marcel authored Dec 04, 2022
  0ba5558d
Dec 03, 2022
- Russian translation fixes · f64af1dc
  rmdlv authored Dec 03, 2022
  
  f64af1dc
Dec 01, 2022
- Merge branch 'tygyh/Swedish-translations' into 'master' · 122d2df0
  Marcel authored Dec 01, 2022
  122d2df0
- Update swedish translations · 511026fd
  Jonathan Berglin authored Dec 01, 2022 and Marcel committed Dec 01, 2022
  
  511026fd