Commits · master · whbrown / veloren

Browse files

Jan 31, 2021
- Merge branch 'james/npc-interaction' into 'master' · bf07947a
  Joshua Barretto authored Jan 31, 2021
  bf07947a
- Add basic NPC interaction and fix NPC chat spamming · 23b1df3c
  James Melkonian authored Jan 31, 2021 and Joshua Barretto committed Jan 31, 2021
  
  23b1df3c
- Merge branch 'zesterer/snow' into 'master' · 75539831
  Joshua Barretto authored Jan 31, 2021
  75539831
- Added snow particles · 60c16e57
  Joshua Barretto authored Jan 31, 2021
  
  60c16e57
- Merge branch 'DaforLynx/cricket-fix' into 'master' · b93a2b02
  Imbris authored Jan 31, 2021
  b93a2b02
- Aughihopethisworks · b906473f
  DaforLynx authored Jan 30, 2021
  
  b906473f
Jan 30, 2021
- Merge branch 'james/poise-hotfix' into 'master' · a8e32b0f
  Samuel Keiffer authored Jan 30, 2021
  a8e32b0f
Jan 29, 2021
- Quick poise fix · ea13f754
  James Melkonian authored Jan 29, 2021
  
  ea13f754
- Merge branch 'sam/readd-knockback' into 'master' · 76a575da
  Samuel Keiffer authored Jan 29, 2021
  76a575da
- Restored knockback to hammer. · e38ecafc
  Samuel Keiffer authored Jan 29, 2021
  
  e38ecafc
- Merge branch 'fix-backpack' into 'master' · a11786cb
  Samuel Keiffer authored Jan 29, 2021
  a11786cb
- Fix traveller backpack having all its slots removed · a1e56c69
  Treeco authored Jan 29, 2021
  
  a1e56c69
- Merge branch 'DaforLynx/small-sound-fixes' into 'master' · b88f0421
  Marcel authored Jan 29, 2021
  b88f0421
- Small audio fixes; addresses #939 and #940 · c6e262c4
  DaforLynx authored Jan 29, 2021 and Marcel committed Jan 29, 2021
  
  c6e262c4
- Merge branch 'james/poise' into 'master' · f1bf8b6b
  Samuel Keiffer authored Jan 29, 2021
  f1bf8b6b
- Address some comments · a0244482
  James Melkonian authored Jan 26, 2021
  a0244482
- Add migration for starter gear · 46c8c744
  James Melkonian authored Jan 25, 2021
  
  46c8c744
- Fix rebase and scrub poise from UI · 152156d0
  James Melkonian authored Jan 25, 2021
  
  152156d0
- animal stuns · d4562719
  Justin Shipsey authored Jan 14, 2021 and James Melkonian committed Jan 28, 2021
  d4562719
- Some preliminary balancing · 661764f4
  James Melkonian authored Jan 12, 2021
  661764f4
- starting stun anim · 29732bb7
  Justin Shipsey authored Dec 18, 2020 and James Melkonian committed Jan 28, 2021
  29732bb7
- Made stunned state invulnerable to poise damage · 0f244bf8
  James Melkonian authored Dec 16, 2020
  0f244bf8
- Poise stats · dd69b5f2
  James Melkonian authored Dec 16, 2020
  
  dd69b5f2
- Add knockback to poise · af076aa8
  James Melkonian authored Dec 09, 2020
  
  af076aa8
- Very basic functioning stun · e3965ae0
  James Melkonian authored Dec 05, 2020
  
  e3965ae0
- Initial broken implementation of poise · c83296a4
  James Melkonian authored Dec 05, 2020
  c83296a4
Jan 27, 2021
- Merge branch 'james/update-rand' into 'master' · 4c7da15d
  Imbris authored Jan 27, 2021
  4c7da15d
- Update rand dependency · 8b971992
  James Melkonian authored Jan 26, 2021
  
  8b971992
- Merge branch 'sam/energy-fix' into 'master' · e6620c21
  Samuel Keiffer authored Jan 27, 2021
  e6620c21
- Fixed base energy being 0. · 680a4e4d
  Samuel Keiffer authored Jan 26, 2021
  
  680a4e4d
Jan 26, 2021
- Merge branch 'entropy9s/StaminaPlus' into 'master' · c4d7fa7f
  Samuel Keiffer authored Jan 26, 2021
  c4d7fa7f
- StaminaPlus buff, modifying stamina via buffs · 1f6cf7e1
  Entropy9s authored Jan 26, 2021 and Samuel Keiffer committed Jan 26, 2021
  1f6cf7e1
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