Commits · master · Chris Frantz / veloren · GitLab

Oct 23, 2019
- Merge branch 'pfau/assets-2' into 'master' · 0f555334
  Monty Marz authored Oct 23, 2019
  0f555334
- Multiple Assets and UI fixes and additions · 3e0ac48b
  Monty Marz authored Oct 23, 2019
  
  3e0ac48b
- Merge branch 'xacrimon/error-handling' into 'master' · 3902b8e3
  Acrimon authored Oct 23, 2019
  3902b8e3
- Formatted code. · 57bfb302
  Acrimon authored Oct 23, 2019
  
  57bfb302
- code-style: iter instead of into_iter. · 2215f9ab
  Acrimon authored Oct 23, 2019
  
  2215f9ab
- Drastically improved error messages in client and server. · 6f532a7a
  Acrimon authored Oct 23, 2019
  
  6f532a7a
Oct 22, 2019
- Merge branch 'ifreund-drop-items' into 'master' · 4815a096
  Justin Shipsey authored Oct 22, 2019
  4815a096
- Merge branch 'vechro/aa-fix' into 'master' · 9e7fa0ed
  Imbris authored Oct 22, 2019
  9e7fa0ed
Oct 21, 2019
- Allow dropping items · 355c7666
  Isaac Freund authored Oct 22, 2019
  355c7666
- Merge branch 'soruh/veloren-help-only-show-allowed-main-repo' into 'master' · d35ca01b
  Imbris authored Oct 21, 2019
  d35ca01b
- Fix MSAA x16 · c9787846
  Vechro authored Oct 21, 2019
  
  c9787846
- Don't display commands that the player cannot use. · db69bf23
  soruh authored Oct 21, 2019
  
  db69bf23
Oct 19, 2019
- Merge branch 'shandley/cargo-update-conrod' into 'master' · baf04e75
  Imbris authored Oct 19, 2019
  baf04e75
- WIP (testing) Update conrod_core · eb65e441
  S Handley authored Oct 19, 2019
  eb65e441
Oct 18, 2019
- Merge branch 'songtronix/hotfix' into 'master' · ab8c4a45
  Songtronix authored Oct 18, 2019
  ab8c4a45
- fix(crash): singleplayer · 3e1bf295
  Songtronix authored Oct 18, 2019
  
  3e1bf295
- Merge branch 'songtronix/QoL' into 'master' · 72e18d0e
  Songtronix authored Oct 18, 2019
  72e18d0e
- fix(crash): overflowing the stack · fffffff5
  Songtronix authored Oct 18, 2019
  
  fffffff5
- change(menu): display version with hash and date · fe4a6135
  Songtronix authored Oct 18, 2019
  
  fe4a6135
- change(githash): provide date and hash · 5b716515
  Songtronix authored Oct 18, 2019
  
  5b716515
- Merge branch '276-hotloading-armor' into 'master' · 39656e92
  Imbris authored Oct 18, 2019
  39656e92
Oct 17, 2019
- Removed the recolor property from the armor ron files. · c41627d7
  Adam Fogle authored Oct 17, 2019
  
  c41627d7
- Merge branch 'pfau/assets' into 'master' · 687473c5
  Joshua Barretto authored Oct 17, 2019
  687473c5
- refactor: create_projectile doesn't take a light · fdfab6a8
  Monty Marz authored Oct 17, 2019 and Joshua Barretto committed Oct 17, 2019
  fdfab6a8
- Merge branch 'zesterer/small-fixes' into 'master' · 1f39659a
  Joshua Barretto authored Oct 17, 2019
  1f39659a
- Fixed srgb normal bug · dcf86552
  Joshua Barretto authored Oct 17, 2019
  
  dcf86552
- Better (and faster) water shaders · 04c64dc1
  Joshua Barretto authored Oct 17, 2019
  
  04c64dc1
- Merge branch 'songtronix/include-license' into 'master' · 57e79254
  Joshua Barretto authored Oct 17, 2019
  57e79254
- fix(CI): remove unneeded copy · 1a47cadc
  Songtronix authored Oct 17, 2019
  
  1a47cadc
- change(CI): include LICENSE in artifacts · cde310fa
  Songtronix authored Oct 17, 2019
  
  cde310fa
- Made rolling less violent when changing directions · 013afafb
  Joshua Barretto authored Oct 17, 2019
  
  013afafb
- Merge branch 'shandley/title-music-single-play' into 'master' · b090a1b5
  Joshua Barretto authored Oct 17, 2019
  b090a1b5
- Title music fix (fixes #342 ) · ab59d1f2
  S Handley authored Oct 17, 2019
  ab59d1f2
Oct 16, 2019
- Move computations to terrain fragment shaders · 3279a278
  Joshua Barretto authored Oct 16, 2019
  
  3279a278
- Don't render water that isn't there, improved chunk render order · c01e19fc
  Joshua Barretto authored Oct 16, 2019
  
  c01e19fc
- Merge branch 'sharp/erosion' into 'master' · cc6ad7d6
  Marcel authored Oct 16, 2019
  cc6ad7d6
- Allow canceling chunk generation. · 8ae2692b
  Joshua Yanovski authored Oct 16, 2019 and Marcel committed Oct 16, 2019
  8ae2692b
- Code cleanup, formatting changes, and fixed the cloth belt's offset. · 3a4c307d
  Adam Fogle authored Oct 05, 2019
  
  3a4c307d
Oct 14, 2019
- Merge branch 'zesterer/small-fixes' into 'master' · 6cd78dcb
  Marcel authored Oct 14, 2019
  6cd78dcb
- Smoother movement, Space for climbing · 707b79f2
  Joshua Barretto authored Oct 14, 2019
  
  707b79f2