Commits · master · Hari Rana / veloren

Browse files

Feb 28, 2021
- Merge branch 'sam/combo-comp' into 'master' · cb267ac3
  Samuel Keiffer authored Feb 28, 2021
  cb267ac3
- Merge branch 'zesterer-master-patch-28400' into 'master' · b9b36e0b
  Joshua Barretto authored Feb 28, 2021
  b9b36e0b
- Merge branch 'snowram/f64-anim-cleanup' into 'master' · 8b3aabfe
  Justin Shipsey authored Feb 28, 2021
  8b3aabfe
- Re-allowed for what stage you were on to persist through a roll · b25a3769
  Samuel Keiffer authored Feb 27, 2021
  
  b25a3769
Feb 27, 2021
- Combo melee now checks combo · 404c7f09
  Samuel Keiffer authored Feb 27, 2021
  
  404c7f09
- fmt · 6051c064
  Joshua Barretto authored Feb 27, 2021
  
  6051c064
- Reduces the instances of f64 in anims · 7f227632
  Snowram authored Feb 27, 2021
  
  7f227632
- Merge branch 'slipped/animtweaks' into 'master' · 04c698be
  Justin Shipsey authored Feb 27, 2021
  04c698be
- look-based anims · b4627dfe
  Justin Shipsey authored Feb 27, 2021
  
  b4627dfe
- Added combo component · f24433c8
  Samuel Keiffer authored Feb 27, 2021
  
  f24433c8
- Merge branch 'pfau/tutorial_mvp' into 'master' · 5589a7b7
  Monty Marz authored Feb 27, 2021
  5589a7b7
- reroute the F1 key to open the controls settings, removed loading screen tips... · e5273e3a
  Monty Marz authored Feb 27, 2021
  e5273e3a
- Merge branch 'slipped/gremlins' into 'master' · d2fffa1a
  Justin Shipsey authored Feb 27, 2021
  d2fffa1a
- Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' · fa809fc2
  Samuel Keiffer authored Feb 27, 2021
  fa809fc2
- weapon/manifest tweaks · 16720a68
  Justin Shipsey authored Feb 27, 2021
  
  16720a68
- Issue #836 - Declutter the scrolling combat text · 3fe5f448
  Lerg-exe authored Feb 26, 2021
  
  3fe5f448
- Particle rebase fixes · 238fcaf5
  Samuel Keiffer authored Feb 26, 2021 and Justin Shipsey committed Feb 27, 2021
  
  238fcaf5
- feedback adjustments · 8d316aac
  Justin Shipsey authored Feb 26, 2021
  
  8d316aac
- address comments · 0a353576
  Justin Shipsey authored Feb 25, 2021
  
  0a353576
- Adds harvester npc · 17112926
  Snowram authored Feb 25, 2021 and Justin Shipsey committed Feb 27, 2021
  
  17112926
- visual weapon variation, adjust minotaur dash, keyframed golem quake · 51bc74b2
  Justin Shipsey authored Feb 23, 2021
  
  51bc74b2
- minotaur moves, added claygolem · 16a44cd5
  Justin Shipsey authored Feb 22, 2021
  
  16a44cd5
- balance pass 2 · 417f4638
  Justin Shipsey authored Feb 21, 2021
  
  417f4638
- rebase, yeti in dungeon · 79ec9115
  Justin Shipsey authored Feb 20, 2021
  
  79ec9115
- initial balance · e06ebf35
  Justin Shipsey authored Feb 20, 2021
  
  e06ebf35
- Adds yeti npc · 858fbe1a
  Snowram authored Feb 20, 2021 and Justin Shipsey committed Feb 27, 2021
  
  858fbe1a
- dash, spin, jump changes · 30af3a44
  Justin Shipsey authored Feb 17, 2021
  
  30af3a44
- Adds 3 new npcs, tusk ram new design · 1b9815dc
  Snowram authored Feb 18, 2021 and Justin Shipsey committed Feb 27, 2021
  
  1b9815dc
- Ice particles for Wendigo · 53b0ba28
  Samuel Keiffer authored Feb 16, 2021 and Justin Shipsey committed Feb 27, 2021
  
  53b0ba28
- theropod retrofit, some more moves · ce3b2141
  Justin Shipsey authored Feb 14, 2021
  
  ce3b2141
- some new moves, combine biped weapons into one file · 5792faa9
  Justin Shipsey authored Feb 14, 2021
  
  5792faa9
- full bipedsmall armor swaps · 57d5e90d
  Justin Shipsey authored Feb 13, 2021
  
  57d5e90d
- Fixed particles. · df70976f
  Samuel Keiffer authored Feb 13, 2021 and Justin Shipsey committed Feb 27, 2021
  
  df70976f
- anim tweaks, more loadout setup · cb59c801
  Justin Shipsey authored Feb 12, 2021
  
  cb59c801
- golem retrofit · 130d5178
  Justin Shipsey authored Feb 11, 2021
  
  130d5178
- Improve particles · a4513fe0
  Timo Kösters authored Jan 08, 2021 and Justin Shipsey committed Feb 27, 2021
  
  a4513fe0
- speedier weapons initial testing · 952a77f9
  Justin Shipsey authored Feb 11, 2021
  
  952a77f9
- BL improvements, various fixes · aa4237b0
  Justin Shipsey authored Feb 10, 2021
  
  aa4237b0
- rebase · e4e25e20
  Justin Shipsey authored Feb 01, 2021
  
  e4e25e20
- rendering · 0dc8b2e4
  Justin Shipsey authored Jan 23, 2021
  
  0dc8b2e4