Commits · master · Yuri Socher Bichibichi / veloren · GitLab

Apr 12, 2021
- Merge branch 'sharp/inverted-check' into 'master' · e3d1d3dd
  Marcel authored Apr 12, 2021
  e3d1d3dd
- Inverted admin check. · dd1e0611
  Joshua Yanovski authored Apr 12, 2021
  
  dd1e0611
- Merge branch 'aweinstock/combat-music' into 'master' · e1020945
  Samuel Keiffer authored Apr 12, 2021
  e1020945
- Merge branch 'hqurve/settings-ui' into 'master' · f7c8389f
  Monty Marz authored Apr 12, 2021
  f7c8389f
- Merge branch 'juliancoffee/update-uk_UA' into 'master' · e4a67a9b
  Marcel authored Apr 12, 2021
  e4a67a9b
- Update localization for Ukrainian · 4ac8015e
  Illia Denysenko authored Apr 12, 2021 and Marcel committed Apr 12, 2021
  
  4ac8015e
- Address MR 2077 review comments. · df4f44d9
  Avi Weinstock authored Apr 11, 2021
  
  df4f44d9
- Address MR2077 review comments: add comment about `group::ENEMY` and remove... · d401d00d
  Avi Weinstock authored Apr 08, 2021
  d401d00d
- Make fade timings configurable, and stop combat music on death. · 7c34a969
  Avi Weinstock authored Apr 08, 2021
  
  7c34a969
- Add new version of combat soundtrack, and change details of how transitions between tracks work. · f1b022cd
  Avi Weinstock authored Apr 07, 2021
  
  f1b022cd
- Only count enemy group members for combat music, and count bosses as... · 0e16c237
  Avi Weinstock authored Apr 06, 2021
  0e16c237
- Add combat music transitions based on number of enemies in player radius. · 5bfdd5f1
  Avi Weinstock authored Apr 06, 2021
  
  5bfdd5f1
- Merge branch 'DaforLynx/more-music' into 'master' · 54024ce4
  Marcel authored Apr 12, 2021
  54024ce4
- Adds many new songs; re-adds many old ones; revamped song distribution;... · 9db290d4
  DaforLynx authored Apr 12, 2021 and Marcel committed Apr 12, 2021
  9db290d4
Apr 11, 2021
- Merge branch 'aweinstock/npcpotions' into 'master' · fd317417
  Marcel authored Apr 11, 2021
  fd317417
- Give NPCs the ability to use potions. · ddf6a265
  Avi Weinstock authored Apr 11, 2021 and Marcel committed Apr 11, 2021
  
  ddf6a265
- Merge branch 'trade-help-tooltips' into 'master' · 5e7adc67
  Marcel authored Apr 11, 2021
  5e7adc67
- Show ctrl-click and shift-click usage in item tooltips during trades. · 8a25ebb5
  Ceikry authored Apr 11, 2021 and Marcel committed Apr 11, 2021
  
  8a25ebb5
- Merge branch 'master' into 'master' · d7a9ab7e
  Marcel authored Apr 11, 2021
  d7a9ab7e
- Update and fix zh_CN · 4403cd71
  law4x authored Apr 11, 2021 and Marcel committed Apr 11, 2021
  
  4403cd71
- Merge branch 'danielduel/PL-local' into 'master' · eca27a30
  Marcel authored Apr 11, 2021
  eca27a30
- Merge branch 'xMAC94x/deps' into 'master' · 508dba61
  Joshua Yanovski authored Apr 11, 2021
  508dba61
- Merge branch 'vfoulon80/reorganize-assets' into 'master' · 2ee8fc37
  Joshua Yanovski authored Apr 11, 2021
  2ee8fc37
- Got rid of content setup macro · fd80a97f
  hqurve authored Apr 11, 2021
  
  fd80a97f
- Placed tabs in a loop and combined tab content chooser using macro · 690419ad
  hqurve authored Apr 11, 2021
  
  690419ad
- cleaned widget_ids · 469cb391
  hqurve authored Apr 11, 2021
  
  469cb391
- Moved settings window sections into separate files · 04eea482
  hqurve authored Apr 11, 2021
  
  04eea482
- Moved settings_window.rs to to settings_window/mod.rs · f2340105
  hqurve authored Apr 11, 2021
  
  f2340105
- Add/modify Polish translations · c4294d96
  BuildTools authored Apr 09, 2021 and Daniel Mizerski (Danielduel) committed Apr 11, 2021
  
  c4294d96
- Merge branch 'sharp/fix-silly-bug' into 'master' · dc4c02ba
  Joshua Yanovski authored Apr 11, 2021
  dc4c02ba
- add new loader + move some images · a2e92c67
  Vincent Foulon authored Apr 11, 2021
  
  a2e92c67
- Lossless compression of UI assets · 52a53963
  Snowram authored Apr 11, 2021 and Vincent Foulon committed Apr 11, 2021
  
  52a53963
- clean workspace · de9d5b5e
  Vincent Foulon authored Apr 10, 2021
  de9d5b5e
- remove unused images · 95f69fea
  Vincent Foulon authored Apr 10, 2021
  
  95f69fea
- optimized all images · 2097fbca
  Vincent Foulon authored Apr 10, 2021
  
  2097fbca
- Asset reorganization + removed some unused and duplicates + reduce size of some images · 7128c3d3
  Vincent Foulon authored Apr 10, 2021
  
  7128c3d3
- Fix players being able to pick up other players. · 90c39231
  Joshua Yanovski authored Apr 11, 2021
  
  90c39231
- Merge branch 'pfau/map-things' into 'master' · dab2a59e
  Monty Marz authored Apr 11, 2021
  dab2a59e
- UI fixes and more · 6772e71a
  Monty Marz authored Apr 11, 2021
  
  6772e71a
Apr 10, 2021
- Merge branch 'sharp/sprites-in-background' into 'master' · 8b034ed5
  Joshua Yanovski authored Apr 10, 2021
  8b034ed5