4877 Commits

Author SHA1 Message Date
Monty Marz
3615819262 better formatting and adjusted stone spawn rate 2020-08-24 12:36:27 +01:00
Joshua Barretto
6cf30904b8 Less bizarre rock and stalagtite colours 2020-08-24 12:36:27 +01:00
Joshua Barretto
35d4dd1405 Made below-ground LoD dark 2020-08-24 12:36:27 +01:00
Joshua Barretto
148e5e2632 Prevented terrain scatter spawning in the air 2020-08-24 12:36:27 +01:00
Joshua Barretto
872058e022 Adjusted worldgen colours for new lighting model 2020-08-24 12:36:27 +01:00
Joshua Barretto
a836cd02bf Merge branch 'james/fix-shiny-shader-nvidia' into 'master'
Fixed NVidia shiny water shader bug and re-enabled in settings

See merge request veloren/veloren!1319
2020-08-24 07:09:48 +00:00
jiminycrick
7bf2c12bed set shiny water to default 2020-08-23 22:58:01 -07:00
Monty Marz
00b25d5c2b Merge branch 'pfau/mini-fixes' into 'master'
Various fixes

See merge request veloren/veloren!1329
2020-08-24 00:26:33 +00:00
Imbris
3b9ec38c59 Merge branch 'sovareign/camera_zoom_fix' into 'master'
fix unequal zoom in distance and zoom out distance

See merge request veloren/veloren!1322
2020-08-23 23:24:24 +00:00
Niko Thees
a4631e291a fix unequal zoom in distance and zoom out distance 2020-08-23 23:24:24 +00:00
Monty Marz
ec759b6798 various fixes
Balanced crafted weapon power

Adjusted tooltip color

Added tooltip showing account name to the social window
2020-08-24 01:16:53 +02:00
Songtronix
d18b1cd882 Merge branch 'fix_filepath' into 'master'
fix filepath

See merge request veloren/veloren!1325
2020-08-23 13:43:36 +00:00
Monty Marz
22d98c8c9b fix filepath 2020-08-23 13:36:11 +02:00
Joshua Yanovski
125f435c52 Merge branch 'pfau/follow-up-fixes' into 'master'
Fix a bunch of issues introduced by the rebalance branch

See merge request veloren/veloren!1323
2020-08-22 23:37:45 +00:00
Monty Marz
fec55d9150 Fixes
Fix Cave NPCs only spawning very deep inside caves

Increase twig density

Adjust armour values and ingredients for starter sword

fix healing rod using the wrong model

Hung up the lianas again
2020-08-22 23:37:45 +00:00
Marcel
f423b1090f Merge branch 'xMAC94x/hotfix' into 'master'
xmac94x/hotfix

See merge request veloren/veloren!1321
2020-08-22 10:33:24 +00:00
Marcel Märtens
97d990213c hotfix a lock 2020-08-22 12:03:06 +02:00
Marcel
b0c666fe3a Merge branch 'xMAC94x/tmp_raw_fix' into 'master'
workaround for impossible RAW msg

See merge request veloren/veloren!1320
2020-08-22 00:12:25 +00:00
Monty Marz
3c3a7ba9b3 Merge branch 'pfau/fixes' into 'master'
Balancing and polish

See merge request veloren/veloren!1292
2020-08-21 23:39:48 +00:00
Marcel Märtens
7eee92b108 workaround for impossible RAW msg 2020-08-22 01:09:07 +02:00
Monty Marz
f608bf6cd8 fix particles rendering before water
revert changes to campfires -> Address in another MR!
2020-08-22 00:17:44 +02:00
Monty Marz
12546d6bf4 Address comments, clippy and minor adjustments
first bunch of comments addressed

change order or scatter, paths and caves being applied in worldgen to avoid floating scatter objects

campfire adjustments, reduced grass density due to FPS issues

readded item descriptions to the crafting window, item desc for craftable armour

address comments
happy clippy, happy life
clippy

clippy

more clippy
fmt

revert cargo.toml formatting
remove "allow unreachable pattern"
fmt
2020-08-21 22:37:08 +02:00
jiminycrick
4a81080b0d Fixed NVidia shiny water shader bug and re-enabled in settings
missed a commented line
2020-08-21 14:59:18 -04:00
Monty Marz
0edfc93ec7 craftable starting set
velorite staff update

ore_nature_longbow

model fix
humanoid colours

Update agent.rs

improve rng (according to zesterer)

slower fleeing

More adjustments

fix cult leader name

more loot tables

all kinds of adjustments

smöl adjustments
2020-08-21 19:36:21 +02:00
Sam
998815b438 Changes to how critical hits function for melee attacks. Removed ability for explosions to crit. Velorite sceptre now functions as healing staff. 2020-08-21 19:36:20 +02:00
Monty Marz
e9c2f96679 fix tooltips in char selection, more balancing
fix talking animals

fix critter exp, stronger villagers

biped large balancing

more villager balancing, mushroom spawning rate

more balancing

fix rebase

multiple loottables

Add tarasque and bonerattler armour

Added loot tables for different groups of weapons and armor based off relative strength. Added loot table for cultist boss.

Added loot tables for consumables and food. Trimmed down default loot table.

remove male and female sign from char creation

chest loot tables

fix loot tables

lootable crates

lantern keybinding display

more loot tables

loot table changes

fixed loot tables

fix typo
more grass

rebase fix, better lantern

re-add sprite rotation for grass

crafting window alignment fix, new streetlamps, new shopsigns, new healing staff

height change
2020-08-21 19:36:19 +02:00
Sam
a0d2382767 balancing
more specific stats

Update body.rs

more balancing

non hostile catoblepas and mouflons

