Commit Graph

1377 Commits

Author SHA1 Message Date
Joshua Yanovski
e44a1cbf46 Address imbris feedback.
Temporarily disables shiny water, lowers max VD.

These restrictions will be lifted soon after merging.
2020-08-20 09:29:39 +02:00
Joshua Yanovski
c95e07db3b Address MR feedback, fix scene clouds. 2020-08-20 05:46:22 +02:00
Joshua Yanovski
e2f5162e4f World colors are all hotloadable.
They live in assets/world/style/colors.ron.

Only a small handful of hardcoed colors remain in World; they are either
part of the map, or difficult to disentangle from the rest of the
computation.  Comments are made where appropriate.
2020-08-20 04:28:38 +02:00
Joshua Yanovski
d71003acda Hotloading colors, part 1: colors in common.
Currently, this just entails humanoid colors.  There are only three
colors not handled; the light emitter colors in
common/src/comp/inventory/item/tool.rs.  These don't seem important
enough to me to warrant making hotloadable, at least not right now, but
if it's needed later we can always add them to the file.
2020-08-19 05:14:34 +02:00
Joshua Yanovski
548680276a Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-16 19:26:06 +02:00
Joshua Yanovski
10245e0c1b Merge more models into one mesh than we did previously. 2020-08-15 21:15:02 +02:00
Marcel Märtens
ed68bff135 Change the version number to 0.7 2020-08-15 11:53:59 +02:00
Joshua Yanovski
1fd104aa60 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-13 12:02:31 +02:00
Imbris
a763bbe73c Improve the perf of the physics system using par_join as well as removing the trait object closure to allow for the compiler to perform more optimizations 2020-08-13 04:32:05 -04:00
Joshua Yanovski
862df3c997 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-13 05:52:56 +02:00
Joshua Barretto
75c1d44010 Merge branch 'zesterer/worldsim' into 'master'
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
2020-08-12 21:40:56 +00:00
Joshua Barretto
e3cab272c3 Fixed floating sprites in towns, clippy fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
50a85853e3 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
85ed5ad356 Updated changelog, cleaned up warnings, minor fixes 2020-08-12 21:16:11 +01:00
Joshua Barretto
15b1717295 Added decals to towns 2020-08-12 21:15:53 +01:00
Joshua Barretto
6992194ad4 Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
Monty Marz
c1b07465cf added grass sprites 2020-08-12 21:15:53 +01:00
Joshua Barretto
9329b4ce55 Added monsters to caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
d7ccb28ea7 Pathfinding improvements 2020-08-12 21:15:53 +01:00
Joshua Barretto
d48ed42fda Prevented NPCs running gleefully off cliffs without a second thought 2020-08-12 21:15:53 +01:00
Pfauenauge
ee83479748 drop gate parts 2020-08-12 21:15:53 +01:00
Joshua Barretto
dfecf0dad6 Massively improved pathfinding reliability 2020-08-12 21:15:53 +01:00
Joshua Barretto
9bb10a6d00 Various improvements to castles, dungeons and more 2020-08-12 21:15:53 +01:00
Joshua Barretto
0bad704719 Made agents flee 2020-08-12 21:15:53 +01:00
Joshua Barretto
41229b4665 Added large caves, cave scatter, removed old caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
a9126f7e25 Simulation improvements, removed block glows 2020-08-12 21:15:52 +01:00
Joshua Barretto
bdb39b8e7f Better castle variation, improved paths, multi-storey houses 2020-08-12 21:15:52 +01:00
Joshua Barretto
41916d4594 Better castles, initial light prop for lit objects 2020-08-12 21:15:52 +01:00
WelshPixie
568a3e375e fixed sprite rotations 2020-08-12 21:15:52 +01:00
Joshua Barretto
d6cdb0c433 Began adding castles 2020-08-12 21:15:52 +01:00
Joshua Barretto
1f4cec773b Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
f21a50e393 Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Joshua Yanovski
f51dfdeb44 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-12 20:19:04 +02:00
Monty Marz
fcdd875bff UI fixes, assets update 2020-08-12 18:10:18 +00:00
Joshua Yanovski
0ed801d540 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-12 16:32:24 +02:00
Monty Marz
6789b7ae27 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
9aab296264 Add firework item 2020-08-12 22:25:28 +08:00
Imbris
893da3622a Merge branch 'scott-c/particles' into 'master'
Particles

See merge request veloren/veloren!1156
2020-08-09 17:09:43 +00:00
jshipsey
45971fa403 state corrections 2020-08-08 17:05:48 -04:00
jshipsey
9ff5c23cf0 readd sneak 2020-08-08 13:47:32 -04:00
scott-c
a0107d5cda fix rebase 2020-08-08 19:26:52 +08:00
scott-c
cc36e9c300 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
bb8ba75287 cleanup redundant function 2020-08-08 19:26:52 +08:00
Joshua Barretto
7c31baef6f Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
scott-c
1a263834e7 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
bb2a5c885b Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4bc373a832 remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
3139e85dff allow for col particles 2020-08-08 19:25:00 +08:00
scott-c
803677f0fb Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
da5f4828a5 Add particle lifespan 2020-08-08 19:25:00 +08:00