Marcel
1c582e1f5c
Merge branch 'xMAC94x/flakytests' into 'master'
...
redo slowjobs, fixed #1056
Closes #1056
See merge request veloren/veloren!2063
2021-06-13 16:10:09 +00:00
Marcel Märtens
e7b587eaa2
implement a simple roundrobin to assure if multiple are spawned the older one has prio, spelling
2021-06-13 17:42:28 +02:00
Marcel Märtens
c8262f5bec
redo slowjobs in order to have a try_run fn
2021-06-13 17:42:21 +02:00
Marcel Märtens
9506aacdbc
make test less flanky, try to avoid absolute comparisions and compare jobs relative.
2021-06-13 17:31:34 +02:00
K. Kisa
b744631662
Upload New File
2021-06-13 13:30:42 +00:00
K. Kisa
e8b3dbf72d
Полный перевод на русский язык
2021-06-13 13:24:57 +00:00
K. Kisa
1895ef1939
Не полный перевод навыков, исправлены оригинальные описания и названия.
2021-06-13 13:08:52 +00:00
Monty
fe86ef1e96
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
b9347332ed
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
137950330d
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
d54e7435df
Improved inventory swap
2021-06-12 19:06:39 +01:00
Avi Weinstock
c97797a87c
Don't apply e2e pushback during a forced movement character state.
2021-06-12 11:10:06 -04:00
juliancoffee
b5e1911930
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
840a093317
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
d291a71f79
Change the version number to 0.10
2021-06-12 10:14:07 +02:00
Forest Anderson
f8dae445aa
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
d122c2e9cb
revert bow to almost master values
2021-06-11 17:20:46 +03:00
juliancoffee
44cda79992
Nerf recover duration for animal dashes
2021-06-11 16:18:59 +03:00
juliancoffee
60068f161d
Make bow more snipy
2021-06-11 15:56:16 +03:00
juliancoffee
9a8ae64f4c
adjust staff firebomb
2021-06-11 15:41:38 +03:00
Marcel
8686f9c15e
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
351d206598
Fix incorrect tooltip on Staff Damage skill - Update diary.rs
2021-06-11 11:59:09 +00:00
juliancoffee
71e5c25aac
remove meaningless variables
2021-06-11 11:44:48 +03:00
Marcel
cbe53d1c81
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
cec2191df2
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
68cda3ea1c
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
01379ca6dc
Update simple_leather.ron
2021-06-11 08:32:49 +00:00
Joshua Barretto
2d58650f51
Repaired common such that it works for plugin targets
2021-06-11 08:33:32 +01:00
Marcel
f6503364a6
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
6dae58c8a6
Prevent creatures spawning in the ground
2021-06-11 07:09:58 +01:00
juliancoffee
193c961459
Make bow zoom less intense
2021-06-11 01:46:32 +03:00
juliancoffee
aa37bda44a
fix Wet debuff image
2021-06-11 01:45:02 +03:00
juliancoffee
0940fe6ef5
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
32e81f5d06
Add warnings about non-existent items in /kit
2021-06-11 01:33:47 +03:00
juliancoffee
2764dfbdc8
add new armour and legendary weapons to /kit
2021-06-11 01:33:18 +03:00
juliancoffee
67a03d9cd1
add temporary "middle" skill preset
2021-06-11 01:31:46 +03:00
juliancoffee
fb76c2a4c7
Split consumables to different tables in trading
2021-06-10 16:04:59 +03:00
João Capucho
40904130f6
Update wgpu and check for best swap chain format
2021-06-09 21:15:37 +01:00
Marcel
84a809df82
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
efe7b628b4
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
e9f3c3c2a3
fix tracy-server compilation via cargo tracy-server
2021-06-09 17:17:37 +02:00
João Victor Cardoso Kdouk
38ab1e20dc
Small fixes to pt_br language.
2021-06-09 14:36:10 +00:00
Scott Williams
3ac5f9a027
Fixed biped_small and humanoid hitboxes
2021-06-09 15:23:10 +01:00
Marcel
8792c18dea
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
326daaab7b
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
72bc681570
Move loot tables to entityconfigs
...
* Moved all entities in dungeons to assets
2021-06-09 15:37:04 +03:00
juliancoffee
14a99cd0e1
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
e6d7b70ee0
remove Mindflayer skillset
2021-06-09 15:37:04 +03:00
juliancoffee
f9575d7df0
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
1ff238037e
SkillSetBuilder pre-refactoring
2021-06-09 15:37:04 +03:00
