Songtronix
e09c1a87aa
change: log where we locate assets for debugging
2020-08-19 13:59:25 +02:00
Marcel
bc7f0731fc
Merge branch 'netfix5' into 'master'
...
Netfix5
See merge request veloren/veloren!1305
2020-08-17 15:26:28 +00:00
Marcel Märtens
08e7063a36
no longer block when disconnecting a player
2020-08-17 16:34:02 +02:00
Marcel Märtens
1beea5967f
investigate if participant mutex causes server hang
2020-08-17 14:21:52 +02:00
Marcel
6d2c4b9c1a
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
fix master / update toolchain to `2020-08-15`
See merge request veloren/veloren!1302
2020-08-17 10:32:10 +00:00
Marcel Märtens
8687740265
fix clippy warnings in new version
2020-08-17 11:10:18 +02:00
Marcel Märtens
10970841cc
fix master / update toolchain to 2020-08-15
2020-08-17 10:28:09 +02:00
Marcel
8f8b20c913
Merge branch 'xMAC94x/release_numbers' into 'master'
...
Change the version number to 0.7
See merge request veloren/veloren!1296
2020-08-15 10:27:31 +00:00
Marcel Märtens
ed68bff135
Change the version number to 0.7
2020-08-15 11:53:59 +02:00
Marcel
63cf5aa69c
Merge branch 'revert-9f53a4a1' into 'master'
...
Revert "Merge branch 'vzikl/add-zh-translation' into 'master'" Because we don't had the license for the chineese font file
See merge request veloren/veloren!1293
2020-08-15 09:36:21 +00:00
Monty Marz
3dc1f01580
Revert "Merge branch 'vzikl/add-zh-translation' into 'master'"
...
This reverts merge request !1241
2020-08-14 22:32:50 +00:00
Songtronix
13f598489d
Merge branch 'slipped/fixes' into 'master'
...
fixed jump anim bug and non-attack bug for bipedlarge
See merge request veloren/veloren!1288
2020-08-14 10:50:08 +00:00
Justin Shipsey
165c328517
fixed jump anim bug and non-attack bug for bipedlarge
2020-08-14 10:50:08 +00:00
Marcel
17730d6a4b
Merge branch 'yusdacra/update-tr-translation' into 'master'
...
tr_TR localization: add missing keys and update some
See merge request veloren/veloren!1291
2020-08-13 23:50:06 +00:00
Yusuf Bera Ertan
94a997f327
tr_TR localization: add missing keys and update some
2020-08-13 23:50:06 +00:00
Marcel
3c199280e8
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
e618eeb386
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
7c2c392a3a
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
f4e8b09ce6
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
b8234217af
fix #690
2020-08-13 10:41:34 +02:00
Imbris
a763bbe73c
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
75c1d44010
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
f3ef376001
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
e3cab272c3
Fixed floating sprites in towns, clippy fixes
2020-08-12 21:16:14 +01:00
Joshua Barretto
50a85853e3
Fmt and clippy lints fixes
2020-08-12 21:16:14 +01:00
Joshua Barretto
9cefaaa7af
Improved spawn rates of castles and cave monsters
2020-08-12 21:16:14 +01:00
Joshua Barretto
85ed5ad356
Updated changelog, cleaned up warnings, minor fixes
2020-08-12 21:16:11 +01:00
Joshua Barretto
15b1717295
Added decals to towns
2020-08-12 21:15:53 +01:00
Joshua Barretto
6992194ad4
Better surface swimming, no underwater sprites
2020-08-12 21:15:53 +01:00
Monty Marz
c1b07465cf
added grass sprites
2020-08-12 21:15:53 +01:00
Joshua Barretto
6633298722
Added terrain scatter densities
2020-08-12 21:15:53 +01:00
Joshua Barretto
9329b4ce55
Added monsters to caves
2020-08-12 21:15:53 +01:00
Joshua Barretto
d7ccb28ea7
Pathfinding improvements
2020-08-12 21:15:53 +01:00
Joshua Barretto
d48ed42fda
Prevented NPCs running gleefully off cliffs without a second thought
2020-08-12 21:15:53 +01:00
Pfauenauge
ee83479748
drop gate parts
2020-08-12 21:15:53 +01:00
Joshua Barretto
a966841c5a
Castle and cave tweaks
2020-08-12 21:15:53 +01:00
Joshua Barretto
dfecf0dad6
Massively improved pathfinding reliability
2020-08-12 21:15:53 +01:00
Joshua Barretto
9bb10a6d00
Various improvements to castles, dungeons and more
2020-08-12 21:15:53 +01:00
Joshua Barretto
0bad704719
Made agents flee
2020-08-12 21:15:53 +01:00
Joshua Barretto
c8ae5163b3
Added stalagtites
2020-08-12 21:15:53 +01:00
Joshua Barretto
c547cdd72c
Fixed castle bug, better field RNG
2020-08-12 21:15:53 +01:00
Joshua Barretto
41229b4665
Added large caves, cave scatter, removed old caves
2020-08-12 21:15:53 +01:00
Joshua Barretto
10757d0325
Added experimental worldgen caves
2020-08-12 21:15:52 +01:00
Joshua Barretto
a9126f7e25
Simulation improvements, removed block glows
2020-08-12 21:15:52 +01:00
Joshua Barretto
cb660f47bb
Added waypoint to dungeon staircases
2020-08-12 21:15:52 +01:00
Joshua Barretto
1763693f5f
Added labour value to economy, castle improvements
2020-08-12 21:15:52 +01:00
Joshua Barretto
bdb39b8e7f
Better castle variation, improved paths, multi-storey houses
2020-08-12 21:15:52 +01:00
Joshua Barretto
6a41f6aa88
Lowered path priority
2020-08-12 21:15:52 +01:00
Joshua Barretto
41916d4594
Better castles, initial light prop for lit objects
2020-08-12 21:15:52 +01:00
WelshPixie
568a3e375e
fixed sprite rotations
2020-08-12 21:15:52 +01:00
