Commits · master · Jeff Petkau / veloren · GitLab

Jan 24, 2021
- 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
- Rebalanced mindflayer. · 314f0428
  Samuel Keiffer authored Jan 24, 2021
  
  314f0428
- 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
- Update winit and iced · adaea096
  Imbris authored Jan 23, 2021
  
  adaea096
- Merge branch 'sam/fix-dash' into 'master' · 97f04133
  Samuel Keiffer authored Jan 23, 2021
  97f04133
- Sceptre nerfs. · 5e4b6809
  Samuel Keiffer authored Jan 22, 2021
  
  5e4b6809
Jan 22, 2021
- Dash now ticks damage based off distance rather than duration. Fix for golem... · d6be67e0
  Samuel Keiffer authored Jan 22, 2021
  d6be67e0
- Merge branch 'sam/purge-body-from-stats' into 'master' · d58a72e9
  Samuel Keiffer authored Jan 22, 2021
  d58a72e9
- Removed body from stats component as there is already a body component. · 4014b28d
  Samuel Keiffer authored Jan 22, 2021
  
  4014b28d
- Merge branch 'swilliams/golem-hitbox-fix' into 'master' · 4b4504a3
  Joshua Barretto authored Jan 22, 2021
  4b4504a3
- Swilliams/golem hitbox fix · 2a9c4f6f
  Scott Williams authored Jan 22, 2021 and Joshua Barretto committed Jan 22, 2021
  
  2a9c4f6f
- Merge branch 'sam/lactose-tolerant-golems' into 'master' · 6de8ca32
  Justin Shipsey authored Jan 22, 2021
  6de8ca32
- Use improved pullback on golem anim · 6ee87221
  Snowram authored Jan 22, 2021
  
  6ee87221
Jan 21, 2021
- Addressed comments. · b5a3b344
  Samuel Keiffer authored Jan 21, 2021
  
  b5a3b344
- Merge branch 'sam/mindflayer-skills' into 'master' · b11122c9
  Samuel Keiffer authored Jan 21, 2021
  b11122c9
- Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions. · d2f3c1dd
  Samuel Keiffer authored Jan 21, 2021
  
  d2f3c1dd
- Golem spinmelee anim · 8b06d844
  Snowram authored Jan 21, 2021
  
  8b06d844
Jan 20, 2021
- Changed how it moved golem. · aaad5e49
  Samuel Keiffer authored Jan 20, 2021
  
  aaad5e49
- Merge branch 'acrimon/update-deps-1' into 'master' · 8d25532f
  Acrimon authored Jan 20, 2021
  8d25532f
- Golems are now lactose tolerant. · c888ec05
  Samuel Keiffer authored Jan 20, 2021
  
  c888ec05
- update itertools for voxygen · b464a187
  Acrimon authored Jan 20, 2021
  
  b464a187