Commit Graph

5175 Commits

Author SHA1 Message Date
Joshua Barretto
89a6a06a7b Adjusted worldgen colours for new lighting model 2020-08-24 12:36:27 +01:00
Joshua Barretto
79ec8c9e22 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
86b4dd6ba3 set shiny water to default 2020-08-23 22:58:01 -07:00
Monty Marz
05462349e2 Merge branch 'pfau/mini-fixes' into 'master'
Various fixes

See merge request veloren/veloren!1329
2020-08-24 00:26:33 +00:00
Imbris
57dc821f84 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
5d11adfd4c fix unequal zoom in distance and zoom out distance 2020-08-23 23:24:24 +00:00
Monty Marz
1d49186e31 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
Marcel Märtens
d37ca02913 using Locks a more sensitive way.
- replace RwLock by Mutex if it's only accessed for insert/delete
 - use RwLock<HashMap<Mutex>> pattern otherwise in order to allow concurrent `.read()`
 - fixed a deadlock O.o
2020-08-23 21:43:17 +02:00
Songtronix
877eaee151 Merge branch 'fix_filepath' into 'master'
fix filepath

See merge request veloren/veloren!1325
2020-08-23 13:43:36 +00:00
Monty Marz
abeba460be fix filepath 2020-08-23 13:36:11 +02:00
Joshua Yanovski
a38d33eeff 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
c9438c0947 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
25098e94ae 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
b9cb79918d hotfix a lock 2020-08-22 12:03:06 +02:00
Marcel
47e10c3b25 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
25c3c98160 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
1eb126736d workaround for impossible RAW msg 2020-08-22 01:09:07 +02:00
Monty Marz
8646c1add5 fix particles rendering before water
revert changes to campfires -> Address in another MR!
2020-08-22 00:17:44 +02:00
Monty Marz
ce929d2924 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
6b8e458027 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
e3eb34085f 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
9d2fe79a78 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
55d126861f 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
924d09e46c 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
7ab80ef367 sprite spawning rules 2020-08-21 19:36:16 +02:00
Monty Marz
0512c7a764 more variable alignments 2020-08-21 19:36:16 +02:00
Monty Marz
b930c34d89 agent changes, sprite spawning changes, alignment changes 2020-08-21 19:36:16 +02:00
Monty Marz
54cba3e7f9 add mushrooms, temporary disable snowy grass 2020-08-21 19:36:15 +02:00
Monty Marz
0bd0de613b rounded numbers on healthbars 2020-08-21 19:36:15 +02:00
Monty Marz
962d7694bd fix social window display 2020-08-21 19:36:14 +02:00
Marcel
7e9194eb73 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
34a4c72a73 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
926d334082 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
daffe8bee3 enable veloren_network metrics 2020-08-21 18:00:21 +02:00
Marcel Märtens
42141b3aa3 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
12b46250f5 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
b59fc2ff0c improve tracing and spans in network crate 2020-08-21 18:00:00 +02:00
Marcel
fc10c16fa1 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
712152740f Prefers picking up the highlighted item to the closest item 2020-08-21 14:09:48 +00:00
Joshua Barretto
e382e992bd 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
db183e607f Added particle explanation, more efficient particle pushing 2020-08-21 09:53:09 +01:00
Forest Anderson
9315ac758a 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
a68fc077ce 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
69463ab912 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
b85fcd99d0 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
1b80f05e82 Centred particle meshes correctly 2020-08-20 22:34:58 +01:00
Joshua Yanovski
98ae4fc2b2 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
Joshua Barretto
7eff8ff0ad Added lifetime particle parameter 2020-08-20 21:38:21 +01:00
Sam
05f4024e1a Normal now rotates with particle (fixes lighting). 2020-08-20 21:31:30 +01:00
Joshua Barretto
d31d25b170 Added orientation to more particle modes 2020-08-20 21:28:12 +01:00