Commit Graph

11930 Commits

Author SHA1 Message Date
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
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Imbris
c24e017808 Merge branch 'imbris/alias-improvements' into 'master'
Adjust tracy server aliases to have a better default and be more consistent...

See merge request veloren/veloren!3422
2022-06-04 15:36:25 +00:00
Imbris
a2ac582e82 Adjust tracy server aliases to have a better default and be more consistent with the other alias naming 2022-06-04 11:26:13 -04:00
Justin Shipsey
ec2b78c533 Merge branch 'christof/smoke_variations' into 'master'
Smoke variations

See merge request veloren/veloren!3348
2022-06-02 05:21:50 +00:00
Christof Petig
589ceb6d38 avoid one allocation, spotted by imbris 2022-06-01 22:47:53 +02:00
Christof Petig
3cc88f9b1d move temp and humidity out of array, introduce different smoke types 2022-06-01 22:14:23 +02:00
Christof Petig
bf3eef6e1a remove dead use 2022-06-01 22:14:23 +02:00
Christof Petig
c35edf0680 Add changelog 2022-06-01 22:14:20 +02:00
Christof Petig
dd28dc81be humidity + clean up 2022-06-01 22:13:35 +02:00
Christof Petig
92ab095480 test and fix temperature handling 2022-06-01 22:13:35 +02:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
Christof Petig
f12f79439f fix negative values for RGB and vary dryness and strength according to biome 2022-06-01 22:13:34 +02:00
Christof Petig
827006e7e0 vary color, strength based on position, color on biome 2022-06-01 22:13:34 +02:00
Christof Petig
6ddedecc05 introduce smoke strength and color 2022-06-01 22:13:34 +02:00
Marcel
da51e38961 Merge branch 'kretka/upd_ru_trans' into 'master'
Update ru_RU

See merge request veloren/veloren!3418
2022-05-31 19:12:12 +00:00
Vlad
90d3157656 Update ru_RU 2022-05-31 18:21:34 +00:00
Ben Wallis
d389f4e29b Merge branch 'xvar/fix-agent-loot-pickup' into 'master'
Fixed animals picking up non-owned non-consumable loot

See merge request veloren/veloren!3417
2022-05-31 15:30:57 +00:00
Ben Wallis
d71f2ff682 Fixed animals picking up non-owned non-consumable loot 2022-05-31 15:57:58 +01:00
Marcel
a3f6b79420 Merge branch 'xvar/fix-loot-drop-crash' into 'master'
Added temporary fix to prevent loot drops causing a server crash

See merge request veloren/veloren!3416
2022-05-31 13:06:35 +00:00
Ben Wallis
ec1427d669 Added temporary fix to prevent loot drops causing a server crash in some (currently unknown) circumstances 2022-05-31 13:37:56 +01:00
Samuel Keiffer
d86a3f7ac3 Merge branch 'gumgee/disable-chest-explosions' into 'master'
Updated explode_power function to make chests non-explodable

Closes #1541

See merge request veloren/veloren!3404
2022-05-31 04:29:55 +00:00
Maxwell
14d5b2e579 added all other types of chest sprites to check for non-explodable objects 2022-05-30 22:41:57 -05:00
Maxwell
6e3ebb64cd updated changelog to include new changes 2022-05-30 22:41:54 -05:00
Maxwell
a8892bab53 updated explode_power function to make chests non-explodable 2022-05-30 22:40:59 -05:00
Samuel Keiffer
18b95aec23 Merge branch 'sam/indirect-armor' into 'master'
Armor stats from set

See merge request veloren/veloren!3411
2022-05-31 01:04:38 +00:00