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
8,827 Commits 151 Branches 18 Tags 2.1 GiB
b84708ca75
Commit Graph

8827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty
c17e3ad996 Cactus Colada 
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
 2021-06-13 13:52:56 +02:00
Marcel
278b64deab Merge branch 'juliancoffee/item_price_split_consumables' into 'master' 
Split consumables to different tables in trading

See merge request veloren/veloren!2415
 2021-06-13 11:29:47 +00:00
Marcel
e987f9ae10 Merge branch 'xvar/fix-backpack-swap' into 'master' 
Fixed crash when swapping an equipped item with slots for an item with no slots

See merge request veloren/veloren!2430
 2021-06-13 11:16:03 +00:00
Ben Wallis
f47838ee9d Improved inventory swap 2021-06-12 19:06:39 +01:00
Avi Weinstock
d02ff2db20 Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
juliancoffee
62eaabfe88 Introduce hit_timing for combo_melee 
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
 2021-06-12 14:10:19 +03:00
Marcel
cf2bdb20f1 Merge branch 'xMAC94x/release_numbers' into 'master' 
Change the version number to 0.10

See merge request veloren/veloren!2428
 2021-06-12 08:55:34 +00:00
Marcel Märtens
4167621f5d Change the version number to 0.10 2021-06-12 10:14:07 +02:00
Forest Anderson
f578c56db7 Merge branch 'juliancoffee/small_fixes' into 'master' 
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
 2021-06-11 17:46:56 +00:00
juliancoffee
982e5986c3 revert bow to almost master values 2021-06-11 17:20:46 +03:00
juliancoffee
e63c21d29e Nerf recover duration for animal dashes 2021-06-11 16:18:59 +03:00
juliancoffee
11ded86a2b Make bow more snipy 2021-06-11 15:56:16 +03:00
juliancoffee
6c11aa80e0 adjust staff firebomb 2021-06-11 15:41:38 +03:00
Marcel
918229ff70 Merge branch 'merryck.wales-master-patch-32631' into 'master' 
Fix incorrect tooltip on Staff Damage skill - Update diary.rs

See merge request veloren/veloren!2421
 2021-06-11 11:59:10 +00:00
Cr0ss0vr
8e0891e3b1 Fix incorrect tooltip on Staff Damage skill - Update diary.rs 2021-06-11 11:59:09 +00:00
juliancoffee
25cbff68d3 remove meaningless variables 2021-06-11 11:44:48 +03:00
Marcel
8ab1b6fdd1 Merge branch 'zesterer/small-fixes' into 'master' 
Repaired common such that it works for plugin targets

See merge request veloren/veloren!2422
 2021-06-11 08:32:55 +00:00
Marcel
068ce2c665 Merge branch 'xMAC94x/fix_tracy' into 'master' 
fix tracy-server compilation via cargo tracy-server

See merge request veloren/veloren!2409
 2021-06-11 08:32:53 +00:00
Marcel
82c84e5440 Merge branch 'slippedfix' into 'master' 
Update simple_leather.ron

See merge request veloren/veloren!2419
 2021-06-11 08:32:50 +00:00
Justin Shipsey
7eda90b8f7 Update simple_leather.ron 2021-06-11 08:32:49 +00:00
Joshua Barretto
1b1287f407 Repaired common such that it works for plugin targets 2021-06-11 08:33:32 +01:00
Marcel
02dca65ded Merge branch 'zesterer/small-fixes' into 'master' 
Prevent creatures spawning in the ground

See merge request veloren/veloren!2418
 2021-06-11 07:20:49 +00:00
Joshua Barretto
358f9f268d Prevent creatures spawning in the ground 2021-06-11 07:09:58 +01:00
juliancoffee
2e5f868f31 Make bow zoom less intense 2021-06-11 01:46:32 +03:00
juliancoffee
edc4af8023 fix Wet debuff image 2021-06-11 01:45:02 +03:00
juliancoffee
a5e4a829eb Balanse fixes 
- Make bow charge time even smaller and reduce damage/enery reward a little
- Buff staff firebomb
- Nerf spear dash
- Longer recover time of Tidal shockwaves and less knockback
- Nerf Tidal bubbles
 2021-06-11 01:34:33 +03:00
juliancoffee
5084548b53 Add warnings about non-existent items in /kit 2021-06-11 01:33:47 +03:00
juliancoffee
4f49012aca add new armour and legendary weapons to /kit 2021-06-11 01:33:18 +03:00
juliancoffee
fb1e37154d add temporary "middle" skill preset 2021-06-11 01:31:46 +03:00
juliancoffee
cba8e15797 Split consumables to different tables in trading 2021-06-10 16:04:59 +03:00
João Capucho
cc566abe5c
Update wgpu and check for best swap chain format 2021-06-09 21:15:37 +01:00
Marcel
3dafc2c5b5 Merge branch 'jvck10-master-patch-73738' into 'master' 
Small fixes to pt_br language.

