Commit Graph

2132 Commits

Author SHA1 Message Date
Joshua Yanovski
5b1625f99d Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-19 05:15:56 +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
Ryan Baker
3cdf7006e5 fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world 2020-08-18 13:42:40 -04:00
Marcel Märtens
8687740265 fix clippy warnings in new version 2020-08-17 11:10:18 +02:00
Joshua Yanovski
c32b337a46 Fixing LOD grid, for real. 2020-08-17 05:52:04 +02:00
Joshua Yanovski
a166ae0360 Addressing imbris's initial feedback.
Fixes two minor bugs: explosion particles were no longer spawning
randomly, and LOD grids were not perfectly even.
2020-08-17 05:28:05 +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
acc0986040 Lower resolution due to lying drivers. 2020-08-15 22:28:32 +02:00
Joshua Yanovski
d3b878de2a Fix issues msh encountered with Intel 4600. 2020-08-15 22:15:38 +02:00
Joshua Yanovski
10245e0c1b Merge more models into one mesh than we did previously. 2020-08-15 21:15:02 +02:00
Marcel
8f8b20c913 Merge branch 'xMAC94x/release_numbers' into 'master'
Change the version number to 0.7

See merge request veloren/veloren!1296
2020-08-15 10:27:31 +00:00
Marcel Märtens
ed68bff135 Change the version number to 0.7 2020-08-15 11:53:59 +02:00
Justin Shipsey
165c328517 fixed jump anim bug and non-attack bug for bipedlarge 2020-08-14 10:50:08 +00:00
Joshua Yanovski
7204cc8a7a Fix not yet done NPC animations.
This forces them all to be the idle animation if not specified.

This fixes issues where you'd have giant NPCs in water.
2020-08-13 22:34:43 +02:00
Joshua Yanovski
bc83360f2a Try to fix some bugs:
- Z fighting with LOD terrain and water.
- Audio SFX not playing.
2020-08-13 19:37:51 +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
Marcel Märtens
b8234217af fix #690 2020-08-13 10:41:34 +02: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
6633298722 Added terrain scatter densities 2020-08-12 21:15:53 +01:00
Pfauenauge
ee83479748 drop gate parts 2020-08-12 21:15:53 +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 Yanovski
f51dfdeb44 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-12 20:19:04 +02:00
Joshua Yanovski
c6251a956a Cache figures more intelligently.
Cache figures for longer, and don't cache character states for the
player except where they actually affect the rendered model.
2020-08-12 20:15:46 +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
Joshua Yanovski
c11b9bdf0a Remove unneeded Clippy annotation. 2020-08-12 11:47:15 +02:00
scott-c
d38aab8000 fix particle de-synchronisation with paused game 2020-08-10 19:04:30 +08:00
IBotDEU
6b707a1ab7 implemented ability to select bit depth and refresh rate and implemented seperate setting for fullscreen resolution 2020-08-09 20:30:22 +00:00
Imbris
01ad81322d Merge branch 'yusdacra/treeculler-update' into 'master'
change treeculler crate from git to published version

See merge request veloren/veloren!1269
2020-08-09 17:21:15 +00: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
Justin Shipsey
f050aeb273 Merge branch 'master' into 'slipped/swim'
# Conflicts:
#   voxygen/src/anim/src/character/swim.rs
2020-08-09 15:13:56 +00:00
nepo
bc1fabc41b nepo/new bones 2020-08-08 22:37:50 +00:00
jshipsey
37c733a067 clippy, consdensed climb, corrected some swim bugs 2020-08-08 17:04:50 -04:00
jshipsey
d7b3e84153 swim alterations to condense the body on strong turns 2020-08-08 13:47:32 -04:00
jshipsey
be3ed4b238 minor anim tweak 2020-08-08 13:47:32 -04:00
jshipsey
854361cdaa changelog 2020-08-08 13:47:32 -04:00
jshipsey
316546af22 bandaid fix for swim wield 2020-08-08 13:47:32 -04:00
jshipsey
9ff5c23cf0 readd sneak 2020-08-08 13:47:32 -04:00
jshipsey
691607f398 swimming changes 2020-08-08 13:47:32 -04:00
scott-c
cae84dd4c9 fix rebase 2020-08-08 20:53:07 +08:00