Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,557 Commits 151 Branches 18 Tags 2.1 GiB
be00d49b01
Commit Graph

1557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Korgól
8368bea654 Get rid of warnings 2019-07-01 17:24:41 +02:00
Joshua Barretto
631df59083 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
a55bbca6e3 Only create one block with /solid 2019-07-01 15:38:40 +01:00
Joshua Barretto
489f5f6b2a fmt 2019-07-01 14:38:45 +01:00
Joshua Barretto
586b62ea28 Fixed remesh data race 2019-07-01 14:38:38 +01:00
Joshua Barretto
90566243ca Removed debug printing 2019-07-01 14:37:32 +01:00
Joshua Barretto
c8a2e4722c Fixed chonk memory usage bug, added block manipulation 2019-07-01 14:36:45 +01:00
Joshua Barretto
4ce89a6406 Merge branch 'wielding-animation' into 'master' 
Wielding animation groundwork

See merge request veloren/veloren!276
 2019-06-30 23:07:53 +00:00
jshipsey
826a30c178 Merge branch 'wielding-animation' of https://gitlab.com/veloren/veloren into wielding-animation 2019-06-30 18:54:06 -04:00
jshipsey
cc548eb669 glider animation fix 2019-06-30 18:53:45 -04:00
jshipsey
e9bbe0e800 rebase 2019-06-30 18:53:45 -04:00
jshipsey
aea0d0002b head position fixes 2019-06-30 18:53:45 -04:00
jshipsey
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
jshipsey
4e19e46a24 glider animation fix 2019-06-30 18:52:25 -04:00
Joshua Barretto
e4dc145f17 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
0de505b74c fmt 2019-06-30 23:46:55 +01:00
Joshua Barretto
14d9071670 Fixed minor physics bugs 2019-06-30 23:46:46 +01:00
jshipsey
b42c6dba61 rebase 2019-06-30 17:57:30 -04:00
jshipsey
e5bdace124 head position fixes 2019-06-30 17:57:30 -04:00
jshipsey
fa60e231d0 combat run/jump/idle animation states 2019-06-30 17:57:30 -04:00
Timo Koesters
0c92ccbc99 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
370e7db1ee
Fix death 2019-06-30 22:29:00 +02:00
Joshua Barretto
b35832c37d Prevent movement in unloaded chunks 2019-06-30 19:54:13 +01:00
Joshua Barretto
2985f94751 Prevented stalling when jumping before a block-hopping 2019-06-30 19:54:13 +01:00
Joshua Barretto
45e30d0c84 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
e2b4b5106a 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
96a2dfc15d 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
7fec42ce2c
Fix controls 2019-06-30 19:48:38 +02:00
Joshua Barretto
d0e1be91b1 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
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
J. R. Vidal F
fca9590cee Fixed Issue #109 and some related problems that took place while holding shortcut keys 2019-06-30 06:20:50 +02:00
Joshua Barretto
b1a7a61d77 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
6bda6e2025 adding a mut 2019-06-29 18:05:34 -05:00
Cedric Hutchings
5c19ddb06c fmt 2019-06-29 17:56:10 -05:00
Cedric Hutchings
0bc6b64002 implement zesterer suggestion 2019-06-29 17:49:56 -05:00
Cedric Hutchings
9777bd8fa5 un-un-break the wolf thing no wokry 2019-06-29 17:42:16 -05:00
Cedric Hutchings
af0358c7c8 fix player count 2019-06-29 17:16:16 -05:00
Joshua Barretto
c7d79f678e 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
af755c0964 fmt 2019-06-29 22:47:24 +01:00
Joshua Barretto
f2df3a9d18 Block-hopping fix, better dusk shaders 2019-06-29 22:47:24 +01:00
Joshua Barretto
f1ba97ae7a Merge branch 'timo-rolling-fix' into 'master' 
Rolling bugs + NPC bugs + "Impossible" bug

See merge request veloren/veloren!265
 2019-06-29 21:47:05 +00:00
timokoesters
ccbacabd2f
Make agents use controller correctly 2019-06-29 22:51:22 +02:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
timokoesters
5fcf6ededa
magnitude_squared everywhere, actionstate everywhere, constant for moving 2019-06-29 22:11:21 +02:00
timokoesters
610c86a3b9
Animation fixes 2019-06-29 21:01:27 +02:00
timokoesters
9f83533741
Fix invisible characters 2019-06-29 20:24:07 +02:00
timokoesters
c80351f6ca
Fix double roll bug 2019-06-29 19:49:51 +02:00
Joshua Barretto
e8fbab7ba8 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

Closes #174, #114, #148, and #176

See merge request veloren/veloren!266
 2019-06-29 16:11:35 +00:00
Joshua Barretto
324de39bfe fmt 2019-06-29 16:48:43 +01:00
Joshua Barretto
0f386bbedb Made days less blue and nights less light 2019-06-29 16:48:43 +01:00