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
4,952 Commits 151 Branches 18 Tags 2.1 GiB
3f9b89a3ac
Commit Graph

4952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Yanovski
3f9b89a3ac Merge remote-tracking branch 'origin/sharp/small-fixes' into sharp/small-fixes 2020-08-20 04:29:41 +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
Marcel Märtens
62c53963ab replace pretty_env_logger with tracing 2020-08-19 15:59:34 +02:00
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
Marcel
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
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
bc7f0731fc Merge branch 'netfix5' into 'master' 
Netfix5

See merge request veloren/veloren!1305
 2020-08-17 15:26:28 +00:00
Marcel Märtens
08e7063a36 no longer block when disconnecting a player 2020-08-17 16:34:02 +02:00
Marcel Märtens
1beea5967f investigate if participant mutex causes server hang 2020-08-17 14:21:52 +02:00
Joshua Yanovski
63b5e0e553 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-08-17 13:05:37 +02:00
Marcel
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
Marcel Märtens
8687740265 fix clippy warnings in new version 2020-08-17 11:10:18 +02:00
Marcel Märtens
10970841cc fix master / update toolchain to 2020-08-15 2020-08-17 10:28:09 +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
4cbad004f4 Bumping nightly per request. 2020-08-16 19:27:58 +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
Marcel
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
Monty Marz
3dc1f01580 Revert "Merge branch 'vzikl/add-zh-translation' into 'master'" 
This reverts merge request !1241
 2020-08-14 22:32:50 +00:00
Songtronix
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
Justin Shipsey
165c328517 fixed jump anim bug and non-attack bug for bipedlarge 2020-08-14 10:50:08 +00:00
Marcel
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
Yusuf Bera Ertan
94a997f327 tr_TR localization: add missing keys and update some 2020-08-13 23:50:06 +00:00
Joshua Yanovski
3155c31e66 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-13 22:35:22 +02: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
Marcel
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
Marcel Märtens
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
Joshua Yanovski
1fd104aa60 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-08-13 12:02:31 +02:00
Marcel
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
Marcel
f4e8b09ce6 Merge branch 'fix690' into 'master' 
fix #690

Closes #690

See merge request veloren/veloren!1283
 2020-08-13 09:17:58 +00:00
Marcel Märtens
b8234217af fix #690 2020-08-13 10:41:34 +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
Monty Marz
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
Joshua Yanovski
0a4218ed9d Fix particle depth. 2020-08-12 22:27:14 +02: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
9cefaaa7af Improved spawn rates of castles and cave monsters 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