Commit Graph

8146 Commits

Author SHA1 Message Date
Marcel
0c61ccfe89 Merge branch 'yusdacra/chore/nix' into 'master'
chore(deps): update nix flake deps

See merge request veloren/veloren!2238
2021-05-04 09:06:02 +00:00
Yusuf Bera Ertan
57bfe95939
chore(deps): update nix flake deps 2021-05-04 11:57:14 +03:00
Marcel
3c16966721 Merge branch 'xMAC94x/quic' into 'master'
Cleanup network, remove some unwraps, add experimental (disabled) Quic support

See merge request veloren/veloren!2221
2021-05-04 00:16:05 +00:00
Imbris
90e531691d Merge branch 'Nereuxofficial-master-patch-20455' into 'master'
Fix Typo in Readme.md

See merge request veloren/veloren!2239
2021-05-03 23:33:51 +00:00
Marcel
fec33c83dd Merge branch 'juliancoffee/improve_death_localization' into 'master'
Add possibility to translate buff outcomes

See merge request veloren/veloren!2192
2021-05-03 23:03:00 +00:00
Illia Denysenko
f04a4f907a Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Avi Weinstock
a8a89cd6d3 Add heightmap visualization to world/examples. 2021-05-03 16:05:05 -04:00
Samuel Keiffer
622d7c5033 Merge branch 'juliancoffee/cast_buff_cmd' into 'master'
Adding command for applying buff on player

See merge request veloren/veloren!2240
2021-05-03 19:53:19 +00:00
juliancoffee
88ac70c8c7 fmt 2021-05-03 22:17:59 +03:00
juliancoffee
4ba6d438ff Implement 'all' command 2021-05-03 22:07:12 +03:00
juliancoffee
b81981f805 Draft implementation 2021-05-03 22:07:09 +03:00
juliancoffee
db0b05aaff update CHANGELOG 2021-05-03 22:05:04 +03:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master'
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
2021-05-03 18:49:22 +00:00
Marcel
f5c7f99846 Merge branch 'xvar/persistence-fixes' into 'master'
Fixed a rare server crash when creating a character

See merge request veloren/veloren!2237
2021-05-03 18:09:59 +00:00
Samuel Keiffer
610c529c42 Merge branch 'sam/ability-sets' into 'master'
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
2021-05-03 17:50:11 +00:00
Marcel
1643e30545 Merge branch 'aweinstock/imageterrain' into 'master'
Compress terrain with images for clients with low bandwidth.

See merge request veloren/veloren!2207
2021-05-03 14:10:38 +00:00
Avi Weinstock
efa4f9fe0a Experiment with const fn lanczos lookup tables, enable weighted average interpolation for now. 2021-05-03 00:09:44 -04:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
Avi Weinstock
f0824af80a Move chunk_compression_benchmarks from bin to examples. 2021-05-03 00:09:24 -04:00
Avi Weinstock
b15913560b Optimize CompressedData with Vec::with_capacity, and move obsolete formats from common_net into the compression benchmark. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c199d12f2d Address MR 2207 review comments.
- Add metrics for which branch of the compression heuristic was taken.
- Reduce the threshold for the heuristic.
- Deduplicate code for dealing with lazy messages.
- Make jpeg dependency only scoped to the compression benchmark.
- Remove commented code.
2021-05-03 00:09:24 -04:00
Avi Weinstock
30cae40b82 Add a bandwidth-based heuristic for chunk compression. 2021-05-03 00:09:24 -04:00
Avi Weinstock
cdc2eccda8 Improve quadpng by adding WidePacking, which makes a wider image, which is faster due to PNG compressing by row. Heuristically switch between quadpng and deflate based on chunk height to reduce variance. 2021-05-03 00:09:24 -04:00
Avi Weinstock
dffc7db8f5 Add matplotlib graph generation to the compression benchmarks. 2021-05-03 00:09:24 -04:00
Avi Weinstock
0f4315c98b Remove a use of inline_tweak and use TallPacking instead of GridLtrPacking in common_net::msg::server. 2021-05-03 00:09:24 -04:00
Mckol
c913b9b858 Added Lanczos interpolation for QuadPng
Should support arbitrary scales (N).
Does support arbitrary Lanczos a parameters (currently 2)
and sample sizes (currently 5x5).
2021-05-03 00:09:24 -04:00
Avi Weinstock
fe0f331a19 Add 5x5 manhattan blur effect to quadpng, and omit interpolation at chunk borders. 2021-05-03 00:09:24 -04:00
Avi Weinstock
c2fd5e807d Experiment with 256-color palette "tripng" encoding, and Lanczos interpolation for "quadpng". 2021-05-03 00:09:24 -04:00
Avi Weinstock
a220cc569e Add resolution downscaling to QuadPng's color channel, and use half-resolution QuadPng ingame. 2021-05-03 00:09:24 -04:00
Avi Weinstock
f81539cb00 Get PngPngPngJpeg terrain working in the actual game. 2021-05-03 00:09:24 -04:00
Avi Weinstock
a9a943c19a Move compression helpers to common_net::msg::compression and experiment with more image formats at more site kinds. 2021-05-03 00:09:24 -04:00
Avi Weinstock
71220fd624 Add JPEG, PNG, and mixed compression for terrain. 2021-05-03 00:09:24 -04:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
Justin Shipsey
09c0ea0f3e Merge branch 'james/region-names' into 'master'
Add map markers for lakes and mountains

See merge request veloren/veloren!2227
2021-05-03 02:00:23 +00:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Imbris
435d515945 Merge branch 'duelsik/wiring_system' into 'master'
Add fundamentals for wiring system.

See merge request veloren/veloren!2204
2021-05-02 21:30:55 +00:00
Daniel Mizerski
7faa0d3cd9 Add fundamentals for wiring system. 2021-05-02 22:38:44 +02:00
Nereux
f60903f38b Fix Typo in Readme.md 2021-05-02 19:26:04 +00:00
Ben Wallis
d7582efad0 Moved character creation to use character_updater instead of character_loader. Changed character_loader to use a read-only database connection. 2021-05-02 16:08:39 +01:00
Ben Wallis
247ed4d78a Merge branch 'juliancoffee/kits_update' into 'master'
Update kits

See merge request veloren/veloren!2235
2021-05-02 13:27:03 +00:00
Illia Denysenko
569d0a1ba5 - Split 'debug' kit to 'debug' and 'admin_cosmetics'
- Add Velorite Admin Bow to 'debug'
- Add rings, cape and necklace to cultist kit
- Add mushroom curry to 'consumables' (former 'potions')
2021-05-02 13:27:03 +00:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Monty Marz
cdcbebc978 Merge branch 'zesterer/map-marker' into 'master'
Added map marker

See merge request veloren/veloren!2217
2021-05-01 16:26:13 +00:00
Joshua Barretto
d0953fcab0 Added map marker 2021-05-01 16:26:13 +00:00
Samuel Keiffer
4d09180ddb Merge branch 'lboklin/glider-take-off' into 'master'
Fix glider pitching down when trying to take off

See merge request veloren/veloren!2233
2021-05-01 14:09:03 +00:00
Ludvig Böklin
d7ef414f59 Fix glider pitching down when trying to take off 2021-05-01 15:35:26 +02:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
708cb12086 Fixed tests. 2021-05-01 09:25:55 -04:00
Sam
dd113c56cb Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00