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
8,106 Commits 151 Branches 18 Tags
Commit Graph

8106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Illia Denysenko
f46b87ffb4 - 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
3b49741350 higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
f6043b7e53 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Monty Marz
3114fc2f7e 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
b471128ce5 Added map marker 2021-05-01 16:26:13 +00:00
Samuel Keiffer
fd63256e9d 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
35eab4abcc Fix glider pitching down when trying to take off 2021-05-01 15:35:26 +02:00
Sam
c5ce67f36c Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
85d1fad8b9 Fixed tests. 2021-05-01 09:25:55 -04:00
Sam
0da50b17b8 Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00
Sam
3c3977d6a6 Formatting stuffs. 2021-05-01 09:25:53 -04:00
Sam
40d00f46cb Removed clone in animations. Added GATs to animations to do so. 2021-05-01 09:25:53 -04:00
Sam
25c78dc660 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
3bf46fa640 Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Samuel Keiffer
4771364ca0 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
2dbecad3fa Fix ori 2021-04-30 17:37:51 +02:00
Joshua Barretto
39c61fa6cc 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
b9c2e55660 Fixed admin physics check exemption 2021-04-30 14:06:07 +01:00
Marcel
7ce5816f44 Merge branch 'master' into 'master' 
German translation

See merge request veloren/veloren!2159
 2021-04-30 11:58:31 +00:00
Jan Dre
8ee37767f5 German translation 2021-04-30 11:58:31 +00:00
Samuel Keiffer
be8f25052f 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
5358e7346a Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Samuel Keiffer
87f056658a 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
3bc7d69446 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Samuel Keiffer
3337e463f8 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
a23b60fb13 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
51ebcd84ed 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
7d5698dcb4 Ignore local neovim rc 2021-04-29 20:49:35 +03:00
Ludvig Böklin
9ae65352f1 Lower zero-lift drag 2021-04-29 19:22:09 +02:00
Sam
90fb4f43d2 Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Ben Wallis
d10185e55e 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
cecf3e5fd0 switch network/protocol to hashbrown (5% perf increase) 2021-04-29 19:12:57 +02:00
Ben Wallis
9894f72fe0 Made admins exempt from the server-side position and velocity checks 2021-04-29 17:46:40 +01:00
Marcel Märtens
99a23c6aea extract protocol specific listen code from scheduler and move it to channel.rs 2021-04-29 17:51:52 +02:00
Marcel Märtens
66e2068476 move connect code to channel and get rid of unwraps 2021-04-29 15:58:43 +02:00
Marcel Märtens
01992c05c6 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
4d360a871c 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
d40261e38e work on getting quic in the network 2021-04-29 15:58:26 +02:00
Marcel Märtens
e8b7485abe 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
8165cc4169 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
cba19b4386 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
7bde80e1f3 Query spatial grid for beam and aura system 
fmt
 2021-04-29 14:23:02 +02:00
Ben Wallis
ad2f7bbfa5 Reduced sync of TimeOfDay to once per 100 ticks 2021-04-29 12:34:27 +01:00
Ludvig Böklin
8b28fd873c Add more specific masses to objects 2021-04-29 11:46:03 +02:00
Imbris
b4522f4ee2 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
dc8d889703
chore(deps): update nix flake deps 2021-04-29 05:01:05 +03:00
Ben Wallis
933de6b023 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
0eb1f62cd2 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
e6b8a79e0e 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
612bc25f54 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00