Commit Graph

7806 Commits

Author SHA1 Message Date
Ben Wallis
2e08c2f76f Added client/server version mismatch message when a network error is encountered during client init.
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Joshua Barretto
8d664ded1a Merge branch 'zesterer/small-fixes' into 'master'
Fixed broken crafting sprite requirement

See merge request veloren/veloren!2180
2021-04-22 11:57:13 +00:00
Joshua Barretto
f987f4d628 Fixed broken crafting sprite requirement 2021-04-22 12:30:48 +01:00
Ben Wallis
89e043bbca Merge branch 'lboklin/wildlife-group-spawn-dist' into 'master'
Space wildlife group spawns apart to prevent spawnplosions

See merge request veloren/veloren!2178
2021-04-22 08:50:20 +00:00
Ludvig Böklin
1708b8b4cc Space wildlife group spawns apart to prevent spawnplosions 2021-04-22 08:50:20 +00:00
Snowram
87b14dac7a Merge branch 'slipped/zeropointeight' into 'master'
small tweaks

See merge request veloren/veloren!2168
2021-04-22 07:05:18 +00:00
jshipsey
19ce4ad531 comments 2021-04-22 00:04:39 -04:00
jshipsey
2f523f5aa0 formatting 2021-04-22 00:04:39 -04:00
jshipsey
0962fe72f2 fix for 1h on back 2021-04-22 00:04:39 -04:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Joshua Barretto
f1a991fa09 Merge branch 'zesterer/pit-of-tartarus' into 'master'
Made the pit of tartarus less bad

See merge request veloren/veloren!2179
2021-04-21 22:08:06 +00:00
Joshua Barretto
19184a49a7 Made the pit of tartarus less bad 2021-04-21 22:18:44 +01:00
Dominik Broński
1d25016459 Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
Fix ArrowTurret drag coefficient

See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
0cc2a77d1d Merge branch 'imbris/quickfix' into 'master'
Quick physics perf fix

See merge request veloren/veloren!2177
2021-04-21 18:32:53 +00:00
Imbris
51c0f8733c Quick physics perf fix 2021-04-21 14:03:23 -04:00
Imbris
46b452d6a5 Merge branch 'revert-68539a75' into 'master'
Revert "Merge branch 'revert-b10718c5' into 'master'"

See merge request veloren/veloren!2176
2021-04-21 17:47:18 +00:00
Imbris
1af4a04231 Revert "Merge branch 'revert-b10718c5' into 'master'"
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223 Merge branch 'zesterer/lanterns' into 'master'
Made characters carry lanterns higher when possible

See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Ludvig Böklin
37713cb4ad Fix ArrowTurret drag coefficient 2021-04-21 18:26:23 +02:00
Joshua Barretto
81ba200e48 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
Joshua Barretto
2c95165c82 Improvements to lantern holding when sitting 2021-04-21 16:54:03 +01:00
Imbris
68539a751b Merge branch 'revert-b10718c5' into 'master'
Revert "Merge branch 'imbris/agent-opt' into 'master'"

See merge request veloren/veloren!2172
2021-04-21 15:06:35 +00:00
Imbris
699a5493ec Merge branch 'lboklin/simplify-buoyancy' into 'master'
Simplify buoyancy for performance reasons

See merge request veloren/veloren!2171
2021-04-21 15:06:31 +00:00
Imbris
ae9d9d60ee Merge branch 'lboklin/prevent-full-stop-from-drag' into 'master'
Prevent drag forces from causing something to come to a complete stop

See merge request veloren/veloren!2170
2021-04-21 15:06:27 +00:00
Joshua Barretto
ed7cc12213 Made characters carry lanterns higher when possible 2021-04-21 15:59:29 +01:00
Ludvig Böklin
a1744182b3 Simplify buoyancy for performance reasons 2021-04-21 16:19:02 +02:00
Ludvig Böklin
6e364665cb Prevent drag forces from causing something to come to a complete stop 2021-04-21 16:13:51 +02:00
Imbris
fd672980c4 Revert "Merge branch 'imbris/agent-opt' into 'master'"
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Imbris
b10718c568 Merge branch 'imbris/agent-opt' into 'master'
Make agent target choosing faster, rename common-sys -> common-systems, parallelize more terrain sending things, and remove extra chunk clones

See merge request veloren/veloren!2024
2021-04-21 01:43:06 +00:00
Imbris
76ff00757f Appease clippy, add CHANGELOG entry 2021-04-20 15:29:20 -04:00
Imbris
e17477979f Remove extra chunk cloning and parallelize serialization in the server terrain sys 2021-04-20 15:25:05 -04:00
Imbris
9e0fbd392d Remove some of the spans in the agent system 2021-04-20 15:25:05 -04:00
Imbris
110165de3a Add more profiling spans to the agent system and add timing notes 2021-04-20 15:25:04 -04:00
Imbris
e750c9d570 Switch agent target search to use a spatial grid, add convience method for querying the aabr of a circle 2021-04-20 15:25:04 -04:00
Imbris
a76fdbc325 Expose CachedSpatialGrid resource that is updated by the physics system, move BuildAreas into its own module, removed unused ExecMode 2021-04-20 15:25:04 -04:00
Imbris
26222a0a2d Rename common-sys to common-systems and rearrange common-state slightly 2021-04-20 15:25:04 -04:00
Imbris
b264b4a8d4 Merge branch 'lboklin/drag-equation' into 'master'
Basic fluid dynamics: Buoyancy, drag, masses and densities

See merge request veloren/veloren!1892
2021-04-20 16:18:45 +00:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Joshua Barretto
bcf9a8089f Merge branch 'better-crafting' into 'master'
Crafting station sprites in towns

See merge request veloren/veloren!2160
2021-04-20 15:08:36 +00:00
Joshua Barretto
cd79be15d8 Merge branch 'zesterer/small-fixes' into 'master'
Fix block snapping at low TPS, account for FP imprecision in block-hopping

See merge request veloren/veloren!2164
2021-04-20 14:58:40 +00:00
Joshua Barretto
68004bc39c Made cooking pots glow 2021-04-20 15:39:46 +01:00
Joshua Barretto
70c345eee9 Made crafting UI check exact crafting sprite 2021-04-20 15:23:52 +01:00
Joshua Barretto
a19212daf7 Fix block-snapping at low framerates 2021-04-20 14:59:59 +01:00
Joshua Barretto
9ff7db9b1c Account for FP imprecision in block-hopping 2021-04-20 14:54:21 +01:00
Joshua Barretto
36e95e0c03 Cleaned up client-side recipe handling 2021-04-20 12:33:22 +01:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Monty Marz
abacdfc719 clippy 2021-04-20 02:48:17 +02:00
Monty
86445af09c change cauldron spawning
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Joshua Barretto
11ba02130c Made sprite/block selection effect more subtle 2021-04-20 02:46:07 +02:00
Joshua Barretto
483276b082 Made sprite/block selection effect more subtle 2021-04-20 02:46:06 +02:00