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
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
Sam
6e2dff7136
Weapon stats adjustments and ability icon revisions
2023-07-29 19:04:09 -04:00
Sam
30bafec247
Icons
2023-07-29 19:04:08 -04:00
Monty Marz
a4bfa1d242
skills_bg
2023-07-29 19:04:08 -04:00
Sam
9fa556b165
Axe AI
2023-07-29 19:04:07 -04:00
Sam
dd616f85a9
Changelog and appease CI
2023-07-29 19:04:07 -04:00
Sam
68181e9b5b
Axe skill tree
2023-07-29 19:04:06 -04:00
Sam
93ddb36c0a
Axe skill icons
2023-07-29 19:04:06 -04:00
Sam
834a811def
Buff icons
2023-07-29 19:04:05 -04:00
Sam
9b126dc502
Localization for english
2023-07-29 19:04:05 -04:00
Sam
27f590352f
Capsize
2023-07-29 19:04:04 -04:00
Sam
976ecaa0b6
Bulkhead
2023-07-29 19:04:04 -04:00
Sam
98f33f0633
Keelhaul
2023-07-29 19:04:03 -04:00
Sam
188be17b95
Defiance
2023-07-29 19:04:03 -04:00
Sam
c62626cec1
Plunder
2023-07-29 19:04:02 -04:00
Sam
820f8dca94
Sunder
2023-07-29 19:04:02 -04:00
Sam
daea14f8e5
Skull bash
2023-07-29 19:04:01 -04:00
Sam
9a6cb01da3
Fracture now scales with combo and consumes only half of combo
2023-07-29 19:04:01 -04:00
Sam
42e804578e
Riptide
2023-07-29 19:04:01 -04:00
Sam
41f69d28ac
Lacerate
2023-07-29 19:04:00 -04:00
Sam
35a05329fc
Fracture
2023-07-29 19:04:00 -04:00
Sam
a2deac19ee
Furor
2023-07-29 19:03:59 -04:00
Sam
1548db3760
Fierce raze
2023-07-29 19:03:59 -04:00
Sam
4b398fb1cf
Bloodfeast
2023-07-29 19:03:58 -04:00
Sam
1cc99c9c4a
Fixes to animations and making ability that the animation system thinks is being used more correct
2023-07-29 19:03:56 -04:00
