Commit Graph

12105 Commits

Author SHA1 Message Date
Sam
1f60bdd452 Removed sticky thread requirement from bow limbs. 2022-06-18 15:19:37 -04:00
Isse
479affe127 Merge branch 'fix-command-tab' into 'master'
fix

See merge request veloren/veloren!3439
2022-06-18 14:09:25 +00:00
IsseW
c7a6955565 fix 2022-06-18 15:25:55 +02:00
runrobdog
10023b0759 tweak entity stats 2022-06-18 12:33:19 +02:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage.
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
2022-06-17 21:13:45 -04:00
runrobdog
1e289e6335 tweaks entity stats 2022-06-17 21:48:09 +02:00
runrobdog
1e19f5541b tweak entity stats 2022-06-17 21:41:04 +02:00
runrobdog
95148a9968 tweaks entity stats 2022-06-17 12:35:06 +02:00
Marcel
33014225be Merge branch 'imbris/remove-uneeded-tick-counter' into 'master'
Remove tick_count since we can already get a count of ticks via `tick_time_hist_count`

See merge request veloren/veloren!3436
2022-06-17 07:20:08 +00:00
Imbris
cd503a210e Remove tick_count since we can already get a count of ticks via
`tick_time_hist_count`.
2022-06-16 22:08:54 -04:00
Imbris
11e71529d5 Merge branch 'imbris/event-metrics' into 'master'
Add metrics for counting server events

See merge request veloren/veloren!3435
2022-06-16 02:08:38 +00:00
Imbris
d5718fd410 Switch to counter of events and add tick counter 2022-06-15 19:25:00 -04:00
Imbris
950723dd0d Add metrics for counting server events 2022-06-15 00:40:58 -04:00
Dominik Broński
2404f111f1 Merge branch 'maveth/client_side_mute' into 'master'
Add a client-side mutelist

See merge request veloren/veloren!3349
2022-06-14 20:35:01 +00:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
Joshua Barretto
0ad359f3c8 Merge branch 'zesterer/server-gameplay-settings' into 'master'
Added server gameplay settings, ability to toggle explosion burns off

See merge request veloren/veloren!3433
2022-06-14 15:07:20 +00:00
Joshua Barretto
b555381677 Added server gameplay settings, ability to toggle explosion burns off 2022-06-14 14:24:08 +01:00
Marcel
e83cd45913 Merge branch 'isse/owned-mine-drop' into 'master'
Owned mine loot

See merge request veloren/veloren!3431
2022-06-12 17:56:59 +00:00
Isse
e03b733ad7 Owned mine loot 2022-06-12 17:56:59 +00:00
Samuel Keiffer
179bf7216e Merge branch 'tormod/remove-size' into 'master'
Remove site size from site suitability function.

See merge request veloren/veloren!3427
2022-06-10 18:12:59 +00:00
Isse
28ac436fb7 Merge branch 'isse/fix-depot-bug' into 'master'
Fix depot bug

See merge request veloren/veloren!3430
2022-06-09 13:58:17 +00:00
IsseW
e05da7f6fa fix depot bug 2022-06-09 09:53:06 +02:00
Marcel
b12dc3b020 Merge branch 'christof/faster_orientation' into 'master'
introduce a fast path for the common case of already horizontal ori and small rotation changes

See merge request veloren/veloren!3375
2022-06-08 22:19:33 +00:00
Marcel
ff17adb6da Merge branch 'xMAC94x/network_overflow' into 'master'
add a check to break the sending loop if the current bytes got greater than the total bytes.

See merge request veloren/veloren!3429
2022-06-08 09:05:40 +00:00
Marcel Märtens
754bf32580 add a check to break the sending loop if the current bytes got greater than the total bytes.
We calculate a max bandwidth, but due to framing the packages, i think its possible for the current_bytes to get a few bytes over the actuall planed bandwidth. which prob isn't that bad/unfair
2022-06-08 09:45:25 +02:00
Christof Petig
a55cbbbf11 move the character_state test to the systems crate (where the infrastructure is complete) 2022-06-08 07:47:20 +02:00
Christof Petig
b702a27b28 different incomplete unit test attempts [ci skip] 2022-06-08 07:46:00 +02:00
Christof Petig
f8dd030643 remove dead code, test skeleton 2022-06-08 07:46:00 +02:00
Christof Petig
9c07f204a4 introduce a fast path for the common case of already horizontal ori and small rotation changes 2022-06-08 07:46:00 +02:00
Marcel
ac734d0a48 Merge branch 'xMAC94x/physics_tests' into 'master'
Add physics tests

