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,936 Commits 151 Branches 18 Tags 2.1 GiB
3ee7bb5a98
Commit Graph

4936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
3ee7bb5a98 tmp increase TIMEOUT from 20s to 40s. 
This will not solve the StreamClose, but make it less annoying for some.
 2020-09-01 23:16:11 +02:00
Joshua Barretto
d8da10f1ff Merge branch 'scott-c/fix-missing-firework-particles' into 'master' 
fix missing firework/bomb particle rng & adjust firework colors

Closes #713

See merge request veloren/veloren!1351
 2020-09-01 14:01:13 +00:00
scott-c
69e0bf2023 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Joshua Yanovski
7e6975d881 Merge branch 'sharp/typed-body' into 'master' 
Further generalize the typed module.

See merge request veloren/veloren!1346
 2020-09-01 06:29:35 +00:00
Songtronix
5f350b2bea Merge branch 'songtronix/fix-assets-finding' into 'master' 
fix: locate assets in hopefully all cases

Closes #727 and #745

See merge request veloren/veloren!1347
 2020-08-31 18:23:54 +00:00
Monty Marz
8c3a448db5 Merge branch 'pfau/fix_orcs-add_inline_tweak' into 'master' 
Orcs adjustment and inline_tweak crate

See merge request veloren/veloren!1348
 2020-08-31 15:26:46 +00:00
Monty Marz
a6abda391f orcs adjustment and inline_tweak crate 
Adjust female orc headsize

add inline_tweak crate to voxygen and anim

format cargo.toml alphabetically
 2020-08-31 15:26:46 +00:00
Songtronix
11730f2136 change(common): remove find_folder 2020-08-31 16:43:16 +02:00
Songtronix
abaf6ee53e fix: locate assets in almost all cases 2020-08-31 10:25:45 +02:00
Joshua Yanovski
6f3d5da6f3 Further generalize the typed module. 
This enables us to automatically create configuration formats from enums
or structs.  For enums, we create a structure with a field for each
case, representing a pattern match; the configuration format can then
enter a different expression for each case.  For structs, we create an
enum with a variant for each field, representing projecting by that
field; the configuration format selects the field to project from, and
then can write a further expression on that field (for instance, it can
perform another pattern match).

So far we don't actually have anything that *uses* this functionality;
I decided to finish it for the purpose of specifying a default
lantern offset, only to discover that we already return a lantern offset
from the animation crate.  So I fixed it there instead.
 2020-08-31 05:59:44 +02:00
Marcel
62427cb01f Merge branch 'vzikl/add-zh-translation' into 'master' 
Update to OpenSource Font - WQY-ZenHei & add zh_CN

See merge request veloren/veloren!1304
 2020-08-30 20:40:01 +00:00
VZIKL
cc55e71a5d Update to OpenSource Font - WQY-ZenHei & add zh_CN 2020-08-30 20:40:01 +00:00
Marcel
9f75e35d84 Merge branch 'easier_logging' into 'master' 
make logging easier and not as verbose on windows

See merge request veloren/veloren!1344
 2020-08-30 18:02:37 +00:00
