Marcel
10ff32a127
Merge branch 'rdbaker/fix-settings-unpause-bug' into 'master'
...
fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world
Closes #712
See merge request veloren/veloren!1312
2020-08-18 22:55:05 +00:00
Ryan Baker
9c88c95ace
fixes #712 - where pressing N to leave Settings doesn't unpause a single player game world
2020-08-18 13:42:40 -04:00
Marcel
3be0cf913b
Merge branch 'netfix5' into 'master'
...
Netfix5
See merge request veloren/veloren!1305
2020-08-17 15:26:28 +00:00
Marcel Märtens
6039c284a7
no longer block when disconnecting a player
2020-08-17 16:34:02 +02:00
Marcel Märtens
c3bdd8fa75
investigate if participant mutex causes server hang
2020-08-17 14:21:52 +02:00
Marcel
7df0ef8b5a
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
bd84fb8d90
fix clippy warnings in new version
2020-08-17 11:10:18 +02:00
Marcel Märtens
fd8a3ef66f
fix master / update toolchain to 2020-08-15
2020-08-17 10:28:09 +02:00
Marcel
788d8753eb
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
f082e1225d
Change the version number to 0.7
2020-08-15 11:53:59 +02:00
Marcel
bd505de18d
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
50afb859d1
Revert "Merge branch 'vzikl/add-zh-translation' into 'master'"
...
This reverts merge request !1241
2020-08-14 22:32:50 +00:00
Songtronix
a7821d7d6c
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
bdc05accbe
fixed jump anim bug and non-attack bug for bipedlarge
2020-08-14 10:50:08 +00:00
Marcel
26a8205316
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
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
