Commits · master · Darren Salt / veloren

Browse files

Jan 03, 2024
- 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
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
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
- Merge branch 'crabman/gittag-beforescript' into 'master' · 62dc6acc
  Marcel authored Dec 21, 2023
  62dc6acc
- override default before_script for gittag job · b7cc9c8f
  crab authored Dec 21, 2023
  
  b7cc9c8f
- Merge branch 'crabman/gittag-fix' into 'master' · fe4f7957
  Marcel authored Dec 21, 2023
  fe4f7957
- print git version in gittag job · 58592e9a
  crab authored Dec 21, 2023
  
  58592e9a
- use bitnami/git image for gittag job · 312e8165
  crab authored Dec 21, 2023
  
  312e8165
Dec 20, 2023
- Merge branch 'christof/christmas23' into 'master' · 5af8c468
  Christof Petig authored Dec 20, 2023
  5af8c468
- Merge branch 'armor_offset_fixes' into 'master' · f62e3d61
  flo authored Dec 20, 2023
  f62e3d61
- fixed armor offsets to enable mix'n'match armor · 8cfd65ff
  Froggy authored Dec 20, 2023 and flo committed Dec 20, 2023
  
  8cfd65ff
Dec 18, 2023
- Merge branch 'headwear_fix' into 'master' · 72df65ee
  flo authored Dec 18, 2023
  72df65ee
- fixed headwear offsets and some vox files · 01ac73b7
  Froggy authored Dec 18, 2023
  
  01ac73b7
Dec 17, 2023
- Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master' · ecde64a3
  flo authored Dec 17, 2023
  ecde64a3
- Merge branch 'do-no-van/armor-offset-fixes' into 'master' · f0754021
  flo authored Dec 17, 2023
  f0754021
- fix typo and armor offsets · b5eaa587
  incompetent authored Dec 17, 2023 and flo committed Dec 17, 2023
  
  b5eaa587