Commit Graph

14288 Commits

Author SHA1 Message Date
Isse
58b541490b Merge branch 'fix_sea_wyvern_head_offset' into 'master'
fix sea wyvern head offset

See merge request veloren/veloren!4059
2023-08-09 12:44:27 +00:00
Isse
b3899d6966 Merge branch 'isse/usable-shovel' into 'master'
Usable shovel

See merge request veloren/veloren!4060
2023-08-08 18:45:10 +00:00
Isse
d74a743d4f update shovel voxel files to fit animations better 2023-08-08 20:44:37 +02:00
Isse
ba1cee4fd2 more animation 2023-08-06 21:39:38 +02:00
DaforLynx
3ddc3f5f72 Merge branch 'DaforLynx/repair_sfx' into 'master'
Play sfx on successful repair

See merge request veloren/veloren!4062
2023-08-05 18:49:49 +00:00
DaforLynx
16f53d33ed Play sfx on successful repair 2023-08-05 18:49:49 +00:00
Isse
98385b3b15 animation 2023-08-04 13:59:22 +02:00
Marcel
aaaa8c13b0 Merge branch 'xMAC94x/fix_gittag_ci_step' into 'master'
try to fix gittag job

See merge request veloren/veloren!4042
2023-08-04 09:23:43 +00:00
flo666
db6ebcd685 remove shovel outcome trigger from combomelee state 2023-08-03 23:00:32 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
b06960ce1c fix interaction_text 2023-08-03 20:56:26 +02:00
flo666
5f7895ffa0 wyverns: parallel loot drops - All() 2023-08-03 20:11:51 +02:00
Isse
d890190af4 add animations 2023-08-03 19:45:23 +02:00
Isse
5e225d7f35 add to changelog 2023-08-03 19:38:31 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
flo666
9bd5003d31 fix sea wyvern head offset 2023-08-03 19:25:55 +02:00
Isse
8abb93040c Merge branch 'qsto/chests-cleanup' into 'master'
Qsto/chests cleanup

See merge request veloren/veloren!4039
2023-08-02 21:37:16 +00:00
UncomfySilence
4c953cd36a teeny tweak 2023-08-02 22:53:49 +02:00
Isse
54bd7791e5 changelog entry 2023-08-02 18:48:31 +02:00
Isse
254c1c7145 ResourceSprite Fill, so we can track giant tree IronWood in rtsim 2023-08-02 18:48:01 +02:00
Michal Sroczynski
0d4fc62468 Code quality fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
1301761445 Scatter changes and fixes 2023-08-02 18:48:01 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00
Michal Sroczynski
c1b8544065 Fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
50304ed54e Format fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
28cf9bf19d Add woods to scatter and rarify the pyrebloom 2023-08-02 18:48:01 +02:00
Michal Sroczynski
4879f75069 Various loot changes 2023-08-02 18:47:59 +02:00
Michal Sroczynski
a577ed1d36 Changes to Gnarling Tree 2023-08-02 18:45:40 +02:00
Isse
b08b9cf8e8 Merge branch 'spawn_wyverns' into 'master'
spawn wyverns

See merge request veloren/veloren!3994
2023-08-02 07:55:10 +00:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
Isse
e89f28bbb5 Merge branch 'qsto/brimstone-armor-fix' into 'master'
Brinestone armor recipe fix

See merge request veloren/veloren!4056
2023-08-02 07:55:06 +00:00
Michal Sroczynski
2805509c12 Brinestone armor recipe fix 2023-08-02 09:06:02 +02:00
Isse
690385df96 Merge branch 'tibbon1/fix_test_economy_tests' into 'master'
Lower grass target in standalone economy tests

See merge request veloren/veloren!4051
2023-08-01 17:45:30 +00:00
Christof Petig
8c6465851d Merge branch 'tibbon1/update_approx_0_5_1' into 'master'
approx 0.4.0 -> 0.5.1

See merge request veloren/veloren!4052
2023-08-01 06:36:03 +00:00
David Fisher
e2a0bc55c3 Lower grass target in standalone economy tests
because: The test_economy_moderate_standalone was failing tests on
arm64 MacOS systems with the following error:

```
thread 'site::economy::context::tests::test_economy_moderate_standalone' panicked at 'assertion failed: site.economy.pop >= env.targets[&id]', world/src/site/economy/context.rs:562:17
```

This was originally reported in Discord by @sharp in July, 2022
https://discord.com/channels/449602562165833758/797421546871324712/997332351195553874

Debugging showed that the grass target was 880, and the population was only around 718.
Local testing showed that lowering the grass target to 700 fixed the issue.

this commit: Lowers the grass target to 700 in the standalone economy tests.

unaddressed questions:

- Why is the grass target so high in the standalone economy tests?
- Alternately, why did the grass population drift so low, and no longer aligned with the tests.
- Why is this passing in CI, but not local testing?
- There are a number of commented out add_settlement calls in the standalone economy tests. Were there issues with the tests prior?
2023-07-31 16:51:29 -04:00
Joshua Barretto
bcbfbbb274 Merge branch 'jimmy/controller-layers' into 'master'
controller layers

See merge request veloren/veloren!3988
2023-07-31 16:20:01 +00:00
David Fisher
a5d597516e num_derive 0.3 -> 0.4.0
because: num_derive was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates num_derive to 0.4.0

Tests appear to pass locally, pending CI run for confirmation.

Changes between 0.3 and 0.4.0:
https://github.com/rust-num/num-derive/compare/num-derive-0.3.0...num-derive-0.4.0
2023-07-31 10:28:36 -04:00
David Fisher
7751ef611c approx 0.4.0 -> 0.5.1
because: approx was flagged as outdated in the list of dependencies
https://deps.rs/repo/gitlab/veloren/veloren

this commit: Updates approx to 0.5.1

Tests appear to pass.

Changes between 0.4.0 and 0.5.1:
https://github.com/brendanzab/approx/compare/v0.4.0...v0.5.1
2023-07-31 08:22:52 -04:00
JimmyDdotEXE
996bbeb983 add doc comments to LayerEntry and GameLayerEntries structs 2023-07-30 13:34:23 -04:00
JimmyDdotEXE
18d74e6a8e replace conditional LayerEntry construction during input check 2023-07-30 13:19:46 -04:00
DaforLynx
05c9ca22a5 Merge branch 'DaforLynx/combat-music-toggle' into 'master'
Combat music toggle

See merge request veloren/veloren!4048
2023-07-30 08:10:37 +00:00
DaforLynx
32f3437fb0 Combat music toggle 2023-07-30 08:10:36 +00:00
Samuel Keiffer
96f77e9dd6 Merge branch 'axe' into 'master'
Axe

See merge request veloren/veloren!3956
2023-07-29 23:46:11 +00:00
Sam
d2cbcbe698 Changelog and rebase fixes 2023-07-29 19:12:54 -04:00
Sam
4bc6d9a6dc Added documentation 2023-07-29 19:04:44 -04:00
Sam
e3ad16ef47 Addressed review comments 2023-07-29 19:04:11 -04:00
Sam
9f86cafc5c Self buffs clear on tab swaps 2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf Addressed testing feedback 2023-07-29 19:04:10 -04:00
Sam
4fd1626e5f Address review comments 2023-07-29 19:04:10 -04:00
Sam
df0244c5e7 Balancing feedback 2023-07-29 19:04:09 -04:00