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
7,953 Commits 151 Branches 18 Tags 2.1 GiB
0f4315c98b
Commit Graph

7953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Samuel Keiffer
a37174d6f2 Merge branch 'lboklin/fix-ori' into 'master' 
Fix ori rate cap

See merge request veloren/veloren!2230
 2021-04-30 18:24:49 +00:00
Ludvig Böklin
cc7f0f3ac2 Fix ori 2021-04-30 17:37:51 +02:00
Joshua Barretto
ce230f3e87 Merge branch 'zesterer/fixes' into 'master' 
Fixed admin physics check exemption

See merge request veloren/veloren!2229
 2021-04-30 13:32:47 +00:00
Joshua Barretto
b29e2b0017 Fixed admin physics check exemption 2021-04-30 14:06:07 +01:00
Marcel
bc4d827650 Merge branch 'master' into 'master' 
German translation

See merge request veloren/veloren!2159
 2021-04-30 11:58:31 +00:00
Jan Dre
8f5370f372 German translation 2021-04-30 11:58:31 +00:00
Samuel Keiffer
5a48158b7f Merge branch 'DaforLynx/poise-sfx' into 'master' 
Poise (stun) SFX and fix for town music

See merge request veloren/veloren!2212
 2021-04-29 23:36:22 +00:00
DaforLynx
7334cce426 Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Samuel Keiffer
4f5f15979a Merge branch 'sam/deduplicate-items' into 'master' 
Sam/deduplicate items

See merge request veloren/veloren!2225
 2021-04-29 20:11:43 +00:00
Sam
7870109856 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Samuel Keiffer
e177aebd9e Merge branch 'lboklin/lower-zero-lift-drag' into 'master' 
Lower zero-lift drag

See merge request veloren/veloren!2223
 2021-04-29 19:11:12 +00:00
Justin Shipsey
baf749c03e Merge branch 'lboklin/object-masses' into 'master' 
Define more accurate masses for objects

See merge request veloren/veloren!2220
 2021-04-29 19:04:48 +00:00
Snowram
bea6be2429 Merge branch 'juliancoffee/nvim_gitignore' into 'master' 
Ignore local neovim rc

See merge request veloren/veloren!2224
 2021-04-29 18:04:24 +00:00
juliancoffee
8b38137715 Ignore local neovim rc 2021-04-29 20:49:35 +03:00
Ludvig Böklin
c4444a908a Lower zero-lift drag 2021-04-29 19:22:09 +02:00
Sam
91bb6392bb Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Ben Wallis
287a1a9b94 Merge branch 'xvar/admins-exempt-from-physics-checks' into 'master' 
Made admins exempt from the server-side position and velocity checks

See merge request veloren/veloren!2222
 2021-04-29 17:17:42 +00:00
Ben Wallis
e2d6326615 Made admins exempt from the server-side position and velocity checks 2021-04-29 17:46:40 +01:00
Ben Wallis
c16bf51ab2 Merge branch 'xvar/reduce-timeofday-sync-frequency' into 'master' 
Reduced frequency of TimeOfDay message being sent to clients

See merge request veloren/veloren!2218
 2021-04-29 13:50:08 +00:00
Imbris
27fb8a9f6c Merge branch 'synis/beam-aura-spatial-grid' into 'master' 
Use SpatialGrid for Beam and Aura

See merge request veloren/veloren!2214
 2021-04-29 13:00:55 +00:00
Synis
4e4818ca9e Query spatial grid for beam and aura system 
fmt
 2021-04-29 14:23:02 +02:00
Ben Wallis
3c20e8ed4e Reduced sync of TimeOfDay to once per 100 ticks 2021-04-29 12:34:27 +01:00
Ludvig Böklin
6b52ea89b4 Add more specific masses to objects 2021-04-29 11:46:03 +02:00
Imbris
6ef3b4ae01 Merge branch 'yusdacra/chore/nix' into 'master' 
chore(deps): update nix flake deps

See merge request veloren/veloren!2210
 2021-04-29 02:13:18 +00:00
Yusuf Bera Ertan
aecdd19767
chore(deps): update nix flake deps 2021-04-29 05:01:05 +03:00
Ben Wallis
b0aca9a348 Merge branch 'xvar/item-serialization' into 'master' 
Changed Item serialization to not send ItemDef struct across the network

See merge request veloren/veloren!2215
 2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667 Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef 2021-04-28 21:00:25 +01:00
Snowram
783eb24f4d Merge branch 'bronson-master-patch-18766' into 'master' 
Fix spelling in seashells.ron

See merge request veloren/veloren!2213
 2021-04-28 18:54:11 +00:00
Scott Bronson
b7ac7b64f3 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
Justin Shipsey
790e7da64f Merge branch 'DaforLynx/town-music' into 'master' 
Town music

See merge request veloren/veloren!2208
 2021-04-28 05:08:00 +00:00
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Samuel Keiffer
5948025327 Merge branch 'james/fix-bird-auto-fly' into 'master' 
Set bird default to not flying and give non-strafing NPCs a larger attack angle

See merge request veloren/veloren!2209
 2021-04-28 02:31:51 +00:00