8086 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Marcel Märtens	1ead240ad2	switch network/protocol to hashbrown (5% perf increase)	2021-04-29 19:12:57 +02:00
Ben Wallis	e2d6326615	Made admins exempt from the server-side position and velocity checks	2021-04-29 17:46:40 +01:00
Marcel Märtens	653fb065e0	extract protocol specific listen code from scheduler and move it to channel.rs	2021-04-29 17:51:52 +02:00
Marcel Märtens	4afadf57dc	move connect code to channel and get rid of unwraps	2021-04-29 15:58:43 +02:00
Marcel Märtens	95b186e29a	QuicSink and QuicDrain do work now. ... When local SendProtocol is opening a Stream, it will send a empty message to QuicDrain which will then know that its time to open a quic stream. It will open a QuicStream and send its SID over to remote. The RecvStream will be send to local QuicSink RemoteRecv will notice a new BiStream was opened and read its Sid. It will now start listening on it. while remote main will get the information that a stream was opened and will notice the frontend. in participant remote Recv is synced with remote send (without triggering a empty message!). RemoteRecv Sink will send the sendstream to RemoteSend Drain and it will be used when a first message is send on this stream.	2021-04-29 15:58:39 +02:00
Marcel Märtens	760c382ed9	protocoladdr change for listen and connect ... (remove a loop in quic protocol which wasnt a actual loop)	2021-04-29 15:58:34 +02:00
Marcel Märtens	9f0aceba4c	work on getting quic in the network	2021-04-29 15:58:26 +02:00
Marcel Märtens	383482a36e	Quic: We had the followuing problem: ... - locally we open a stream, our local Drain is sending OpenStream - remote Sink will know this and notify remote Drain - remote side sends a message - local sink does not know about the Stream. as there is (and CANT) be a wat to notify local Sink from local Drain (it could introduce race conditions). One of the possible solutions was, that the remote drain will copy the OpenStream Msg ON the Quic::stream before first data is send. This would work but is complicated. Instead we now just mark such streams as "potentially open" and we listen for the first DataHeader to get it's SID. add support for unreliable messages in quic protocol, benchmarks	2021-04-29 15:58:23 +02: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
James Melkonian	2fafcded93	Set bird default to not flying and give non-strafing NPCs a larger attack angle	2021-04-28 02:31:51 +00:00
Marcel	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
James Melkonian	2f00af83d8	Remove an unwrap and move outcome sfx to ron	2021-04-27 21:01:06 +00:00
Marcel	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
Marcel	876686893b	Merge branch 'duelsik/translations-PL-27-04-2021' into 'master' ... Polish translations update. See merge request veloren/veloren!2205	2021-04-27 20:54:48 +00:00
Joshua Barretto	ffd3ef3f14	Merge branch 'james/fix-wolf-ai' into 'master' ... Partially fixes wolf AI See merge request veloren/veloren!2167	2021-04-27 17:57:32 +00:00
James Melkonian	24095187c7	Partially fixes wolf AI	2021-04-27 17:57:31 +00:00
Daniel Mizerski	ec55c176fe	Polish translations update.	2021-04-27 17:33:30 +02:00
Joshua Barretto	ada579b02d	Merge branch 'lboklin/glider-physics' into 'master' ... Glider physics See merge request veloren/veloren!1665	2021-04-27 14:41:48 +00:00
Ludvig Böklin	34660462e9	Glider physics	2021-04-27 14:41:48 +00:00
Justin Shipsey	de25358ab7	Merge branch 'slipped/quickfix' into 'master' ... fix glide wield See merge request veloren/veloren!2203	2021-04-27 03:54:55 +00:00
jshipsey	f845f2bd11	fix glide wield	2021-04-26 23:17:04 -04:00
Yusuf Bera Ertan	685f4971ac	build(nix): switch to crate2nix	2021-04-27 05:18:12 +03:00
Justin Shipsey	b99404749a	Merge branch 'slipped/combatstuff' into 'master' ... combat ori changes See merge request veloren/veloren!2198	2021-04-26 02:54:44 +00:00
Sam	1a7779beb3	Added angle check for new npcs.	2021-04-25 22:19:30 -04:00
jshipsey	a0a75b1921	comments	2021-04-25 22:02:32 -04:00
jshipsey	2c74a86170	skill adjustments, ori changes	2021-04-25 22:02:32 -04:00