Commits · master · ccgauche / veloren · GitLab

Dec 12, 2020
- Merge branch 'xMAC94x/move' into 'master' · fc7a3748
  Marcel authored Dec 12, 2020
  fc7a3748
- move tools and chat-cli in src/bin and examples · eba35323
  Marcel authored Dec 12, 2020
  
  eba35323
- Merge branch 'xMAC94x/fix-benchmark' into 'master' · 413f0853
  Marcel authored Dec 12, 2020
  413f0853
- Merge branch 'DaforLynx/campfire-loading-tip' into 'master' · e54b4d57
  Marcel authored Dec 12, 2020
  e54b4d57
- Loading screen tip for campfire healing · 70814ee9
  DaforLynx authored Dec 12, 2020 and Marcel committed Dec 12, 2020
  
  70814ee9
Dec 11, 2020
- Merge branch 'jacki/german' into 'master' · 9b1bc41f
  Marcel authored Dec 11, 2020
  9b1bc41f
- Updated de_DE translation · 23e39640
  Tobias Frisch authored Dec 11, 2020 and Marcel committed Dec 11, 2020
  23e39640
- Merge branch 'VincentFoulon80-master-patch-13262' into 'master' · 1c1d19db
  Marcel authored Dec 11, 2020
  1c1d19db
- Update French Translation · 2503d795
  Vincent Foulon authored Dec 11, 2020 and Marcel committed Dec 11, 2020
  
  2503d795
- it seems like that the TAGUUID must start with a Alphabetic char · 58bda48b
  Marcel authored Dec 12, 2020
  
  58bda48b
- Merge branch 'zesterer/small-fixes' into 'master' · e438b4f8
  Marcel authored Dec 11, 2020
  e438b4f8
- Merge branch 'xMAC94x/remove_failure' into 'master' · c86769ec
  Marcel authored Dec 11, 2020
  c86769ec
- Merge branch 'xMAC94x/fix_injection' into 'master' · 5cd4aa72
  Marcel authored Dec 11, 2020
  5cd4aa72
- fix sql injection · 9dae7f1c
  Marcel authored Dec 11, 2020
  
  9dae7f1c
- Prevented towns destroying trees, rocks, other towns, etc. · 316bddbf
  Joshua Barretto authored Dec 11, 2020 and Marcel committed Dec 11, 2020
  
  316bddbf
- get rid of insecure dependency completly · 534f083b
  Marcel authored Dec 11, 2020
  
  534f083b
- Merge branch 'xMAC94x/switch_ci_db' into 'master' · fcdace72
  Marcel authored Dec 11, 2020
  fcdace72
- switch host to mac94.de, because song is affraid of sql injection into a... · d46271f0
  Marcel authored Dec 11, 2020
  d46271f0
- Merge branch 'xMAC94x/enhanceBench' into 'master' · e426780e
  Marcel authored Dec 11, 2020
  e426780e
- Merge branch 'hash-fix' into 'master' · fd6bdb57
  Ben Wallis authored Dec 11, 2020
  fd6bdb57
- Fix nix rust channel hash mismatch · 3870f9d6
  Ludvig Böklin authored Dec 11, 2020
  
  3870f9d6
- escape ENV variables with a randomly generated 16 char tag. remove... · 9ec2a602
  Marcel authored Nov 09, 2020
  9ec2a602
- Merge branch 'flake' into 'master' · 4e4da15f
  Ben Wallis authored Dec 11, 2020
  4e4da15f
- flake-compat (unify flake and non-flake build process/environment) · 3f498522
  Ludvig Böklin authored Dec 11, 2020 and Ben Wallis committed Dec 11, 2020
  3f498522
- Merge branch 'pfau/baobabs' into 'master' · c5f54097
  Monty Marz authored Dec 11, 2020
  c5f54097
Dec 10, 2020
- Better group frame placement · f9d4d744
  Monty Marz authored Dec 10, 2020
  
  f9d4d744
- Makes consumables heal faster · ecdbd1c5
  Snowram authored Dec 09, 2020 and Monty Marz committed Dec 10, 2020
  
  ecdbd1c5
- adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes · 6d1bae67
  Pfauenauge90 authored Dec 09, 2020 and Monty Marz committed Dec 10, 2020
  
  6d1bae67
- add baobabs, fix map difficulty, make mushrooms lootable · f2ba7cc2
  Monty Marz authored Dec 08, 2020
  
  f2ba7cc2
- upload benchmark to central ci db · dad5bf3a
  Marcel authored Sep 30, 2020
  dad5bf3a
- Merge branch 'update-toolchain' into 'master' · 3c9e8a44
  Marcel authored Dec 10, 2020
  3c9e8a44
- adjust fmt and clippy after toolchain upgrade · ccb01e18
  Marcel authored Dec 10, 2020
  
  ccb01e18
- update toolchain to `nightly-2020-12-09` · b2a814b1
  Marcel authored Dec 10, 2020
  
  b2a814b1
Dec 09, 2020
- Merge branch 'snowram/fishes' into 'master' · 4bdd84ab
  Justin Shipsey authored Dec 09, 2020
  4bdd84ab
- Merge branch 'entropy9s/LeatherFix' into 'master' · 99c1baf6
  Snowram authored Dec 09, 2020
  99c1baf6
- changed kickers to use 3 leather · 98688651
  Entropy9s authored Dec 08, 2020
  
  98688651
Dec 08, 2020
- Addressed comments · 6713ac93
  Snowram authored Dec 06, 2020
  
  6713ac93
- Adds accumulated velocity for animation · 2e8ac068
  Snowram authored Dec 05, 2020
  
  2e8ac068
- Vacations are never over · 526d3bd0
  Snowram authored Nov 29, 2020
  
  526d3bd0
- Improves fish_small, new npc · f94a4ec9
  Snowram authored Nov 29, 2020
  
  f94a4ec9