Commits · master · doctor_ew / veloren · GitLab

May 08, 2021
- Merge branch 'aweinstock/fix-bow-20210507' into 'master' · 2ea69a61
  Marcel authored May 08, 2021
  2ea69a61
- Merge branch 'juliancoffee/preset_cmd' into 'master' · 39843860
  Marcel authored May 08, 2021
  39843860
- /skill_preset command · 1c22a2b3
  Illia Denysenko authored May 08, 2021 and Marcel committed May 08, 2021
  
  1c22a2b3
- Make projectiles function properly if they hit a wall in the same tick as an entity. · 7ec7540b
  Avi Weinstock authored May 07, 2021
  
  7ec7540b
May 07, 2021
- Merge branch 'snowram/craftmats-ron-fix' into 'master' · ad3a63fc
  Snowram authored May 07, 2021
  ad3a63fc
- Merge branch 'update_pt_BR_20210507' into 'master' · b6df1204
  Samuel Keiffer authored May 07, 2021
  b6df1204
- Update pt br 20210507 · f517b06d
  Nícolas Wildner authored May 07, 2021 and Samuel Keiffer committed May 07, 2021
  
  f517b06d
- Merge branch 'aweinstock/tradeuifixes-20210506' into 'master' · 1f49775a
  Samuel Keiffer authored May 07, 2021
  1f49775a
- Fixes object manifest · ec3fa365
  Snowram authored May 07, 2021
  
  ec3fa365
- Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity... · 76da18da
  Avi Weinstock authored May 06, 2021
  76da18da
- Merge branch 'snowram/craft-mats' into 'master' · f552a71d
  Justin Shipsey authored May 07, 2021
  f552a71d
- Snowram/craft mats · 831bfd0b
  Snowram authored May 07, 2021 and Justin Shipsey committed May 07, 2021
  
  831bfd0b
- Merge branch 'juliancoffee/update-uk_UA' into 'master' · 00493cb9
  Marcel authored May 07, 2021
  00493cb9
- Update uk_UA · 07ba3e65
  Illia Denysenko authored May 07, 2021 and Marcel committed May 07, 2021
  
  07ba3e65
- Merge branch 'juliancoffee/animal_trainer_transfer' into 'master' · 395ac5c2
  Justin Shipsey authored May 07, 2021
  395ac5c2
- Transer Animal Trainers to lvl5 dungeons · 9ed15105
  Illia Denysenko authored May 07, 2021
  
  9ed15105
May 06, 2021
- Merge branch 'aweinstock/damage-types' into 'master' · a2999ce9
  Samuel Keiffer authored May 06, 2021
  a2999ce9
- Add `DamageKind`, and make piercing damage partially ignore damage resistence. · e4cda430
  Avi Weinstock authored May 06, 2021
  e4cda430
- Merge branch 'james/agent-tactic-refactor' into 'master' · 1ef748c4
  Samuel Keiffer authored May 06, 2021
  1ef748c4
- Move weapon tactics to functions and take target body into attack radius consideration · 346eb48a
  James Melkonian authored May 06, 2021 and Samuel Keiffer committed May 06, 2021
  
  346eb48a
- Merge branch 'duelsik/wiring-turing-complete' into 'master' · 2c36524c
  Samuel Keiffer authored May 06, 2021
  2c36524c
- (Wiring) Logic - make wiring turing complete · 3197bcd1
  Daniel Mizerski (Danielduel) authored May 06, 2021
  
  3197bcd1
- Merge branch 'xMAC94x/fixcrashes' into 'master' · 8ae1d106
  Marcel authored May 06, 2021
  8ae1d106
- Merge branch 'xMAC94x/fixDisconnectMetrics' into 'master' · 91f76d3b
  Marcel authored May 06, 2021
  91f76d3b
- instead of manually trying to sync disconnect metrics we now pass a Reason to... · 8196fd8b
  Marcel authored May 06, 2021
  8196fd8b
- Merge branch 'duelsik/wiring-on-death' into 'master' · efed14cc
  Marcel authored May 06, 2021
  efed14cc
May 05, 2021
- Merge branch 'sam/mindflayer-balance' into 'master' · b1142a05
  Samuel Keiffer authored May 05, 2021
  b1142a05
- Merge branch 'juliancoffee/fix_dropall' into 'master' · d1210ade
  Marcel authored May 05, 2021
  d1210ade
- Don't drop Debug item with /dropall · 2c14f59a
  Illia Denysenko authored May 05, 2021 and Marcel committed May 05, 2021
  
  2c14f59a
- Rebalancing · dc7e45c8
  Samuel Keiffer authored May 05, 2021
  
  dc7e45c8
- (Wiring) OnDeath · b34704ea
  Daniel Mizerski (Danielduel) authored May 05, 2021
  
  b34704ea
- Merge branch 'duelsik/wiring-switch-to-maybes' into 'master' · bd966eaf
  Marcel authored May 05, 2021
  bd966eaf
- (Wiring) Switch to using maybes · a2a03294
  Daniel Mizerski (Danielduel) authored May 05, 2021
  
  a2a03294
- Merge branch 'xMAC94x/get_rid_of_useless_threadpool' into 'master' · 3ddbb479
  Marcel authored May 05, 2021
  3ddbb479
- use a constant for recommended_threads · 4cfdbdd0
  Marcel authored May 04, 2021
  
  4cfdbdd0
May 04, 2021
- revert Client drop to be correct again and also stop network properly, reduce timeout to 10s · 68d326c8
  Marcel authored Apr 14, 2021
  
  68d326c8
- cleanup some unused functions, which were exported but never used · 76319cb2
  Marcel authored May 04, 2021
  
  76319cb2
- limit tokio threads to 1/4 of num_cpus · 0142cf37
  Marcel authored May 04, 2021
  0142cf37
- rayon::join creates a global threadpool, which is only used in /world · 6e3a74b4
  Marcel authored May 04, 2021
  6e3a74b4
- Merge branch 'sam/minotaur' into 'master' · fb940ad2
  Samuel Keiffer authored May 04, 2021
  fb940ad2