See merge request veloren/veloren!3428
2022-06-07 22:43:29 +00:00
Marcel
972cb26b2a Merge branch 'christof/shredded_economy4b' into 'master'
Simplify economy code by separating professions and everyone

See merge request veloren/veloren!3420
2022-06-07 22:28:44 +00:00
Christof Petig
1c5cb8abcd follow the more elegant proposal by clippy 2022-06-07 23:37:51 +02:00
Marcel Märtens
17661d9655 Revert "massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator"
This reverts commit 819dae754e.

I wanted to have it in the commit history though
2022-06-07 22:57:40 +02:00
Marcel Märtens
819dae754e massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator
do physics always after character_behavior as this one is saying how the input should be handled
2022-06-07 22:57:17 +02:00
Marcel Märtens
997b330f19 add physics tests that verify the status quo 2022-06-07 22:53:34 +02:00
Christof Petig
fca4372205 avoid economy of scale in economy_tree 2022-06-07 21:46:41 +02:00
Christof Petig
5a965d21c7 replace vector copying with an iterator 2022-06-07 21:38:17 +02:00
Christof Petig
39fafe646c add the missing files outside of world from shredded_economy4 2022-06-07 18:30:05 +02:00
Christof Petig
db85d2a146 fix clippy 2022-06-07 18:30:05 +02:00
Christof Petig
6d3ea3172c separate orders by professions and everyone
cleanup and fix
strictly this population growth logic is wrong, but identical to the existing one
standardize on production, remove more dead code
fix example + rustfmt
separate csv logic from tick (intention is to move it into economy)
remove the format call from economy (inactive debugging code)
remove more formatting
rustfmt
small clippy fix
Reduce precision on output
move csv code
move rest of sim2 mod into economy (context)
remove more unused parts
keep things a bit more coherent
remove pub
make more functions and fields private
remove outdated input, fix other, print names, move output to proper abstraction
remove dead code
2022-06-07 18:30:05 +02:00
Christof Petig
edffd576d4 only the code move part of shredded_economy4 2022-06-07 18:30:05 +02:00
Ben Wallis
35f9c5cbdf Merge branch 'Animals_eat_food_on_spot' into 'master'
make animal NPC's eat food on spot

See merge request veloren/veloren!3426
2022-06-07 07:25:28 +00:00
N A
3d24ac79e3 make animal NPC's eat food on spot 2022-06-07 07:25:27 +00:00
Tormod G. Hellen
08ffcdf5a5 Create temperature requirement for giant tree.
Since the giant tree is currently a leafy tree, it looks a bit out
of place in colder regions where there's otherwise only pine trees.
2022-06-07 00:32:46 +02:00
Tormod G. Hellen
c1335e16fe Remove site size from site suitability function.
This was buggy, in that the requirement was for _any_ chunk
in the site area being suitable as opposed to _all_ chunks
in the site being suitable. This is easy to fix, but we don't
always want to have exactly the same criteria for the center
of a site as for the outskirts of it.

This should fix gnarling forts etc. spawning in the water just
off the shore.
2022-06-07 00:27:37 +02:00
Imbris
713828b8fe Merge branch 'imbris/tweaks' into 'master'
A experimental shader option to visualize directional shadow texel density and add a little bit of documentation to light/shadow code

See merge request veloren/veloren!3424
2022-06-05 21:21:02 +00:00
Imbris
b7096d9f2e Scale shadow grid to multiple texels per grid cell to make it easier to examine 2022-06-05 16:35:12 -04:00
Imbris
9b78d75f06 Add experimental shader option to visualize shadow map texels 2022-06-05 16:35:12 -04:00
Imbris
be1cc1b983 Add a few pieces of documentation to code related to light and shadows 2022-06-05 16:35:12 -04:00
Ben Wallis
93a565e51b Merge branch 'group-owned-loot' into 'master'
Implement group owned loot

See merge request veloren/veloren!3421
2022-06-04 17:16:12 +00:00