Commits · master · Tony Vu / veloren · GitLab

Jan 25, 2021
- Merge branch 'swilliams/gem-sounds' into 'master' · d893136e
  Joshua Barretto authored Jan 25, 2021
  d893136e
- All gems make a sound. · 0cde434e
  Scott Williams authored Jan 25, 2021 and Joshua Barretto committed Jan 25, 2021
  
  0cde434e
- Merge branch 'sam/beam-energy' into 'master' · eb4b2760
  Samuel Keiffer authored Jan 25, 2021
  eb4b2760
- Changed how beams determined the energy regen and energy cost. · 9b7edcf3
  Samuel Keiffer authored Jan 24, 2021
  
  9b7edcf3
- Merge branch 'swilliams/gems' into 'master' · ad6cdcab
  Snowram authored Jan 25, 2021
  ad6cdcab
- Merge branch 'lboklin/glider-stamina' into 'master' · 0343b57b
  Samuel Keiffer authored Jan 25, 2021
  0343b57b
Jan 24, 2021
- Merge branch 'sam/speed-beam' into 'master' · c349afc9
  Samuel Keiffer authored Jan 24, 2021
  c349afc9
- Merge branch 'sam/skill-balancing-2' into 'master' · a05402c0
  Samuel Keiffer authored Jan 24, 2021
  a05402c0
- Fixed how the speed stat was applied to beams. · a83baa82
  Samuel Keiffer authored Jan 24, 2021
  
  a83baa82
- Added other gems to crafting loot table. · efd953b4
  Scott Williams authored Jan 24, 2021
  
  efd953b4
- Changed some recipes to use other gems. Removed DELETE statements from migration. · e50bd4dc
  Scott Williams authored Jan 24, 2021
  
  e50bd4dc
- Nerfed bow M1 and M2, slightly buffed bow skillbar ability. · 6dd740fe
  Samuel Keiffer authored Jan 24, 2021
  
  6dd740fe
- Added gem models for item_manifest · be311f8f
  Scott Williams authored Jan 24, 2021
  
  be311f8f
- Merge branch 'sam/mindflayer-rebalance' into 'master' · 60ed87d7
  Samuel Keiffer authored Jan 24, 2021
  60ed87d7
- Merge branch 'synis/fix-cave-rng' into 'master' · 58c69980
  Joshua Barretto authored Jan 24, 2021
  58c69980
- Added to changelog. · fda6c9ff
  Scott Williams authored Jan 24, 2021
  
  fda6c9ff
- Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed... · 157e56d8
  Scott Williams authored Jan 24, 2021
  157e56d8
- Rebalanced mindflayer. · 314f0428
  Samuel Keiffer authored Jan 24, 2021
  
  314f0428
- Added 6 gems, removed shiny gem from cave, replaced with diamond. · 32bbdffc
  Scott Williams authored Jan 24, 2021
  
  32bbdffc
- Glider deploy stamina cost value tweak · f42869f6
  Ludvig Böklin authored Jan 24, 2021
  
  f42869f6
- Glider stamina only costs on deploy · 30168e37
  Ludvig Böklin authored Jan 24, 2021
  
  30168e37
- Merge branch 'swilliams/hitbox-adjustments' into 'master' · bdbed58b
  Samuel Keiffer authored Jan 24, 2021
  bdbed58b
- General NPC Hitbox Adjustments · c7baf1fd
  Scott Williams authored Jan 24, 2021 and Samuel Keiffer committed Jan 24, 2021
  
  c7baf1fd
- Merge branch 'pfau/sceptres' into 'master' · 5117edcf
  Justin Shipsey authored Jan 24, 2021
  5117edcf
- Merge branch 'xMAC94x/fix_ci' into 'master' · fba5c65b
  Marcel authored Jan 24, 2021
  fba5c65b
- Merge branch 'xMAC94x/3rd_party_consistenvy_unittests' into 'master' · 7c7f5517
  Marcel authored Jan 24, 2021
  7c7f5517
Jan 23, 2021
- Merge branch 'lboklin/glider-stamina' into 'master' · 3866bc73
  Samuel Keiffer authored Jan 23, 2021
  3866bc73
- Merge branch 'torvus-quick-fix' into 'master' · 82147653
  Marcel authored Jan 23, 2021
  82147653
- 6 new sceptres, add DPS display to tooltips · 7cbf946a
  Monty Marz authored Jan 23, 2021
  
  7cbf946a
- fix ci, which was broken by merging unittests and check · 3d195348
  Marcel authored Jan 23, 2021
  
  3d195348
- Merge branch 'sam/skill-balancing-1' into 'master' · 39d1c9e8
  Samuel Keiffer authored Jan 23, 2021
  39d1c9e8
- Move outcome vec from being defined in frontend and server to common. · 77312ccd
  Samuel Keiffer authored Jan 23, 2021
  
  77312ccd
- Fixes #935 - deterministic sprite placement in caves · f064033b
  dryadee authored Jan 23, 2021
  
  f064033b
- add unittests for api compatibility for client::Client and common::Clock · ff10373c
  Marcel authored Jan 23, 2021
  ff10373c
- Fix glider stamina drain · 5eefa86d
  Ludvig Böklin authored Jan 23, 2021
  
  5eefa86d
- Merge branch 'imbris/update-winit' into 'master' · 47bd7446
  Imbris authored Jan 23, 2021
  47bd7446
- Merge branch 'pizzaluc/unlimited_FPS' into 'master' · 7cbbb70c
  Imbris authored Jan 23, 2021
  7cbbb70c
- Implemented #896 - Added option for Unlimited FPS · 43b55593
  Lucas Vulpius authored Jan 23, 2021 and Imbris committed Jan 23, 2021
  
  43b55593
- Merge branch 'Rotsuoy/SavannaGrass' into 'master' · fb09d147
  Justin Shipsey authored Jan 23, 2021
  fb09d147
- Rotsuoy/savanna grass · 994677a4
  Rotsuoy authored Jan 23, 2021 and Justin Shipsey committed Jan 23, 2021
  
  994677a4