Commit Graph

7949 Commits

Author SHA1 Message Date
a220cc569e Add resolution downscaling to QuadPng's color channel, and use half-resolution QuadPng ingame. 2021-05-03 00:09:24 -04:00
f81539cb00 Get PngPngPngJpeg terrain working in the actual game. 2021-05-03 00:09:24 -04:00
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
71220fd624 Add JPEG, PNG, and mixed compression for terrain. 2021-05-03 00:09:24 -04:00
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
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
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
7faa0d3cd9 Add fundamentals for wiring system. 2021-05-02 22:38:44 +02:00
247ed4d78a Merge branch 'juliancoffee/kits_update' into 'master'
Update kits

See merge request veloren/veloren!2235
2021-05-02 13:27:03 +00:00
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
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
d0953fcab0 Added map marker 2021-05-01 16:26:13 +00:00
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
d7ef414f59 Fix glider pitching down when trying to take off 2021-05-01 15:35:26 +02:00
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
cc7f0f3ac2 Fix ori 2021-04-30 17:37:51 +02:00
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
b29e2b0017 Fixed admin physics check exemption 2021-04-30 14:06:07 +01:00
bc4d827650 Merge branch 'master' into 'master'
German translation

See merge request veloren/veloren!2159
2021-04-30 11:58:31 +00:00
8f5370f372 German translation 2021-04-30 11:58:31 +00:00
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
7334cce426 Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
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
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
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
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
8b38137715 Ignore local neovim rc 2021-04-29 20:49:35 +03:00
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
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
e2d6326615 Made admins exempt from the server-side position and velocity checks 2021-04-29 17:46:40 +01:00
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
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
4e4818ca9e Query spatial grid for beam and aura system
fmt
2021-04-29 14:23:02 +02:00
3c20e8ed4e Reduced sync of TimeOfDay to once per 100 ticks 2021-04-29 12:34:27 +01:00
6b52ea89b4 Add more specific masses to objects 2021-04-29 11:46:03 +02:00
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
aecdd19767 chore(deps): update nix flake deps 2021-04-29 05:01:05 +03:00
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
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
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
b7ac7b64f3 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
790e7da64f Merge branch 'DaforLynx/town-music' into 'master'
Town music

See merge request veloren/veloren!2208
2021-04-28 05:08:00 +00:00
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
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
2fafcded93 Set bird default to not flying and give non-strafing NPCs a larger attack angle 2021-04-28 02:31:51 +00:00
aa963493e8 Merge branch 'james/sound-unwraps' into 'master'
Remove an unwrap and move outcome sfx to ron

See merge request veloren/veloren!2206
2021-04-27 21:01:06 +00:00
2f00af83d8 Remove an unwrap and move outcome sfx to ron 2021-04-27 21:01:06 +00:00
8af1b42dbf Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): update flake deps, switch buildPlatform to use crate2nix

See merge request veloren/veloren!2202
2021-04-27 20:55:55 +00:00