Commits · master · cetra3 / veloren

Browse files

Apr 18, 2020
- Merge branch 'xMAC94x/update-toolchain' into 'master' · 00f48a12
  Marcel authored Apr 18, 2020
  00f48a12
- update toolchain to `nightly-2020-04-17` · bf437709
  Marcel authored Apr 18, 2020
  
  bf437709
Apr 16, 2020
- Merge branch 'pfau/fix_palms' into 'master' · b4345c32
  Monty Marz authored Apr 16, 2020
  b4345c32
- insert correct model, change offset accordingly · 5daa7d7b
  Pfauenauge90 authored Apr 16, 2020
  
  5daa7d7b
- Merge branch 'update-appdata-files' into 'master' · 51126da1
  Songtronix authored Apr 16, 2020
  51126da1
- Update AppData manifest to conform guidelines · 4aa176da
  Artem authored Apr 16, 2020 and Songtronix committed Apr 16, 2020
  4aa176da
Apr 15, 2020
- Merge branch 'docker-compose-update' into 'master' · ce53be41
  Marcel authored Apr 15, 2020
  ce53be41
- Update docker-compose.yml with the same as in production by official server · 32a8e6d3
  Marcel authored Apr 15, 2020
  
  32a8e6d3
- Merge branch 'songtronix/fix-532' into 'master' · d9220261
  Songtronix authored Apr 15, 2020
  d9220261
- change(server): rename settings file to `server_settings.ron` · 996eee0b
  Songtronix authored Apr 15, 2020
  
  996eee0b
- Merge branch 'ElXreno/proper-assets-path-finding' into 'master' · 866cfa3a
  Songtronix authored Apr 15, 2020
  866cfa3a
Apr 14, 2020
- Merge branch 'olexorus/fix_serverlist_panic' into 'master' · b3c54a9b
  Imbris authored Apr 14, 2020
  b3c54a9b
- Fix panic if default server index is out of bounds · 027d0f11
  Olexorus authored Apr 13, 2020
  
  027d0f11
Apr 12, 2020
- Merge branch 'imbris/slots' into 'master' · 1dd1318a
  Monty Marz authored Apr 12, 2020
  1dd1318a
- resolved comments · 25a9d5bf
  Monty Marz authored Apr 12, 2020
  
  25a9d5bf
- Clarify todo comment · 9ff816f0
  Imbris authored Apr 12, 2020
  
  9ff816f0
- fix example · b98680b9
  Imbris authored Apr 12, 2020
  
  b98680b9
- Find assets by using other environment variables · 4cdc1300
  ElXreno authored Apr 12, 2020
  4cdc1300
- cleanup, slot background, scaling · cee1c2f8
  Pfauenauge90 authored Apr 12, 2020
  
  cee1c2f8
- Changelog and small fix · 053458c2
  Imbris authored Apr 12, 2020
  
  053458c2
- Add backgound to hotbar slots · b9a66a93
  Imbris authored Apr 12, 2020
  
  b9a66a93
- Move item amount text to bottom right · c6b55706
  Imbris authored Apr 11, 2020
  
  c6b55706
- tooltips for the skillbar · cae53131
  Imbris authored Apr 11, 2020
  
  cae53131
- lantern visuals, random cape flutter · d7e605e6
  Justin Shipsey authored Apr 11, 2020
  
  d7e605e6
- Lantern tweaks, remove unused bones · 2c4c0063
  Imbris authored Apr 11, 2020
  
  2c4c0063
- Basic hotbar functionality · f81f9116
  Imbris authored Apr 11, 2020
  
  f81f9116
- Add right click to use, latern is not armor tweaks · 77d13376
  Imbris authored Apr 10, 2020
  
  77d13376
- Fix selecting and remove amount text when dragging · f52d66d7
  Imbris authored Apr 09, 2020
  
  f52d66d7
- Enable unequipping as well as equipping to specific slots · c1c09dce
  Imbris authored Apr 09, 2020
  
  c1c09dce
- rework slot trait · 66b4c0d5
  Imbris authored Apr 06, 2020
  
  66b4c0d5
- cape work · e2d60b85
  Justin Shipsey authored Apr 10, 2020
  
  e2d60b85
- Update de_DE.ron · 66b28320
  Pfauenauge90 authored Apr 10, 2020
  
  66b28320
- translation fix · 88a93865
  Pfauenauge90 authored Apr 10, 2020
  
  88a93865
- hotbar text shadows · 0a52dc61
  Pfauenauge90 authored Apr 09, 2020
  
  0a52dc61
- 7 dwarf accessories · eb7ded98
  Pfauenauge90 authored Apr 09, 2020
  
  eb7ded98
- hotbar keybindings · f24ba71d
  Pfauenauge90 authored Apr 09, 2020
  
  f24ba71d
- fmt · a29f199e
  Pfauenauge90 authored Apr 09, 2020
  
  a29f199e
- starter chest, removed unused key commands · 2263b9be
  Pfauenauge90 authored Apr 09, 2020
  
  2263b9be
- bag tooltips translation entries · 479fcaa6
  Monty Marz authored Apr 08, 2020
  
  479fcaa6
- german translation update · 9b2785ae
  Monty Marz authored Apr 08, 2020
  
  9b2785ae