Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'ada/improve-controller-bindings'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Ada Lovegirls 2021-02-16 15:30:46 +00:00
commit 06575f601e
546 changed files with 1011 additions and 268 deletions
CHANGELOG.md
assets/common/items/armor
back
admin.ronbackpack_0.rondungeon_purple-0.ronleather_adventurer.ronshort_0.ronshort_1.ronvelorite_mage_0.ronwarlock.ronwarlord.ron
bag
heavy_seabag.ronknitted_red_pouch.ronliana_kit.ronmindflayer_spellbag.ronreliable_backpack.ronsoulkeeper_cursed.ronsoulkeeper_pure.ronsturdy_red_backpack.rontiny_leather_pouch.rontiny_red_pouch.rontroll_hide_pack.ronwoven_red_bag.ron
belt
assassin.ronbonerattler.roncloth_blue_0.roncloth_green_0.roncloth_purple_0.roncultist_belt.rondruid.ronleather_0.ronleather_2.ronleather_adventurer.ronplate_0.ronsteel_0.rontarasque.rontwig.rontwigsflowers.rontwigsleaves.ronvelorite_mage_0.ronwarlock.ronwarlord.ron
chest
assassin.ronbonerattler.roncloth_blue_0.roncloth_green_0.roncloth_purple_0.roncultist_chest_blue.roncultist_chest_purple.rondruid.ronleather_0.ronleather_2.ronleather_adventurer.ronplate_green_0.ronrugged.ronsteel_0.rontarasque.rontwig.rontwigsflowers.rontwigsleaves.ronvelorite_mage_0.ronwarlock.ronwarlord.ronworker_green_0.ronworker_green_1.ronworker_orange_0.ronworker_orange_1.ronworker_purple_0.ronworker_purple_1.ronworker_red_0.ronworker_red_1.ronworker_yellow_0.ronworker_yellow_1.ron
foot
assassin.ronbonerattler.roncloth_blue_0.roncloth_green_0.roncloth_purple_0.roncultist_boots.rondruid.ronjackalope_slippers.ronleather_0.ronleather_2.ronleather_adventurer.ronplate_0.ronsandals_0.ronsteel_0.rontarasque.rontwig.rontwigsflowers.rontwigsleaves.ronvelorite_mage_0.ronwarlock.ronwarlord.ron
hand
assassin.ronbonerattler.roncloth_blue_0.roncloth_green_0.roncloth_purple_0.roncultist_hands_blue.roncultist_hands_purple.ron
Show More

4
CHANGELOG.md

@ -38,7 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Glider can now be deployed mid-air at the cost of some stamina based on fall speed
- Translations are now folders with multiple files instead of a huge single file
- Default inventory slots reduced to 18 - existing characters given 3x 6-slot bags as compensation
- Protection rating was moved to the top left of the loadout view
- Protection rating was moved to the top left of the loadout view
- Changed camera smoothing to be off by default.
- Footstep SFX is now dependant on distance moved, not time since last play
- Adjusted most NPCs hitboxes to better fit their models.
@ -63,6 +63,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Made zooming work on wayland
- Fixed AI behavior so only humanoids will attempt to roll
- Fixed missing GameInputs (sneak, swimup, swimdown) in controller mapping
- Fixed a bug where the stairs to the boss floor in dungeons would sometimes not spawn
- Fixed waypoints being placed underwater
## [0.8.0] - 2020-11-28

3
assets/common/items/armor/back/admin.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Debug,
)
tags: [],
)

1
assets/common/items/armor/back/backpack_0.ron

@ -9,5 +9,6 @@ ItemDef(
),
)),
quality: High,
tags: [],
slots: 18,
)

1
assets/common/items/armor/back/dungeon_purple-0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/back/leather_adventurer.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/back/short_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/back/short_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/back/velorite_mage_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/back/warlock.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/back/warlord.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/bag/heavy_seabag.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Moderate,
tags: [],
slots: 14,
)

1
assets/common/items/armor/bag/knitted_red_pouch.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Moderate,
tags: [],
slots: 9,
)

1
assets/common/items/armor/bag/liana_kit.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Moderate,
tags: [],
slots: 12,
)

1
assets/common/items/armor/bag/mindflayer_spellbag.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Epic,
tags: [],
slots: 27,
)

1
assets/common/items/armor/bag/reliable_backpack.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: High,
tags: [],
slots: 16,
)

1
assets/common/items/armor/bag/soulkeeper_cursed.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Legendary,
tags: [],
slots: 36,
)

1
assets/common/items/armor/bag/soulkeeper_pure.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Legendary,
tags: [],
slots: 36,
)

1
assets/common/items/armor/bag/sturdy_red_backpack.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: High,
tags: [],
slots: 18,
)

1
assets/common/items/armor/bag/tiny_leather_pouch.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Common,
tags: [],
slots: 6,
)

1
assets/common/items/armor/bag/tiny_red_pouch.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Common,
tags: [],
slots: 3,
)

1
assets/common/items/armor/bag/troll_hide_pack.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: High,
tags: [],
slots: 18,
)

1
assets/common/items/armor/bag/woven_red_bag.ron

@ -11,5 +11,6 @@ ItemDef(
)
),
quality: Moderate,
tags: [],
slots: 15,
)

1
assets/common/items/armor/belt/assassin.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/bonerattler.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/belt/cloth_blue_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/belt/cloth_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/belt/cloth_purple_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/belt/cultist_belt.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/belt/druid.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/leather_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/belt/leather_2.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/belt/leather_adventurer.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/plate_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/steel_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/tarasque.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/belt/twig.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/twigsflowers.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/twigsleaves.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/velorite_mage_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/belt/warlock.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/belt/warlord.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/assassin.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/bonerattler.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/chest/cloth_blue_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/cloth_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/cloth_purple_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/cultist_chest_blue.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/chest/cultist_chest_purple.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/chest/druid.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/leather_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/leather_2.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/leather_adventurer.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/plate_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/rugged.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [],
)

1
assets/common/items/armor/chest/steel_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/chest/tarasque.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/chest/twig.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/twigsflowers.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/twigsleaves.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/velorite_mage_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/chest/warlock.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/warlord.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/chest/worker_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_green_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_orange_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_orange_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_purple_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_purple_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_red_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_red_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_yellow_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/chest/worker_yellow_1.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [ClothItem],
)

1
assets/common/items/armor/foot/assassin.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/bonerattler.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/foot/cloth_blue_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/foot/cloth_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/foot/cloth_purple_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/foot/cultist_boots.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/foot/druid.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/jackalope_slippers.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/foot/leather_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/foot/leather_2.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
)

1
assets/common/items/armor/foot/leather_adventurer.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/plate_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/sandals_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [],
)

1
assets/common/items/armor/foot/steel_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/foot/tarasque.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/foot/twig.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/twigsflowers.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/twigsleaves.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/velorite_mage_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/foot/warlock.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/foot/warlord.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/hand/assassin.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
)

1
assets/common/items/armor/hand/bonerattler.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: High,
tags: [],
)

1
assets/common/items/armor/hand/cloth_blue_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/hand/cloth_green_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/hand/cloth_purple_0.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [ClothItem],
)

1
assets/common/items/armor/hand/cultist_hands_blue.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

1
assets/common/items/armor/hand/cultist_hands_purple.ron

@ -9,4 +9,5 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
)

Some files were not shown because too many files have changed in this diff Show More