Commits · master · Lai Kwun Hang / veloren

Browse files

Jan 06, 2024
- Merge branch 'yusdacra/nix-updates' into 'master' · 4d4e7c8e
  Imbris authored Jan 06, 2024
  4d4e7c8e
- Merge branch 'imbris/construct-dispatcher-once' into 'master' · 03e46de7
  Imbris authored Jan 06, 2024
  03e46de7
Jan 05, 2024
- review fixes #2 · 6eedea78
  Imbris authored Jan 04, 2024
  
  6eedea78
Jan 04, 2024
- Merge branch 'More-potions' into 'master' · dbf3ed49
  Samuel Keiffer authored Jan 04, 2024
  dbf3ed49
- Update file CHANGELOG.md · db2a6335
  Pybit authored Jan 04, 2024
  
  db2a6335
- Merge branch 'master' into 'More-potions' · f6204f9d
  Pybit authored Jan 04, 2024
  f6204f9d
- cargo fmt · 807bd758
  Imbris authored Jan 04, 2024
  
  807bd758
- review fixes · 6d571698
  Imbris authored Jan 04, 2024
  
  6d571698
Jan 03, 2024
- Only construct specs::Dispatcher once · 6c6b9181
  Imbris authored Jan 02, 2024
  6c6b9181
- Merge branch 'feat/time_length_on_map_settings' into 'master' · 100568f9
  Isse authored Jan 03, 2024
  100568f9
- Feat: Day duration slider on map creation UI (#1909) · 0ecfbce4
  Joaquin Tornello authored Jan 03, 2024 and Isse committed Jan 03, 2024
  
  0ecfbce4
- Merge branch 'shader-fixes' into 'master' · 6f28382a
  Imbris authored Jan 03, 2024
  6f28382a
- Merge branch 'imbris/convert-screenshot-earlier' into 'master' · c37f0d4c
  Imbris authored Jan 03, 2024
  c37f0d4c
- Avoid a wgpu SPIR-V warning about BitFieldUExtract · dc0725e1
  Darren Salt authored Dec 23, 2023
  dc0725e1
- Added previously requested changes · 26520b51
  Pybit authored Jan 03, 2024
  
  26520b51
Jan 02, 2024
- Merge branch 'crabman/airship-fix-v6' into 'master' · 448e1ba6
  Samuel Keiffer authored Jan 02, 2024
  448e1ba6
- Clippyyy · 37b562aa
  crab authored Jan 02, 2024
  
  37b562aa
- Use correct scaling for volume entity collisions · 551d783c
  crab authored Jan 01, 2024
  
  551d783c
- Don't dismount if we're a steering entity · 004be639
  crab authored Jan 01, 2024
  
  004be639
Jan 01, 2024
- Convert to rgb earlier in screenshot process. · fc286291
  Imbris authored Jan 01, 2024
  fc286291
- Merge branch 'screenshot' into 'master' · 35fc92f8
  Imbris authored Jan 01, 2024
  35fc92f8
- build(nix): set veloren git tag and veloren git version variables in the development shell too · 9190a40c
  dusk authored Jan 01, 2024
  
  9190a40c
Dec 30, 2023
- build(nix): remove flake-parts debug option from flake.nix · f7d98857
  dusk authored Dec 30, 2023
  
  f7d98857
- build(nix): update flake dependencies and fix flake.nix · 4055eb15
  dusk authored Dec 30, 2023
  
  4055eb15
Dec 29, 2023
- Merge branch 'sam/remove-combo-melee' into 'master' · 5bd089c5
  Samuel Keiffer authored Dec 29, 2023
  5bd089c5
- Fix tests · 8ee054a4
  Samuel Keiffer authored Dec 29, 2023
  
  8ee054a4
- Merge branch 'DaforLynx/audio-dec-2023' into 'master' · 016bb252
  Marcel authored Dec 29, 2023
  016bb252
- Audio fixes and new music · 0b628980
  DaforLynx authored Dec 29, 2023 and Marcel committed Dec 29, 2023
  
  0b628980
- Deprecated combo melee character state · f65d449a
  Samuel Keiffer authored Dec 28, 2023
  
  f65d449a
Dec 27, 2023
- Merge branch 'various_small_fixes' into 'master' · afb1e04e
  flo authored Dec 27, 2023
  afb1e04e
- various_small_fixes · c123bdae
  flo authored Dec 27, 2023
  
  c123bdae
Dec 26, 2023
- Merge branch 'christof/fix-kelp' into 'master' · 1f718928
  Christof Petig authored Dec 26, 2023
  1f718928
- Merge branch 'make_crustaceans_tameable' into 'master' · c3db4554
  Samuel Keiffer authored Dec 26, 2023
  c3db4554
- make_crustaceans_tameable · 8e76aace
  flo authored Dec 26, 2023 and Samuel Keiffer committed Dec 26, 2023
  
  8e76aace
- reintroduce underwater plants · 055e11f1
  Christof Petig authored Dec 26, 2023
  
  055e11f1
Dec 25, 2023
- Merge branch 'jcoxeye/fix-small-leather-pouch-salvage' into 'master' · 4df808ce
  flo authored Dec 25, 2023
  4df808ce
- Small leather pouches salvage into simple leather as opposed to thick leather · 31c04f1f
  JCoxeye authored Dec 25, 2023 and flo committed Dec 25, 2023
  
  31c04f1f
- Merge branch 'Froggy/armor_offset_fixes' into 'master' · 7cb22906
  flo authored Dec 25, 2023
  7cb22906
- Froggy/armor offset fixes · 7c66fff7
  Froggy authored Dec 25, 2023 and flo committed Dec 25, 2023
  
  7c66fff7
Dec 21, 2023
- Don't include an alpha channel when creating a screenshot file. · 4156dd56
  Darren Salt authored Dec 21, 2023
  
  4156dd56