Commits · master · Aaron Housh / veloren · GitLab

Jul 01, 2019
- Merge branch 'qutrin/command-stuff' into 'master' · 0f38fba8
  Joshua Barretto authored Jul 01, 2019
  0f38fba8
- Add /health command · a66dc9a2
  DrShongos authored Jul 01, 2019 and Joshua Barretto committed Jul 01, 2019
  
  a66dc9a2
- Merge branch 'songtronix/fix-server-warnings' into 'master' · d64ca810
  Joshua Barretto authored Jul 01, 2019
  d64ca810
- fix warnings from server · ea340dda
  Songtronix authored Jul 01, 2019 and Joshua Barretto committed Jul 01, 2019
  
  ea340dda
- Merge branch 'songtronix/fix-warnings-from-world' into 'master' · 8874093b
  Joshua Barretto authored Jul 01, 2019
  8874093b
- Fix warnings from world · 863731f3
  Songtronix authored Jul 01, 2019 and Joshua Barretto committed Jul 01, 2019
  
  863731f3
- Merge branch 'songtronix/clean-server-and-cli' into 'master' · 4cba73ff
  Joshua Barretto authored Jul 01, 2019
  4cba73ff
- Clean server and server-cli · 1ee65a66
  Songtronix authored Jul 01, 2019 and Joshua Barretto committed Jul 01, 2019
  
  1ee65a66
- Merge branch 'qutrin/chat-cli-cleanup' into 'master' · 8b14775a
  Joshua Barretto authored Jul 01, 2019
  8b14775a
- Get rid of warnings · 8368bea6
  DrShongos authored Jul 01, 2019
  
  8368bea6
- Merge branch 'zesterer/small-fixes' into 'master' · 631df590
  Joshua Barretto authored Jul 01, 2019
  631df590
- Only create one block with /solid · a55bbca6
  Joshua Barretto authored Jul 01, 2019
  
  a55bbca6
- fmt · 489f5f6b
  Joshua Barretto authored Jul 01, 2019
  
  489f5f6b
- Fixed remesh data race · 586b62ea
  Joshua Barretto authored Jul 01, 2019
  
  586b62ea
- Removed debug printing · 90566243
  Joshua Barretto authored Jul 01, 2019
  
  90566243
- Fixed chonk memory usage bug, added block manipulation · c8a2e472
  Joshua Barretto authored Jul 01, 2019
  
  c8a2e472
Jun 30, 2019
- Merge branch 'wielding-animation' into 'master' · 4ce89a64
  Joshua Barretto authored Jun 30, 2019
  4ce89a64
- Merge branch 'wielding-animation' of https://gitlab.com/veloren/veloren into wielding-animation · 826a30c1
  Justin Shipsey authored Jun 30, 2019
  
  826a30c1
- glider animation fix · cc548eb6
  Justin Shipsey authored Jun 30, 2019
  
  cc548eb6
- rebase · e9bbe0e8
  Justin Shipsey authored Jun 30, 2019
  
  e9bbe0e8
- head position fixes · aea0d000
  Justin Shipsey authored Jun 30, 2019
  
  aea0d000
- combat run/jump/idle animation states · 2ce5c588
  Justin Shipsey authored Jun 29, 2019
  
  2ce5c588
- glider animation fix · 4e19e46a
  Justin Shipsey authored Jun 30, 2019
  
  4e19e46a
- Merge branch 'zesterer/small-fixes' into 'master' · e4dc145f
  Joshua Barretto authored Jun 30, 2019
  e4dc145f
- fmt · 0de505b7
  Joshua Barretto authored Jun 30, 2019
  
  0de505b7
- Fixed minor physics bugs · 14d90716
  Joshua Barretto authored Jun 30, 2019
  
  14d90716
- rebase · b42c6dba
  Justin Shipsey authored Jun 30, 2019
  
  b42c6dba
- head position fixes · e5bdace1
  Justin Shipsey authored Jun 30, 2019
  
  e5bdace1
- combat run/jump/idle animation states · fa60e231
  Justin Shipsey authored Jun 29, 2019
  
  fa60e231
- Merge branch 'timo-fix-death' into 'master' · 0c92ccbc
  Timo Kösters authored Jun 30, 2019
  0c92ccbc
- Fix death · 370e7db1
  Timo Kösters authored Jun 30, 2019
  
  370e7db1
- Prevent movement in unloaded chunks · b35832c3
  Joshua Barretto authored Jun 30, 2019
  
  b35832c3
- Prevented stalling when jumping before a block-hopping · 2985f947
  Joshua Barretto authored Jun 30, 2019
  
  2985f947
- Merge branch 'issue_109' into 'master' · 45e30d0c
  Joshua Barretto authored Jun 30, 2019
  45e30d0c
- Configured GameInput::Glide to be managed like the rest of events that stop on key release · e2b4b510
  J. R. Vidal F. authored Jun 30, 2019
  
  e2b4b510
- Merge branch 'timo-actor-body' into 'master' · 96a2dfc1
  Timo Kösters authored Jun 30, 2019
  96a2dfc1
- Fix controls · 7fec42ce
  Timo Kösters authored Jun 30, 2019
  
  7fec42ce
- Merge branch 'issue_109' into 'master' · d0e1be91
  Joshua Barretto authored Jun 30, 2019
  d0e1be91
- Remove Actor and use Body instead · 14400f63
  Timo Kösters authored Jun 30, 2019
  
  14400f63
- Fixed Issue #109 and some related problems that took place while holding shortcut keys · fca9590c
  J. R. Vidal F. authored Jun 30, 2019
  
  fca9590c