4795 Commits

Author SHA1 Message Date
Yusuf Bera Ertan
ba9dd361c4 tr_TR localization: add missing keys and update some 2020-08-13 23:50:06 +00:00
Marcel
b3f289ab47 Merge branch 'netfix4' into 'master'
Fix a isse that might occur when a participant is dropped while the remote...

See merge request veloren/veloren!1290
2020-08-13 11:31:42 +00:00
Marcel Märtens
81befe2c9a Fix a isse that might occur when a participant is dropped while the remote wants to open a Stream and we get some bad time condition.
increase the slowlorris timeout. for some reason it seems to trigger alot more often since commit: `75c1d440` but i have no idea why.
My guess would be that the initial sync now sends way more data which slows down TCP to be > 10ms and trigger. Note: the fix might cause small lags when slow people try to connect to the server
2020-08-13 12:06:53 +02:00
Marcel
4203b326d1 Merge branch 'imbris/par-physics' into 'master'
Improve physics perf

See merge request veloren/veloren!1289
2020-08-13 09:43:52 +00:00
Marcel
5bd073f883 Merge branch 'fix690' into 'master'
fix #690

Closes #690

See merge request veloren/veloren!1283
2020-08-13 09:17:58 +00:00
Marcel Märtens
120702ca16 fix #690 2020-08-13 10:41:34 +02:00
Imbris
e8651cb0ee Improve the perf of the physics system using par_join as well as removing the trait object closure to allow for the compiler to perform more optimizations 2020-08-13 04:32:05 -04:00
Joshua Barretto
7ca61abcec Merge branch 'zesterer/worldsim' into 'master'
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
2020-08-12 21:40:56 +00:00
Monty Marz
9575bd8da4 Merge branch 'pfau/fix_missing_soundfile' into 'master'
Fix wrong soundfile path

See merge request veloren/veloren!1287
2020-08-12 21:13:03 +00:00
Joshua Barretto
3f2e6a3133 Fixed floating sprites in towns, clippy fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
a8b0a678d8 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
331a61e426 Improved spawn rates of castles and cave monsters 2020-08-12 21:16:14 +01:00
Joshua Barretto
90f97a7cb8 Updated changelog, cleaned up warnings, minor fixes 2020-08-12 21:16:11 +01:00
Joshua Barretto
fb6170e624 Added decals to towns 2020-08-12 21:15:53 +01:00
Joshua Barretto
621ea6695b Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
Monty Marz
1450d79672 added grass sprites 2020-08-12 21:15:53 +01:00
Joshua Barretto
3b3e31f07c Added terrain scatter densities 2020-08-12 21:15:53 +01:00
Joshua Barretto
82eaf29d81 Added monsters to caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
a489915845 Pathfinding improvements 2020-08-12 21:15:53 +01:00
Joshua Barretto
f9baaf7de1 Prevented NPCs running gleefully off cliffs without a second thought 2020-08-12 21:15:53 +01:00
Pfauenauge
77daeee721 drop gate parts 2020-08-12 21:15:53 +01:00
Joshua Barretto
07f096225c Castle and cave tweaks 2020-08-12 21:15:53 +01:00
Joshua Barretto
1ab95e1226 Massively improved pathfinding reliability 2020-08-12 21:15:53 +01:00
Joshua Barretto
1431b9c6f2 Various improvements to castles, dungeons and more 2020-08-12 21:15:53 +01:00
Joshua Barretto
edf9bdf283 Made agents flee 2020-08-12 21:15:53 +01:00
Joshua Barretto
014a5eba8a Added stalagtites 2020-08-12 21:15:53 +01:00
Joshua Barretto
a53b78e0c5 Fixed castle bug, better field RNG 2020-08-12 21:15:53 +01:00
Joshua Barretto
d8b7eb278f Added large caves, cave scatter, removed old caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
4b94d43abd Added experimental worldgen caves 2020-08-12 21:15:52 +01:00
Joshua Barretto
26dd1de639 Simulation improvements, removed block glows 2020-08-12 21:15:52 +01:00
Joshua Barretto
6545cb0d6b Added waypoint to dungeon staircases 2020-08-12 21:15:52 +01:00
Joshua Barretto
13ea4710b5 Added labour value to economy, castle improvements 2020-08-12 21:15:52 +01:00
Joshua Barretto
186fd3387f Better castle variation, improved paths, multi-storey houses 2020-08-12 21:15:52 +01:00
Joshua Barretto
35a04dde35 Lowered path priority 2020-08-12 21:15:52 +01:00
Joshua Barretto
8aae3eafc8 Better castles, initial light prop for lit objects 2020-08-12 21:15:52 +01:00
WelshPixie
75ca522179 fixed sprite rotations 2020-08-12 21:15:52 +01:00
Joshua Barretto
854b1a46bf Fixed client API 2020-08-12 21:15:52 +01:00
Joshua Barretto
f4040b59d7 Castle improvements 2020-08-12 21:15:52 +01:00
Joshua Barretto
73b6d6b954 Began adding castles 2020-08-12 21:15:52 +01:00
Joshua Barretto
3ab6c5ff49 Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
9e5978b34b Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Joshua Barretto
ecff9d6f46 Added simple keeps 2020-08-12 21:15:52 +01:00
Monty Marz
0441ad5e7e fix wrong filepath 2020-08-12 22:07:37 +02:00
Marcel
3257cf0f3a Merge branch 'yusdacra/nix-dependency-updates' into 'master'
nix: regenerate Cargo.nix and update niv dependencies

See merge request veloren/veloren!1245
2020-08-12 19:04:30 +00:00
Marcel
50ab217cbb Merge branch 'DoNeo/ru_translation' into 'master'
ru translations

See merge request veloren/veloren!1286
2020-08-12 18:42:46 +00:00
Monty Marz
0dc3d06482 Merge branch 'pfau/small_fixes' into 'master'
UI fixes, assets update

See merge request veloren/veloren!1280
2020-08-12 18:10:18 +00:00
Monty Marz
3e8fe47b8d UI fixes, assets update 2020-08-12 18:10:18 +00:00
Marcel Märtens
a5f0c36ebb ru translations 2020-08-12 19:59:02 +02:00
Marcel
0ab45b2f85 Merge branch 'scott-c/firework' into 'master'
scott-c/firework

See merge request veloren/veloren!1281
2020-08-12 16:51:29 +00:00
Monty Marz
2d793d7e65 Add firework hues 2020-08-12 22:29:06 +08:00