quad low
more adjustments
Animals with enemy alignment now deal correct damage. Made health scaling species-specific.
2020-08-21 19:36:17 +02:00
Monty Marz
69273da630 sprite spawning rules 2020-08-21 19:36:16 +02:00
Monty Marz
5494f3dc9d more variable alignments 2020-08-21 19:36:16 +02:00
Monty Marz
91137a12b0 agent changes, sprite spawning changes, alignment changes 2020-08-21 19:36:16 +02:00
Monty Marz
3e02002263 add mushrooms, temporary disable snowy grass 2020-08-21 19:36:15 +02:00
Monty Marz
ed2dc4b653 rounded numbers on healthbars 2020-08-21 19:36:15 +02:00
Monty Marz
2265ce83a4 fix social window display 2020-08-21 19:36:14 +02:00
Marcel
6a2c2f2694 Merge branch 'xMAC94x/network_tracing' into 'master'
xmac94x/network tracing

See merge request veloren/veloren!1311
2020-08-21 17:24:31 +00:00
Marcel Märtens
d9a6938d12 Fix scheduler not really shutting down when they where listening on a Port. Add a seperate test for this.
- 1000ms sleep isn't enough in tracing anyway, so remove it
2020-08-21 18:00:34 +02:00
Marcel Märtens
a62b1e3b7c Fixed the unclean disconnecting of participants.
Till now, we just dropped the TCP connection and registered this as a clean shutdown.
The prodocol reader intereted this and send a Frame::Shutdown frame to it's local processor.
This is ofc wrong.
So now the protocol reader will detect a Frame::Shutdown frame and send it over. if the Tcp connection gets closed it will return an Error up.
The processor will then pick up this error and request a unclear shutdown and notifies the user.
Also when doing a clean shutdown we are sending a Frame::Shutdown now to the remote side to trigger this behavior.

Before we wrongly added the feature of only using a `select` in channel. This is WRONG,
 as it could mean that the write maybe fails, but the read still had some Frames buffered which then get dropped.
Its fixed now by the clean shutdown mechanims defined before.

Also when a channel is closed now inside a participant we are closing the whole participant as a protection.
However, we must not close the recv channel as the `handle_frames_mgr` might still be working on them, so we only stop writing/sending.

Debugging this also let me introduce some smaller fixes:
 - PID in tests are now 0 and 1+1*64+1*64*64+... this makes the traces appear as AAAAAA and BBBBBB instead of ABAAAA and ACAAAA
 - veloren client now better seperates between clean shutdown and unclear shutdown.
 - added a new type: C2pFrame for `(cid, Result<Frame, ()>)`
 - wrong frames inside the handshare are not counted in metrics
 -
2020-08-21 18:00:28 +02:00
Marcel Märtens
ecb443d1cd enable veloren_network metrics 2020-08-21 18:00:21 +02:00
Marcel Märtens
410a4a99b7 remove some trace! in network which a) was only spam and b) could be replaced by a metric way better.
added a span for disconnecting on the gameserver side. also added more debug! tracing there
Just keeping a trace! all 10000ms active to have a keep alive feeling.
2020-08-21 18:00:14 +02:00
Marcel Märtens
effecd7a04 protocols no longer send a Close Frame in case the read fails. They just fail, let participant handle this!
Participant will now handle a close in the `create_channel_mgr` rather then the `send` fn. Its the better place, which makes a HashMap better for delete lookup
Since tcp_read now broke but tcp_write didn't and the Participant wasnt updated till both were broke, we changed CHANNEL tcp_read and tcp_write in protocols to be a `select` rather than a `join`
However only do this in the CHANNEL, but in the HANDSHAKE. it fails if you try to. Also the handshake will take care of any failed read or write manually and will handle a clear teardown in this case.
2020-08-21 18:00:07 +02:00
Marcel Märtens
80c8c389de improve tracing and spans in network crate 2020-08-21 18:00:00 +02:00
Marcel
f39b30e50b Merge branch 'rdbaker/fix-highlighted-pickup-bug' into 'master'
Prefers picking up the highlighted item to the closest item

Closes #725

See merge request veloren/veloren!1315
2020-08-21 14:09:48 +00:00
Ryan Baker
92be8f9fd1 Prefers picking up the highlighted item to the closest item 2020-08-21 14:09:48 +00:00
Joshua Barretto
9d5d8644a4 Merge branch 'zesterer/atmospheric-particles' into 'master'
Atmospheric Particles

See merge request veloren/veloren!1310
2020-08-21 10:24:42 +00:00
Joshua Barretto
08708238af Added particle explanation, more efficient particle pushing 2020-08-21 09:53:09 +01:00
Forest Anderson
7f6c2fa5b9 Merge branch 'spyros/empty-default-admins' into 'master'
Make the default admin list an empty vec

Closes #721

See merge request veloren/veloren!1316
2020-08-20 23:41:47 +00:00
Forest Anderson
994583602b Merge branch 'songtronix/fixes' into 'master'
Fix: Various fixes

Closes #726

See merge request veloren/veloren!1306
2020-08-20 23:25:13 +00:00
Forest Anderson
350e057cac Merge branch 'T-Dark-invuln-armor-makes-you-invuln' into 'master'
Fixed debug armor letting some damage through

Closes #703

See merge request veloren/veloren!1309
2020-08-20 23:22:50 +00:00
Forest Anderson
0638246d61 Merge branch 'marius/fix-veloren-nix' into 'master'
Fixed and updated nix files

See merge request veloren/veloren!1318
2020-08-20 22:51:40 +00:00
Joshua Barretto
4e73286c21 Centred particle meshes correctly 2020-08-20 22:34:58 +01:00
Joshua Yanovski
1734370274 Merge branch 'sharp/fix-shiny' into 'master'
Properly remove Shiny option.

See merge request veloren/veloren!1317
2020-08-20 21:23:40 +00:00