Commits · master · Henry Marval / veloren

Browse files

Nov 11, 2020
- Merge branch 'sam/fix-assets-update-2' into 'master' · 7ad330af
  Samuel Keiffer authored Nov 11, 2020
  7ad330af
- Yeet · e90104ba
  Samuel Keiffer authored Nov 10, 2020
  
  e90104ba
Nov 10, 2020
- Merge branch 'sam/fix-assets-update' into 'master' · c087b74a
  Samuel Keiffer authored Nov 10, 2020
  c087b74a
- Merge branch 'xMAC94x/clock' into 'master' · 696f607a
  Marcel authored Nov 10, 2020
  696f607a
- Yeet · e6693d59
  Samuel Keiffer authored Nov 10, 2020
  
  e6693d59
- Merge branch 'pfau/assets_update' into 'master' · 670af0ad
  Monty Marz authored Nov 10, 2020
  670af0ad
- frost cleaver · 0e072f72
  Monty Marz authored Nov 10, 2020
  0e072f72
- switch to `spin_sleep` · 72afd7af
  Marcel authored Nov 10, 2020
  
  72afd7af
- massivly switch clock algorithm. · e4e5c6e5
  Marcel authored Nov 10, 2020
  e4e5c6e5
- Merge branch 'james/axe-hammer-keyframes' into 'master' · a8ac051f
  Justin Shipsey authored Nov 10, 2020
  a8ac051f
- Merge branch 'zesterer/worldgen-canvas' into 'master' · b4d337c7
  Joshua Barretto authored Nov 10, 2020
  b4d337c7
Nov 09, 2020
- adjust to comments · db753c4f
  Justin Shipsey authored Nov 09, 2020
  
  db753c4f
- tweaks · cd188fd3
  Justin Shipsey authored Nov 09, 2020
  
  cd188fd3
- Added birch forest · bce61954
  Joshua Barretto authored Nov 09, 2020
  
  bce61954
- Updated changelog, removed old models · b09148ab
  Joshua Barretto authored Nov 09, 2020
  
  b09148ab
- Better snow effects for non-trees · 962f0ec8
  Joshua Barretto authored Nov 09, 2020
  
  962f0ec8
- Reduced oaks in desert · b0f7cdfe
  Joshua Barretto authored Nov 09, 2020
  
  b0f7cdfe
- Better pine forests by shifting average oak temperature · d9550dde
  Joshua Barretto authored Nov 09, 2020
  
  d9550dde
- Better humidity, better snow trees · 71718d9c
  Joshua Barretto authored Nov 09, 2020
  
  71718d9c
- Removed more redundant code, desert dunes, better bridges · 3f02aa51
  Joshua Barretto authored Nov 08, 2020
  
  3f02aa51
- Abandon tree generation when outside bounds · 1036ce8c
  Joshua Barretto authored Nov 07, 2020
  
  1036ce8c
- Turned tree generation into a post-processing layer, ripped out old tree... · 9b233708
  Joshua Barretto authored Nov 07, 2020
  9b233708
- Switched path generation to canvas · 647dcb2f
  Joshua Barretto authored Nov 04, 2020
  
  647dcb2f
- Merge branch 'xMAC94x/auth-link' into 'master' · 981b7175
  Marcel authored Nov 09, 2020
  981b7175
- adjust path to veloren account page · d9f7a721
  Marcel authored Nov 09, 2020
  
  d9f7a721
- Slight balance tweaks. · 9b0e1c8d
  Samuel Keiffer authored Nov 08, 2020
  
  9b0e1c8d
- hammer keyframes · 7aa3de35
  Justin Shipsey authored Nov 08, 2020
  
  7aa3de35
- Minor tweaks. · 8fa7e246
  Samuel Keiffer authored Nov 08, 2020
  
  8fa7e246
- rebase · 0618de13
  Justin Shipsey authored Nov 08, 2020
  
  0618de13
Nov 08, 2020
- ranged · 20efc692
  Justin Shipsey authored Nov 08, 2020
  
  20efc692
- Made bow stay in BasicRanged state while autofiring. · edff3a75
  Samuel Keiffer authored Nov 08, 2020 and Justin Shipsey committed Nov 08, 2020
  
  edff3a75
- axe basic · 92aa6a1b
  Justin Shipsey authored Nov 08, 2020
  
  92aa6a1b
- Initial combo melee for axe M1 · 33e87de1
  James Melkonian authored Oct 16, 2020 and Justin Shipsey committed Nov 08, 2020
  
  33e87de1
- Merge branch 'persistent_waypoints' into 'master' · 91502255
  Imbris authored Nov 08, 2020
  91502255
- Make waypoints persistent · b56919b1
  Christof Petig authored Nov 03, 2020
  b56919b1
- Merge branch 'sam/fix-admin-sword' into 'master' · 3e96c7d2
  Samuel Keiffer authored Nov 08, 2020
  3e96c7d2
- Fixed sneaky admin sword. · 08a0926c
  Samuel Keiffer authored Nov 08, 2020
  
  08a0926c
- Patch for the position de-synchronization by imbris · b11da85f
  Christof Petig authored Nov 08, 2020
  b11da85f
- Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master' · 8cab21d4
  Justin Shipsey authored Nov 08, 2020
  8cab21d4
- Merge branch 'james/unique-weapon-fix' into 'master' · 86aa7f7b
  Justin Shipsey authored Nov 08, 2020
  86aa7f7b