See merge request veloren/veloren!2410
 2021-06-09 20:01:49 +00:00
Marcel
279731a9e1 Merge branch 'swilliams/more-collision-balancing' into 'master' 
Fixed biped_small and humanoid hitboxes

See merge request veloren/veloren!2411
 2021-06-09 15:44:00 +00:00
Marcel Märtens
005f528e25 fix tracy-server compilation via cargo tracy-server 2021-06-09 17:17:37 +02:00
João Victor Cardoso Kdouk
228d2f05a6 Small fixes to pt_br language. 2021-06-09 14:36:10 +00:00
Scott Williams
f336b0e2a8 Fixed biped_small and humanoid hitboxes 2021-06-09 15:23:10 +01:00
Marcel
f255f01ac0 Merge branch 'tygyh/Extract-get-duration-image-from-update' into 'master' 
Extract 'get_duration_image' function from 'update'

See merge request veloren/veloren!2407
 2021-06-09 14:08:38 +00:00
Marcel
8bc34dc962 Merge branch 'tygyh/Extract-create-new-text-from-update' into 'master' 
Tygyh/extract create new text from update

See merge request veloren/veloren!2408
 2021-06-09 14:08:34 +00:00
juliancoffee
057aa7fecf Move loot tables to entityconfigs 
* Moved all entities in dungeons to assets
 2021-06-09 15:37:04 +03:00
juliancoffee
a4cc1e24ee Move body to EntityConfig assets 
* currently works only for random and random_with, uses FromStr for
NpcKind
 2021-06-09 15:37:04 +03:00
juliancoffee
229b253a17 remove Mindflayer skillset 2021-06-09 15:37:04 +03:00
juliancoffee
0c9f05b8d1 Load skillsets from assets 
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
 2021-06-09 15:37:04 +03:00
juliancoffee
37af73b19e SkillSetBuilder pre-refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
c3a120c551 Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
45e5554ff5 Fix issue with villagers not having any item 2021-06-09 15:37:04 +03:00
juliancoffee
171c66d53d docs 2021-06-09 15:37:04 +03:00
juliancoffee
f5bf991eb0 Start to load EntityInfo from assets in dungeons 
* All enemies in dungeons are now specify loadout_config, name and
main_tool in assets
* Add more variance to the enemies names
 2021-06-09 15:37:04 +03:00
juliancoffee
5f3eaddb70 Split LodoutBuilder::build_loadout 
LoadoutBuilder::build_loadout is a function which has four parameters
and 3 of them are Option<>, and although fourth (body) isn't Option<>,
it's optional too because it is used only in some combinations of
another arguments.

Because these combinations produces quirky code flow, it will be better
to split it to different methods.

So we did following changes to remove it and rewrite code that was using it
to use better methods.

* Introduce LoadoutPreset as new LoadoutConfig, currently it's only used
in Summon ability, because SummonInfo uses Copy and we can't specify
String for specifying asset path for loadout.
Everything else is rewritten to use asset path to create loadouts.

* More builder methods for LoadoutBuilder.
Namely:
    - from_default which is used in server/src/cmd.rs in "/spawn" command.
    - with_default_equipment, with_default_maintool to use default
    loadout for specific body
    - with_preset to use LoadoutPreset

* Add new make_loadout field with `fn (loadout_builder, trading_info) -> loadout_builder`
to EntityInfo which allows to lazily construct loadout without
modifying LoadoutBuilder code

* Fix Merchants not having trade site
We had heuristic that if something has Merchant LoadoutConfig - it's
merchant, which can be false, especially if we create Merchant loadout
lazily
As side note, we do same check for Guards and it fails too.

Too fix it, we introduce new agent::Mark, which explicitly specifies
kind of agent for entity

* `LoadoutBuilder::build_loadout` was written in a such way that depending
on main_tool you will have different loadout. Turns out it was this
way only for Adlets though and this behaviour is reproduced by specifying
different loadouts directly in world code.
 2021-06-09 15:37:04 +03:00
juliancoffee
aad65c6159 Move traveler loadout declaration to asset 
* New loadout/world/traveler.ron file to specify traveler loadout
* LoadoutBuilder::with_asset_expect now can use passed rng to choose
items
 2021-06-09 15:37:03 +03:00
juliancoffee
e153cbe20e Rename LoadoutBuilder::apply_asset_expect 
to LoadoutBuilder::with_asset_expect
 2021-06-09 15:37:03 +03:00