Marcel
b6c07718dc make logging easier and not as verbose on windows 2020-08-30 18:02:37 +00:00
Imbris
67d046c846 Merge branch 'termac/hotbar_hotkey_fix' into 'master' 
small fix for handling hotbar hotkeys (fixes #687)

Closes #687

See merge request veloren/veloren!1343
 2020-08-29 20:32:07 +00:00
termac
76df71ed3d small fix for handling hotbar hotkeys (fixes #687) 
Send an 'ChangeHotbarState' event when a hotbar slot is assigned via
hotkey in the inventory.
 2020-08-29 18:38:55 +02:00
Monty Marz
92d9a51071 Merge branch 'black-silence/fix-de-translation' into 'master' 
fix several DE translations

See merge request veloren/veloren!1341
 2020-08-28 19:42:23 +00:00
black silence
2587a38f6f fix several DE translations 2020-08-28 20:37:28 +02:00
Monty Marz
6389df7685 Merge branch 'fix_text_overlap' into 'master' 
Fix overlapping text

See merge request veloren/veloren!1340
 2020-08-28 15:04:57 +00:00
Monty Marz
7041e490ce fix overlapping text 2020-08-28 16:10:50 +02:00
Joshua Yanovski
e59395bfe0 Merge branch 'sharp/sprite-config' into 'master' 
Move sprite data to a config file.

See merge request veloren/veloren!1324
 2020-08-28 08:30:50 +00:00
Joshua Yanovski
8be3648a4d Move sprite data to a config file. 2020-08-28 09:23:43 +02:00
Joshua Yanovski
3622c11a8c Merge branch 'sharp/figure-mesh-background' into 'master' 
Move figure meshing to a background thread.

See merge request veloren/veloren!1339
 2020-08-28 04:14:54 +00:00
Joshua Yanovski
3a96b73b2c Move figure meshing to a background thread. 2020-08-28 05:25:31 +02:00
Marcel
1aec2ac6ef Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master' 
fix compiling without metrics

See merge request veloren/veloren!1338
 2020-08-27 08:19:52 +00:00
Marcel Märtens
a7b7ae3a2c fix compiling with metrics 2020-08-27 09:35:06 +02:00
Imbris
2dfde32b45 Merge branch 'imbris/small-fixes' into 'master' 
Fix a couple things

See merge request veloren/veloren!1328
 2020-08-27 01:54:11 +00:00
Imbris
4790373ab3 Add State::read_component_copied 2020-08-26 20:47:41 -04:00
Imbris
dcce5641f7 Fix broken features and avoid panic if the client leaves before character data loads 2020-08-26 20:47:39 -04:00
Marcel
5bedc1aac9 Merge branch 'xMAC94x/reduce_metrics' into 'master' 
reduce load on metrics by ALOT!

See merge request veloren/veloren!1337
 2020-08-27 00:34:49 +00:00
Marcel Märtens
9170622611 reduce load on metrics by ALOT! 
- first remove participant AND channel in same metric. this caused a matrix full of 0 values which bloated alot.
 - then did the cid cache to be lazy loading to no longer generate that much 0 values
 - possible would also be no longer keeping metrics for INIT, HANDSHAKE and PARTICIPANTID
 2020-08-27 01:55:13 +02:00
Marcel
9d49158b61 Merge branch 'xMAC94x/examples-cleanup' into 'master' 
Switch veloren_network over to use the official example layout.

See merge request veloren/veloren!1336
 2020-08-26 22:04:44 +00:00
Forest Anderson
97224d8a07 Merge branch 'scott-c/sound-effects-placeholder' into 'master' 
combat sfx

See merge request veloren/veloren!1279
 2020-08-26 12:52:11 +00:00
scott-c
d316463eb3 Add combat sfx #647 2020-08-26 19:28:00 +08:00
Marcel Märtens
8c883c200d Switch veloren_network over to use the official example layout. 
adjusted those examples to run again
created a CI TEST to always `check` examples
fixed fmt in examples so that pipeline gets green
 2020-08-26 10:07:22 +02:00
Marcel
3a1b4fa516 Merge branch 'xMAC94x/compression' into 'master' 
Propper Compression support of network.

See merge request veloren/veloren!1334
 2020-08-25 22:21:05 +00:00
Marcel Märtens
144f88f811 Propper Compression support of network. 
- Compression is no longer enabled always but can now be enabled per Stream.
   If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally.
   You need to handle compression yourself for `raw` fn.
 - added a new feature to the network crate to enable or disable the compression
 - switched to `lz-fear` instead of `lz4-compression`
 - use `bitflags` to represent the `Promises` struct
 2020-08-25 23:55:27 +02:00
Monty Marz
4d77d61dc0 Merge branch 'pfau/nametag_height' into 'master' 
Nametag height

See merge request veloren/veloren!1335
 2020-08-25 20:43:02 +00:00
Monty Marz
6946de2682 fixed nametag height 
fmt

fmt
 2020-08-25 21:54:47 +02:00
Joshua Barretto
bf7afcf5c9 Merge branch 'zesterer/small-fixes' into 'master' 
Better world colours, better projectiles, better aiming, many other small improvements

See merge request veloren/veloren!1332
 2020-08-25 15:59:05 +00:00
Marcel
ae208d9345 Merge branch 'spelling' into 'master' 
Corrected some spelling errors

See merge request veloren/veloren!1326
 2020-08-25 12:21:25 +00:00
notoria
2be4202d01 Corrected some spelling errors 2020-08-25 12:21:25 +00:00
Joshua Barretto
24780e4f58 Handled 3d/2d sanity check bug 2020-08-25 12:54:30 +01:00
Joshua Barretto
37b45ba5f4 Addressed review issues 2020-08-25 11:01:17 +01:00
Joshua Barretto
12ea028a3d Improved single-tick projectile wall/entity collision bug 2020-08-25 00:04:04 +01:00
Marcel
6125b17a7a Merge branch 'xMAC94x/lock-removal' into 'master' 
xmac94x/switch to more efficient Mutex locks

See merge request veloren/veloren!1330
 2020-08-24 21:26:51 +00:00
Joshua Barretto
9b812b0d8b Allowed small animals to block-hop again 2020-08-24 21:53:17 +01:00
Joshua Barretto
e4de32ac25 Fixed quadruped hitboxes 2020-08-24 21:46:08 +01:00
Joshua Barretto
2b9d5ee4a2 Fixed bad hitbox radii and adjusted field colour 2020-08-24 20:52:18 +01:00
Joshua Barretto
6cf223583a Fixed failing audio tests 2020-08-24 20:37:47 +01:00