ec0aeb18e8
Hopefully final commit for the LOD branch.
2020-08-20 15:38:50 +02:00
5e8ea0b1ea
Falling back to power as stopgap.
2020-08-20 10:14:26 +02:00
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
561e25778a
Tweaking shaders a bit.
2020-08-20 08:31:13 +02:00
7d19259078
Fix view example as well.
2020-08-20 07:59:43 +02:00
051cd4934e
Fix meshing benchmark.
2020-08-20 07:29:06 +02:00
c95e07db3b
Address MR feedback, fix scene clouds.
2020-08-20 05:46:22 +02:00
1bfb816cab
Incorporating Pfau's figure color changes.
...
New eyes and new humanoid colors.
2020-08-20 04:39:36 +02:00
3f9b89a3ac
Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes
2020-08-20 04:29:41 +02:00
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
62c53963ab
replace pretty_env_logger with tracing
2020-08-19 15:59:34 +02:00
5b1625f99d
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-19 05:15:56 +02:00
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
4942b5b394
Merge branch 'rdbaker/fix-settings-unpause-bug' into 'master'
...
fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world
Closes #712
See merge request veloren/veloren!1312
2020-08-18 22:55:05 +00:00
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
bc7f0731fc
Merge branch 'netfix5' into 'master'
...
Netfix5
See merge request veloren/veloren!1305
2020-08-17 15:26:28 +00:00
08e7063a36
no longer block when disconnecting a player
2020-08-17 16:34:02 +02:00
1beea5967f
investigate if participant mutex causes server hang
2020-08-17 14:21:52 +02:00
63b5e0e553
Merge remote-tracking branch 'origin/master' into sharp/small-fixes
2020-08-17 13:05:37 +02:00
6d2c4b9c1a
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
fix master / update toolchain to `2020-08-15`
See merge request veloren/veloren!1302
2020-08-17 10:32:10 +00:00
8687740265
fix clippy warnings in new version
2020-08-17 11:10:18 +02:00
10970841cc
fix master / update toolchain to 2020-08-15
2020-08-17 10:28:09 +02:00
c32b337a46
Fixing LOD grid, for real.
2020-08-17 05:52:04 +02:00
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
4cbad004f4
Bumping nightly per request.
2020-08-16 19:27:58 +02:00
548680276a
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-16 19:26:06 +02:00
acc0986040
Lower resolution due to lying drivers.
2020-08-15 22:28:32 +02:00
d3b878de2a
Fix issues msh encountered with Intel 4600.
2020-08-15 22:15:38 +02:00
10245e0c1b
Merge more models into one mesh than we did previously.
2020-08-15 21:15:02 +02:00
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
ed68bff135
Change the version number to 0.7
2020-08-15 11:53:59 +02:00
63cf5aa69c
Merge branch 'revert-9f53a4a1' into 'master'
...
Revert "Merge branch 'vzikl/add-zh-translation' into 'master'" Because we don't had the license for the chineese font file
See merge request veloren/veloren!1293
2020-08-15 09:36:21 +00:00
3dc1f01580
Revert "Merge branch 'vzikl/add-zh-translation' into 'master'"
...
This reverts merge request !1241
2020-08-14 22:32:50 +00:00
13f598489d
Merge branch 'slipped/fixes' into 'master'
...
fixed jump anim bug and non-attack bug for bipedlarge
See merge request veloren/veloren!1288
2020-08-14 10:50:08 +00:00
165c328517
fixed jump anim bug and non-attack bug for bipedlarge
2020-08-14 10:50:08 +00:00
17730d6a4b
Merge branch 'yusdacra/update-tr-translation' into 'master'
...
tr_TR localization: add missing keys and update some
See merge request veloren/veloren!1291
2020-08-13 23:50:06 +00:00
94a997f327
tr_TR localization: add missing keys and update some
2020-08-13 23:50:06 +00:00
3155c31e66
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 22:35:22 +02:00
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
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
3c199280e8
Merge branch 'netfix4' into 'master'
...
Fix a isse that might occur when a participant is dropped while the remote...
See merge request veloren/veloren!1290
2020-08-13 11:31:42 +00:00
e618eeb386
Fix a isse that might occur when a participant is dropped while the remote wants to open a Stream and we get some bad time condition.
...
increase the slowlorris timeout. for some reason it seems to trigger alot more often since commit: `75c1d440` but i have no idea why.
My guess would be that the initial sync now sends way more data which slows down TCP to be > 10ms and trigger. Note: the fix might cause small lags when slow people try to connect to the server
2020-08-13 12:06:53 +02:00
1fd104aa60
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 12:02:31 +02:00
7c2c392a3a
Merge branch 'imbris/par-physics' into 'master'
...
Improve physics perf
See merge request veloren/veloren!1289
2020-08-13 09:43:52 +00:00
f4e8b09ce6
Merge branch 'fix690' into 'master'
...
fix #690
Closes #690
See merge request veloren/veloren!1283
2020-08-13 09:17:58 +00:00
b8234217af
fix #690
2020-08-13 10:41:34 +02:00
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
862df3c997
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 05:52:56 +02:00
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
f3ef376001
Merge branch 'pfau/fix_missing_soundfile' into 'master'
...
Fix wrong soundfile path
See merge request veloren/veloren!1287
2020-08-12 21:13:03 +00:00
