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,149 Commits 151 Branches 18 Tags 2.1 GiB
153ab47b58
Commit Graph

1149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
153ab47b58 Merge branch 'angelonfira/add-manual-exe-step' into 'master' 
Added manual build option

See merge request veloren/veloren!243
 2019-06-19 15:51:21 +00:00
Forest Anderson
92c5a7dd7c Added manual build option 2019-06-19 15:51:21 +00:00
Marcel
99f248529c Merge branch 'timo-fix-join' into 'master' 
Timo fix join

See merge request veloren/veloren!240
 2019-06-17 19:30:41 +00:00
timokoesters
9701a666d9
Don't try to compensate bad states 2019-06-17 20:10:47 +02:00
timokoesters
57894a0368
Fix join problems 2019-06-17 19:52:06 +02:00
Joshua Barretto
48d925622f Merge branch 'qutrin-chat-cli' into 'master' 
Make chat-cli read user input

Closes #150

See merge request veloren/veloren!239
 2019-06-17 11:15:42 +00:00
Piotr Korgól
f460fc5e2a fmt 2019-06-17 15:10:14 +02:00
Piotr Korgól
d33c4e35c5 read input on a different thread 2019-06-17 15:07:55 +02:00
Piotr Korgól
a4a835d26b fmt 2019-06-17 12:40:50 +02:00
Piotr Korgól
3ddc56e4ac Allow client to read user input 2019-06-17 12:40:19 +02:00
Joshua Barretto
121d9e0d61 Merge branch 'zesterer/net-fixes' into 'master' 
Network fix for 32-bit

See merge request veloren/veloren!238
 2019-06-16 22:01:18 +00:00
Joshua Barretto
62f148b46f Network fix for 32-bit 2019-06-16 22:59:25 +01:00
Joshua Barretto
ceff450233 Merge branch 'timo-rebase-slipped-on-midge' into 'master' 
ECS organization + Rolling animation

See merge request veloren/veloren!235
 2019-06-16 19:56:44 +00:00
Joshua Barretto
9ad2feb037 Ignore ForcedUpdate insertion 2019-06-16 20:53:10 +01:00
timokoesters
eb10389eb6
cargo fmt 2019-06-16 19:59:16 +02:00
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
jshipsey
8dd1e46883
run tweaks 2019-06-16 19:59:15 +02:00
jshipsey
ed2773fbca
changed hand motion on run animation 2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration 2019-06-16 19:59:14 +02:00
timokoesters
14ff033770
Fix glider 2019-06-16 19:59:14 +02:00
timokoesters
2afc45617d
More input validation 2019-06-16 19:59:14 +02:00
jshipsey
0c534efddd
adjusted v-tilt, roll speed, run animation tempo 2019-06-16 19:59:13 +02:00
jshipsey
e066d98762
slight roll tweak, altered speeds in physics 2019-06-16 19:59:13 +02:00
timokoesters
ae081b8f67
Make roll timed 2019-06-16 19:59:13 +02:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
955c20fa61
Remove crun and cidle components and inputs 2019-06-16 19:57:04 +02:00
timokoesters
e2c81dd036
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
4de5489367
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
Cody
1f6c1188bc
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
b947d78dac
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
132d1a67a6 Merge branch 'zesterer-worldgen-stuff' into 'master' 
Worldgen stuff

See merge request veloren/veloren!217
 2019-06-16 10:46:59 +00:00
Joshua Barretto
8a490a6456 Merge branch '134-merge-all-spawning-commands-into-one' into 'master' 
Resolve "Merge all spawning commands into one"

Closes #134

See merge request veloren/veloren!237
 2019-06-16 10:45:54 +00:00
Joshua Barretto
76344d142e Added clouds 2019-06-15 18:23:01 +01:00
liids
e670f9b126 small fixes 2019-06-15 17:23:53 +02:00
Joshua Barretto
4da01fba9a Fixed world viewer stack overflow on Windows 2019-06-15 15:50:54 +01:00
liids
bcf7127736 make it more laconic 2019-06-15 15:42:39 +02:00
liids
6670c2b8fa fix formatting 2019-06-15 14:55:06 +02:00
Joshua Barretto
73e999af87 Stopped printing chunk location every frame 2019-06-15 13:44:50 +01:00
Joshua Barretto
bab7746a8a Updated and fixed world viewer example 2019-06-15 13:34:28 +01:00
liids
8b2b931c17 make minimum spawn amount higher than 0 2019-06-15 14:30:05 +02:00
liids
f726d755b7 fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
cca41a3333 fix negative spawn amounts 2019-06-15 11:32:07 +02:00
liids
b733f9739d Merge branch 'master' of https://gitlab.com/liids/veloren 2019-06-15 11:15:10 +02:00
liids
2cc2a36be2 make amount optional 2019-06-15 10:22:36 +02:00
liids
c859371ddb Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
4179125133 Merge branch 'toolchain-file' into 'master' 
Automatic nightly toolchain selection

See merge request veloren/veloren!236
 2019-06-14 12:49:29 +00:00
Mckol
d9234fdb12 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02:00