Joshua Yanovski
10245e0c1b
Merge more models into one mesh than we did previously.
2020-08-15 21:15:02 +02:00
Joshua Yanovski
3155c31e66
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 22:35:22 +02:00
Joshua Yanovski
7204cc8a7a
Fix not yet done NPC animations.
...
This forces them all to be the idle animation if not specified.
This fixes issues where you'd have giant NPCs in water.
2020-08-13 22:34:43 +02:00
Joshua Yanovski
bc83360f2a
Try to fix some bugs:
...
- Z fighting with LOD terrain and water.
- Audio SFX not playing.
2020-08-13 19:37:51 +02: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
Joshua Yanovski
1fd104aa60
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 12:02:31 +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 Yanovski
862df3c997
Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes
2020-08-13 05:52:56 +02: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 Yanovski
0a4218ed9d
Fix particle depth.
2020-08-12 22:27:14 +02: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
Joshua Barretto
6c3c941a49
Fixed client API
2020-08-12 21:15:52 +01:00
Joshua Barretto
b27a65fd0f
Castle improvements
2020-08-12 21:15:52 +01:00
Joshua Barretto
d6cdb0c433
Began adding castles
2020-08-12 21:15:52 +01:00
Joshua Barretto
1f4cec773b
Added make_block command
2020-08-12 21:15:52 +01:00
Joshua Barretto
f21a50e393
Added forts to towns, began better economy sim
2020-08-12 21:15:52 +01:00
Joshua Barretto
ae8195fac9
Added simple keeps
2020-08-12 21:15:52 +01:00
Monty Marz
0a4b763a6a
fix wrong filepath
2020-08-12 22:07:37 +02:00
Marcel
f3ea67510d
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
