Sheldon Knuth
|
343c27e559
|
Revamping the audio system for Voxygen from #163
|
2019-07-02 04:10:55 +00:00 |
|
Joshua Barretto
|
c696853487
|
Merge branch 'qutrin/command-stuff' into 'master'
Add /health command
See merge request veloren/veloren!283
|
2019-07-01 20:07:31 +00:00 |
|
Piotr Korgól
|
aec44c4fa6
|
Add /health command
|
2019-07-01 20:07:30 +00:00 |
|
Joshua Barretto
|
48f20a024e
|
Merge branch 'songtronix/fix-server-warnings' into 'master'
fix warnings from server
See merge request veloren/veloren!281
|
2019-07-01 18:49:42 +00:00 |
|
Songtronix
|
a2de533cf0
|
fix warnings from server
|
2019-07-01 18:49:42 +00:00 |
|
Joshua Barretto
|
b2c91896a2
|
Merge branch 'songtronix/fix-warnings-from-world' into 'master'
Fix warnings from world
See merge request veloren/veloren!282
|
2019-07-01 18:40:41 +00:00 |
|
Songtronix
|
229220494d
|
Fix warnings from world
|
2019-07-01 18:40:41 +00:00 |
|
Joshua Barretto
|
c8099783d1
|
Merge branch 'songtronix/clean-server-and-cli' into 'master'
Clean server and server-cli
See merge request veloren/veloren!279
|
2019-07-01 16:38:19 +00:00 |
|
Songtronix
|
c7c488e8c4
|
Clean server and server-cli
|
2019-07-01 16:38:19 +00:00 |
|
Joshua Barretto
|
df934f539e
|
Merge branch 'qutrin/chat-cli-cleanup' into 'master'
Get rid of warnings in chat-cli
See merge request veloren/veloren!280
|
2019-07-01 16:16:35 +00:00 |
|
Piotr Korgól
|
697a442020
|
Get rid of warnings
|
2019-07-01 17:24:41 +02:00 |
|
Joshua Barretto
|
3d2a6632ef
|
Merge branch 'zesterer/small-fixes' into 'master'
Fixed chonk memory usage bug, added block manipulation
See merge request veloren/veloren!278
|
2019-07-01 15:22:04 +00:00 |
|
Joshua Barretto
|
8701cbf8bb
|
Only create one block with /solid
|
2019-07-01 15:38:40 +01:00 |
|
Joshua Barretto
|
62ffdc7c17
|
fmt
|
2019-07-01 14:38:45 +01:00 |
|
Joshua Barretto
|
7b8544c786
|
Fixed remesh data race
|
2019-07-01 14:38:38 +01:00 |
|
Joshua Barretto
|
60a615f257
|
Removed debug printing
|
2019-07-01 14:37:32 +01:00 |
|
Joshua Barretto
|
116206527e
|
Fixed chonk memory usage bug, added block manipulation
|
2019-07-01 14:36:45 +01:00 |
|
Joshua Barretto
|
b98134f26c
|
Merge branch 'wielding-animation' into 'master'
Wielding animation groundwork
See merge request veloren/veloren!276
|
2019-06-30 23:07:53 +00:00 |
|
jshipsey
|
0cf827f980
|
Merge branch 'wielding-animation' of https://gitlab.com/veloren/veloren into wielding-animation
|
2019-06-30 18:54:06 -04:00 |
|
jshipsey
|
c990e4281c
|
glider animation fix
|
2019-06-30 18:53:45 -04:00 |
|
jshipsey
|
0f6b5a99ab
|
rebase
|
2019-06-30 18:53:45 -04:00 |
|
jshipsey
|
cd96c51d00
|
head position fixes
|
2019-06-30 18:53:45 -04:00 |
|
jshipsey
|
a68ae62f3b
|
combat run/jump/idle animation states
|
2019-06-30 18:53:44 -04:00 |
|
jshipsey
|
d48c584d39
|
glider animation fix
|
2019-06-30 18:52:25 -04:00 |
|
Joshua Barretto
|
88a94b6501
|
Merge branch 'zesterer/small-fixes' into 'master'
More small fixes
See merge request veloren/veloren!271
|
2019-06-30 22:52:21 +00:00 |
|
Joshua Barretto
|
ff565823ef
|
fmt
|
2019-06-30 23:46:55 +01:00 |
|
Joshua Barretto
|
4ba7793f5f
|
Fixed minor physics bugs
|
2019-06-30 23:46:46 +01:00 |
|
jshipsey
|
7354e572e5
|
rebase
|
2019-06-30 17:57:30 -04:00 |
|
jshipsey
|
7de011df12
|
head position fixes
|
2019-06-30 17:57:30 -04:00 |
|
jshipsey
|
495b9e94a4
|
combat run/jump/idle animation states
|
2019-06-30 17:57:30 -04:00 |
|
Timo Koesters
|
5f8f6c713a
|
Merge branch 'timo-fix-death' into 'master'
Fix death respawn
See merge request veloren/veloren!275
|
2019-06-30 20:38:49 +00:00 |
|
timokoesters
|
dc357f424f
|
Fix death
|
2019-06-30 22:29:00 +02:00 |
|
Joshua Barretto
|
0fa2883039
|
Prevent movement in unloaded chunks
|
2019-06-30 19:54:13 +01:00 |
|
Joshua Barretto
|
1ff665b11f
|
Prevented stalling when jumping before a block-hopping
|
2019-06-30 19:54:13 +01:00 |
|
Joshua Barretto
|
bf1624608a
|
Merge branch 'issue_109' into 'master'
Configured GameInput::Glide to be managed like the rest of events that stop on key release
See merge request veloren/veloren!274
|
2019-06-30 18:52:19 +00:00 |
|
J. R. Vidal F
|
b8495be66f
|
Configured GameInput::Glide to be managed like the rest of events that stop on key release
|
2019-06-30 20:44:52 +02:00 |
|
Timo Koesters
|
2747c90560
|
Merge branch 'timo-actor-body' into 'master'
Remove Actor and use Body instead
See merge request veloren/veloren!270
|
2019-06-30 17:55:23 +00:00 |
|
timokoesters
|
2154472bd6
|
Fix controls
|
2019-06-30 19:48:38 +02:00 |
|
Joshua Barretto
|
5ac47e26b9
|
Merge branch 'issue_109' into 'master'
Fixed Issue #109 and some related problems that took place while holding shortcut keys
See merge request veloren/veloren!272
|
2019-06-30 17:34:21 +00:00 |
|
timokoesters
|
4b839d80a1
|
Remove Actor and use Body instead
|
2019-06-30 18:57:24 +02:00 |
|
J. R. Vidal F
|
1feda8297f
|
Fixed Issue #109 and some related problems that took place while holding shortcut keys
|
2019-06-30 06:20:50 +02:00 |
|
Joshua Barretto
|
ef994373a5
|
Merge branch 'snok-online-players-cmd' into 'master'
Snok: Show online players cmd
See merge request veloren/veloren!264
|
2019-06-29 22:16:27 +00:00 |
|
Cedric Hutchings
|
426c3d72e6
|
adding a mut
|
2019-06-29 18:05:34 -05:00 |
|
Cedric Hutchings
|
efba3ed827
|
fmt
|
2019-06-29 17:56:10 -05:00 |
|
Cedric Hutchings
|
94ae1a0849
|
implement zesterer suggestion
|
2019-06-29 17:49:56 -05:00 |
|
Cedric Hutchings
|
3ec56fbd80
|
un-un-break the wolf thing no wokry
|
2019-06-29 17:42:16 -05:00 |
|
Cedric Hutchings
|
05c767ecf1
|
fix player count
|
2019-06-29 17:16:16 -05:00 |
|
Joshua Barretto
|
b49856d6e2
|
Merge branch 'zesterer/small-fixes' into 'master'
Block-hopping fix, better dusk shaders
See merge request veloren/veloren!268
|
2019-06-29 22:03:06 +00:00 |
|
Joshua Barretto
|
8deaf7dedf
|
fmt
|
2019-06-29 22:47:24 +01:00 |
|
Joshua Barretto
|
669d7c4a97
|
Block-hopping fix, better dusk shaders
|
2019-06-29 22:47:24 +01:00 |
|