1138 Commits

Author SHA1 Message Date
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
Joshua Barretto
5bfc012be3 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
6f39f30630 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02:00
Joshua Barretto
7a5a7b102c Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
dbae541f7f Fixed missing assets 2019-06-13 11:59:05 +01:00
Monty Marz
cf4a73505c palette changes 2019-06-13 11:59:05 +01:00
Joshua Barretto
32ddcd2ab3 Added grass blending 2019-06-13 11:59:05 +01:00
Joshua Barretto
48921c4730 Added dirt/stone gradient 2019-06-13 11:59:05 +01:00
Joshua Barretto
2cb57b9456 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Pfauenauge90
4fd3caee6e small fixes 2019-06-13 11:59:05 +01:00
Pfauenauge90
22e0dbe227 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Joshua Barretto
00e970bbeb Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
777e3242fd Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
9f31c01f43 Added more terrain noise, better snow 2019-06-13 11:59:05 +01:00