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

4921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
termac
2df76b5af4 small fix for handling hotbar hotkeys (fixes #687) 
Send an 'ChangeHotbarState' event when a hotbar slot is assigned via
hotkey in the inventory.
 2020-08-29 18:38:55 +02:00
Monty Marz
b33fadfcdf Merge branch 'black-silence/fix-de-translation' into 'master' 
fix several DE translations

See merge request veloren/veloren!1341
 2020-08-28 19:42:23 +00:00
black silence
1e1e4a7890 fix several DE translations 2020-08-28 20:37:28 +02:00
Monty Marz
e58704fa74 Merge branch 'fix_text_overlap' into 'master' 
Fix overlapping text

See merge request veloren/veloren!1340
 2020-08-28 15:04:57 +00:00
Monty Marz
348f139e75 fix overlapping text 2020-08-28 16:10:50 +02:00
Joshua Yanovski
2b55b4eb6b Merge branch 'sharp/sprite-config' into 'master' 
Move sprite data to a config file.

See merge request veloren/veloren!1324
 2020-08-28 08:30:50 +00:00
Joshua Yanovski
709c4d5ac6 Move sprite data to a config file. 2020-08-28 09:23:43 +02:00
Joshua Yanovski
03ca09e94e Merge branch 'sharp/figure-mesh-background' into 'master' 
Move figure meshing to a background thread.

See merge request veloren/veloren!1339
 2020-08-28 04:14:54 +00:00
Joshua Yanovski
ae6174b43c Move figure meshing to a background thread. 2020-08-28 05:25:31 +02:00
Marcel
49244f3560 Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master' 
fix compiling without metrics

See merge request veloren/veloren!1338
 2020-08-27 08:19:52 +00:00
Marcel Märtens
0478fa9b38 fix compiling with metrics 2020-08-27 09:35:06 +02:00
Imbris
fe83c4c097 Merge branch 'imbris/small-fixes' into 'master' 
Fix a couple things

See merge request veloren/veloren!1328
 2020-08-27 01:54:11 +00:00
Imbris
c259f6cbde Add State::read_component_copied 2020-08-26 20:47:41 -04:00
Imbris
039655997d Fix broken features and avoid panic if the client leaves before character data loads 2020-08-26 20:47:39 -04:00
Marcel
7c76386fc6 Merge branch 'xMAC94x/reduce_metrics' into 'master' 
reduce load on metrics by ALOT!

See merge request veloren/veloren!1337
 2020-08-27 00:34:49 +00:00
Marcel Märtens
5a9a7b0236 reduce load on metrics by ALOT! 
- first remove participant AND channel in same metric. this caused a matrix full of 0 values which bloated alot.
 - then did the cid cache to be lazy loading to no longer generate that much 0 values
 - possible would also be no longer keeping metrics for INIT, HANDSHAKE and PARTICIPANTID
 2020-08-27 01:55:13 +02:00
Marcel
8250b6612a Merge branch 'xMAC94x/examples-cleanup' into 'master' 
Switch veloren_network over to use the official example layout.

See merge request veloren/veloren!1336
 2020-08-26 22:04:44 +00:00
Forest Anderson
129ecbe671 Merge branch 'scott-c/sound-effects-placeholder' into 'master' 
combat sfx

See merge request veloren/veloren!1279
 2020-08-26 12:52:11 +00:00
scott-c
fadfc4e846 Add combat sfx #647 2020-08-26 19:28:00 +08:00
Marcel Märtens
9f52800e5f Switch veloren_network over to use the official example layout. 
adjusted those examples to run again
created a CI TEST to always `check` examples
fixed fmt in examples so that pipeline gets green
 2020-08-26 10:07:22 +02:00
Marcel
39e105b7ac Merge branch 'xMAC94x/compression' into 'master' 
Propper Compression support of network.

See merge request veloren/veloren!1334
 2020-08-25 22:21:05 +00:00
Marcel Märtens
b344e8d87c Propper Compression support of network. 
- Compression is no longer enabled always but can now be enabled per Stream.
   If a Stream is Compression enabled it will compress and decompress all msg (except for `raw` access) before handling them internally.
   You need to handle compression yourself for `raw` fn.
 - added a new feature to the network crate to enable or disable the compression
 - switched to `lz-fear` instead of `lz4-compression`
 - use `bitflags` to represent the `Promises` struct
 2020-08-25 23:55:27 +02:00
Monty Marz
2022f52170 Merge branch 'pfau/nametag_height' into 'master' 
Nametag height

See merge request veloren/veloren!1335
 2020-08-25 20:43:02 +00:00
Monty Marz
c074c4eff7 fixed nametag height 
fmt

fmt
 2020-08-25 21:54:47 +02:00
Joshua Barretto
b2d6a08fe9 Merge branch 'zesterer/small-fixes' into 'master' 
Better world colours, better projectiles, better aiming, many other small improvements

See merge request veloren/veloren!1332
 2020-08-25 15:59:05 +00:00
Marcel
3403c5a710 Merge branch 'spelling' into 'master' 
Corrected some spelling errors

See merge request veloren/veloren!1326
 2020-08-25 12:21:25 +00:00
notoria
90b0012637 Corrected some spelling errors 2020-08-25 12:21:25 +00:00
Joshua Barretto
5f9208a45b Handled 3d/2d sanity check bug 2020-08-25 12:54:30 +01:00
Joshua Barretto
7aacf23102 Addressed review issues 2020-08-25 11:01:17 +01:00
Joshua Barretto
73dcc7cd00 Improved single-tick projectile wall/entity collision bug 2020-08-25 00:04:04 +01:00
Marcel
ebab872bd1 Merge branch 'xMAC94x/lock-removal' into 'master' 
xmac94x/switch to more efficient Mutex locks

See merge request veloren/veloren!1330
 2020-08-24 21:26:51 +00:00
Joshua Barretto
a475357dba Allowed small animals to block-hop again 2020-08-24 21:53:17 +01:00
Joshua Barretto
346dd951eb Fixed quadruped hitboxes 2020-08-24 21:46:08 +01:00
Joshua Barretto
a1271f9f26 Fixed bad hitbox radii and adjusted field colour 2020-08-24 20:52:18 +01:00
Joshua Barretto
148a351ce1 Fixed failing audio tests 2020-08-24 20:37:47 +01:00
Joshua Barretto
408277a6c5 Corrected hitbox mistake 2020-08-24 18:29:59 +01:00
Joshua Barretto
2825ada8e6 Updated changelog 2020-08-24 18:27:50 +01:00
Joshua Barretto
79a4e6f6d8 Fixed projectile collisions, hitboxes, better aiming 2020-08-24 18:24:44 +01:00
Marcel Märtens
034cc7f8e9 Redefine Close behavior: 
- When Participant A was closed by remote side. Then a `disconnect` on `A`
   shall return Ok() (instead of ParticipantDisconected) IF:
   A was already flushed and no data needs to be sended any more.
 so a `disconnect` doesnt differ if the other side initiated the disconnect before or not. it tries to clean things up and returns Ok(()) if both sides agree
 2020-08-24 16:22:12 +02:00
Marcel Märtens
584c10d097 Fixed bug in tcp protocol.rs 
- It was possible for a end_receiver to be triggered in the moment while a frame was started by not finished.
   This removed bytes from the stream with them getting lost. this almost ever was followed by a RAW frame as the TCP stream was now invalid.
   The TCP stream was then detected by participant or caused one or multiple failures
 - introduces some simplifications, removed a macro, reuse code
 2020-08-24 16:22:06 +02:00
Joshua Barretto
c32fe3e7ae Improved world colours 2020-08-24 12:36:27 +01:00
Joshua Barretto
4dbbcbe144 Less harsh terrain noise 2020-08-24 12:36:27 +01:00
Joshua Barretto
246be3ca78 Better pet pathfinding 2020-08-24 12:36:27 +01:00
Monty Marz
3615819262 better formatting and adjusted stone spawn rate 2020-08-24 12:36:27 +01:00
Joshua Barretto
6cf30904b8 Less bizarre rock and stalagtite colours 2020-08-24 12:36:27 +01:00
Joshua Barretto
35d4dd1405 Made below-ground LoD dark 2020-08-24 12:36:27 +01:00
Joshua Barretto
148e5e2632 Prevented terrain scatter spawning in the air 2020-08-24 12:36:27 +01:00
Joshua Barretto
872058e022 Adjusted worldgen colours for new lighting model 2020-08-24 12:36:27 +01:00
Joshua Barretto
a836cd02bf Merge branch 'james/fix-shiny-shader-nvidia' into 'master' 
Fixed NVidia shiny water shader bug and re-enabled in settings

See merge request veloren/veloren!1319
 2020-08-24 07:09:48 +00:00
jiminycrick
7bf2c12bed set shiny water to default 2020-08-23 22:58:01 -07:00