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,151 Commits 151 Branches 18 Tags
Commit Graph

1151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Piotr Korgól
b88183ea7c Update readme.md 2019-06-22 19:26:40 +02:00
Piotr Korgól
ada27088dc Update image 2019-06-22 18:50:50 +02:00
Forest Anderson
9e6fef3801 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
c38d783bce Added manual build option 2019-06-19 15:51:21 +00:00
Marcel
7b6155c9de 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
d7b90920c3
Don't try to compensate bad states 2019-06-17 20:10:47 +02:00
timokoesters
1fbb429dbd
Fix join problems 2019-06-17 19:52:06 +02:00
Joshua Barretto
9b80628d3d 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
9f50f612a3 fmt 2019-06-17 15:10:14 +02:00
Piotr Korgól
fc71ffa506 read input on a different thread 2019-06-17 15:07:55 +02:00
Piotr Korgól
2bd16702d0 fmt 2019-06-17 12:40:50 +02:00
Piotr Korgól
132111266f Allow client to read user input 2019-06-17 12:40:19 +02:00
Joshua Barretto
1e3ca7bed3 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
c27120128e Network fix for 32-bit 2019-06-16 22:59:25 +01:00
Joshua Barretto
1c044731ff 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
d87ccb40b5 Ignore ForcedUpdate insertion 2019-06-16 20:53:10 +01:00
timokoesters
1c98fcc445
cargo fmt 2019-06-16 19:59:16 +02:00
timokoesters
f2d5faab8f
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
jshipsey
b9663916fa
run tweaks 2019-06-16 19:59:15 +02:00
jshipsey
741f7008ed
changed hand motion on run animation 2019-06-16 19:59:15 +02:00
jshipsey
c18d7c72f4
lowered roll duration 2019-06-16 19:59:14 +02:00
timokoesters
a08b1b6fd7
Fix glider 2019-06-16 19:59:14 +02:00
timokoesters
c27fd0db82
More input validation 2019-06-16 19:59:14 +02:00
jshipsey
fd8d506084
adjusted v-tilt, roll speed, run animation tempo 2019-06-16 19:59:13 +02:00
jshipsey
6ff81e37f4
slight roll tweak, altered speeds in physics 2019-06-16 19:59:13 +02:00
timokoesters
c40a44d0e0
Make roll timed 2019-06-16 19:59:13 +02:00
jshipsey
9bbbc3253a
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
timokoesters
80e95e2e6c
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
d8510274be
Remove crun and cidle components and inputs 2019-06-16 19:57:04 +02:00
timokoesters
a46fcdf1ec
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
13ee9b52fc
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
Cody
244b27cb29
Removes input sys, moves code to combat and phys 2019-06-16 19:57:03 +02:00
timokoesters
facbb622d6
Improve organization of controls 2019-06-16 19:57:03 +02:00
timokoesters
f5a2dcb98e
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
ae528f12e0 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
b7d3cc952c 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
5e22185884 Added clouds 2019-06-15 18:23:01 +01:00
liids
914d897b38 small fixes 2019-06-15 17:23:53 +02:00
Joshua Barretto
1f36f6d5e8 Fixed world viewer stack overflow on Windows 2019-06-15 15:50:54 +01:00
liids
e13f57979f make it more laconic 2019-06-15 15:42:39 +02:00
liids
e4e6cbb995 fix formatting 2019-06-15 14:55:06 +02:00
Joshua Barretto
42e9144eca Stopped printing chunk location every frame 2019-06-15 13:44:50 +01:00
Joshua Barretto
f9127b6a81 Updated and fixed world viewer example 2019-06-15 13:34:28 +01:00
liids
847bcbee88 make minimum spawn amount higher than 0 2019-06-15 14:30:05 +02:00
liids
dcce12e5ce fix formatting 2019-06-15 13:48:14 +02:00
Joshua Barretto
226ac08ee3 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
liids
883d66f166 fix negative spawn amounts 2019-06-15 11:32:07 +02:00
liids
62ff7c5024 Merge branch 'master' of https://gitlab.com/liids/veloren 2019-06-15 11:15:10 +02:00
liids
928c613794 make amount optional 2019-06-15 10:22:36 +02:00
liids
c2d0f17f92 Merge all spawn commands into one 2019-06-15 09:56:27 +02:00