Commits · master · black-silence / veloren · GitLab

Aug 29, 2020
- Merge branch 'termac/hotbar_hotkey_fix' into 'master' · 67d046c8
  Imbris authored Aug 29, 2020
  67d046c8
- small fix for handling hotbar hotkeys (fixes #687) · 76df71ed
  termac authored Aug 29, 2020
  76df71ed
Aug 28, 2020
- Merge branch 'black-silence/fix-de-translation' into 'master' · 92d9a510
  Monty Marz authored Aug 28, 2020
  92d9a510
- fix several DE translations · 2587a38f
  black-silence authored Aug 28, 2020
  
  2587a38f
- Merge branch 'fix_text_overlap' into 'master' · 6389df76
  Monty Marz authored Aug 28, 2020
  6389df76
- fix overlapping text · 7041e490
  Monty Marz authored Aug 28, 2020
  
  7041e490
- Merge branch 'sharp/sprite-config' into 'master' · e59395bf
  Joshua Yanovski authored Aug 28, 2020
  e59395bf
- Move sprite data to a config file. · 8be3648a
  Joshua Yanovski authored Aug 28, 2020
  
  8be3648a
- Merge branch 'sharp/figure-mesh-background' into 'master' · 3622c11a
  Joshua Yanovski authored Aug 28, 2020
  3622c11a
- Move figure meshing to a background thread. · 3a96b73b
  Joshua Yanovski authored Aug 28, 2020
  
  3a96b73b
Aug 27, 2020
- Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master' · 1aec2ac6
  Marcel authored Aug 27, 2020
  1aec2ac6
- fix compiling with metrics · a7b7ae3a
  Marcel authored Aug 27, 2020
  
  a7b7ae3a
- Merge branch 'imbris/small-fixes' into 'master' · 2dfde32b
  Imbris authored Aug 27, 2020
  2dfde32b
- Add State::read_component_copied · 4790373a
  Imbris authored Aug 23, 2020
  
  4790373a
- Fix broken features and avoid panic if the client leaves before character data loads · dcce5641
  Imbris authored Aug 23, 2020
  
  dcce5641
- Merge branch 'xMAC94x/reduce_metrics' into 'master' · 5bedc1aa
  Marcel authored Aug 27, 2020
  5bedc1aa
Aug 26, 2020
- reduce load on metrics by ALOT! · 91706226
  Marcel authored Aug 27, 2020
  91706226
- Merge branch 'xMAC94x/examples-cleanup' into 'master' · 9d49158b
  Marcel authored Aug 26, 2020
  9d49158b
- Merge branch 'scott-c/sound-effects-placeholder' into 'master' · 97224d8a
  Forest Anderson authored Aug 26, 2020
  97224d8a
- Add combat sfx #647 · d316463e
  scottc authored Jul 04, 2020
  
  d316463e
- Switch veloren_network over to use the official example layout. · 8c883c20
  Marcel authored Aug 26, 2020
  8c883c20
Aug 25, 2020
- Merge branch 'xMAC94x/compression' into 'master' · 3a1b4fa5
  Marcel authored Aug 25, 2020
  3a1b4fa5
- Propper Compression support of network. · 144f88f8
  Marcel authored Aug 25, 2020
  144f88f8
- Merge branch 'pfau/nametag_height' into 'master' · 4d77d61d
  Monty Marz authored Aug 25, 2020
  4d77d61d
- fixed nametag height · 6946de26
  Monty Marz authored Aug 25, 2020
  6946de26
- Merge branch 'zesterer/small-fixes' into 'master' · bf7afcf5
  Joshua Barretto authored Aug 25, 2020
  bf7afcf5
- Merge branch 'spelling' into 'master' · ae208d93
  Marcel authored Aug 25, 2020
  ae208d93
- Corrected some spelling errors · 2be4202d
  notoria authored Aug 25, 2020 and Marcel committed Aug 25, 2020
  
  2be4202d
- Handled 3d/2d sanity check bug · 24780e4f
  Joshua Barretto authored Aug 25, 2020
  
  24780e4f
- Addressed review issues · 37b45ba5
  Joshua Barretto authored Aug 25, 2020
  
  37b45ba5
Aug 24, 2020
- Improved single-tick projectile wall/entity collision bug · 12ea028a
  Joshua Barretto authored Aug 25, 2020
  
  12ea028a
- Merge branch 'xMAC94x/lock-removal' into 'master' · 6125b17a
  Marcel authored Aug 24, 2020
  6125b17a
- Allowed small animals to block-hop again · 9b812b0d
  Joshua Barretto authored Aug 24, 2020
  
  9b812b0d
- Fixed quadruped hitboxes · e4de32ac
  Joshua Barretto authored Aug 24, 2020
  
  e4de32ac
- Fixed bad hitbox radii and adjusted field colour · 2b9d5ee4
  Joshua Barretto authored Aug 24, 2020
  
  2b9d5ee4
- Fixed failing audio tests · 6cf22358
  Joshua Barretto authored Aug 24, 2020
  
  6cf22358
- Corrected hitbox mistake · 7e571c10
  Joshua Barretto authored Aug 24, 2020
  
  7e571c10
- Updated changelog · 80c71871
  Joshua Barretto authored Aug 24, 2020
  
  80c71871
- Fixed projectile collisions, hitboxes, better aiming · 6a4c5a05
  Joshua Barretto authored Aug 24, 2020
  
  6a4c5a05
- Redefine Close behavior: · 5fe7c05d
  Marcel authored Aug 24, 2020
  5fe7c05d