Imbris
|
36821e5575
|
Merge branch 'capucho/wgpu-format-fixes' into 'master'
Update wgpu and check for best swap chain format
See merge request veloren/veloren!2454
|
2021-06-16 01:24:05 +00:00 |
|
Snowram
|
1a073cb964
|
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
This reverts merge request !2457
|
2021-06-15 22:12:11 +00:00 |
|
Snowram
|
e927d835ce
|
Double the speed factor of pos interp
|
2021-06-15 22:11:57 +02:00 |
|
Imbris
|
bf9e5f6e11
|
Merge branch 'zakru/fix/1193' into 'master'
Avoid saving settings if maps are not updating
Closes #1193
See merge request veloren/veloren!2456
|
2021-06-15 19:55:14 +00:00 |
|
Imbris
|
4bd50bb768
|
Merge branch 'rodio014' into 'master'
bump rodio to 0.14
See merge request veloren/veloren!2443
|
2021-06-15 19:04:28 +00:00 |
|
Zakru
|
3c42eb3666
|
Fix settings not saving when zooming map with keys
|
2021-06-15 21:20:10 +03:00 |
|
Zakru
|
323b03e406
|
Avoid saving settings if maps are not updating
Fixes #1193
|
2021-06-15 21:19:52 +03:00 |
|
Snowram
|
4f835c3741
|
Truncates consumables value to the first decimal place
|
2021-06-15 19:36:20 +02:00 |
|
juliancoffee
|
3dfae1c664
|
Panic if can't parse file
|
2021-06-15 19:15:17 +03:00 |
|
Snowram
|
0c802077d7
|
Merge branch 'snowram/more-trolls' into 'master'
Add more trolls npcs, and roc npc with tornado attack
See merge request veloren/veloren!2384
|
2021-06-15 08:35:30 +00:00 |
|
Imbris
|
748b135446
|
Merge branch 'imbris/resize-tweaks' into 'master'
Resize related tweaks
See merge request veloren/veloren!2448
|
2021-06-15 07:53:12 +00:00 |
|
Snowram
|
e32c103e9a
|
Makes summon range inclusive
|
2021-06-15 09:49:13 +02:00 |
|
Avi Weinstock
|
a5ff4be601
|
Make tornado (and empty models in general) work on WGPU.
|
2021-06-15 09:49:13 +02:00 |
|
Snowram
|
aa62ad8bc0
|
Tornado summoning attack
|
2021-06-15 09:49:13 +02:00 |
|
Snowram
|
3df69ba11d
|
Add troll variants and roc npcs
|
2021-06-15 09:49:13 +02:00 |
|
Imbris
|
6f5eab4896
|
[iced renderer] Skip content processing if the clip intersection is zero sized or invalid
|
2021-06-15 02:02:10 -04:00 |
|
Imbris
|
4535de21cd
|
Fix trying to create a zero sized shadow texture when resizing window down to a small size
|
2021-06-15 01:53:00 -04:00 |
|
Samuel Keiffer
|
2218018177
|
Merge branch 'juliancoffee/swing_fix' into 'master'
Introduce hit_timing for combo_melee
See merge request veloren/veloren!2426
|
2021-06-15 02:38:23 +00:00 |
|
asumface
|
a63e839bfa
|
Bump rodio to 0.14
|
2021-06-14 22:04:23 +02:00 |
|
Avi Weinstock
|
3267765e85
|
Mitigate conrod widget id crash by disabling pickaxe icon in xp scroller.
|
2021-06-14 13:39:50 -04:00 |
|
Monty Marz
|
8466df5078
|
mining exp sct color and icon; add mining to skill_preset
|
2021-06-13 14:34:42 -04:00 |
|
Avi Weinstock
|
4bd989e2a5
|
Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange.
|
2021-06-13 14:34:42 -04:00 |
|
Monty Marz
|
c34fa59a08
|
icons and naming
|
2021-06-13 14:34:42 -04:00 |
|
Avi Weinstock
|
667e5eb510
|
Mining skill tree.
|
2021-06-13 14:34:42 -04: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 |
|
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 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 |
|
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 |
|
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 |
|
João Capucho
|
40904130f6
|
Update wgpu and check for best swap chain format
|
2021-06-09 21:15:37 +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 |
|
Dr. Dystopia
|
fc33e42c23
|
Extract 'create_new_text' function from 'update'
|
2021-06-09 13:35:41 +02:00 |
|
Dr. Dystopia
|
5e37995e7f
|
Extract 'get_duration_image' function from 'update'
|
2021-06-09 13:09:31 +02:00 |
|
jshipsey
|
7c1798d71a
|
small tweaks
t
|
2021-06-09 01:58:08 -04:00 |
|
juliancoffee
|
849ee4f18a
|
Fix find_root() search in case if .git isn't dir
|
2021-06-08 13:34:46 +03:00 |
|
Marcel
|
3520a3afed
|
Merge branch 'xMAC94x/hashbrown' into 'master'
switch to hashbrown 0.11 and specs 0.16.2
See merge request veloren/veloren!2390
|
2021-06-07 14:31:58 +00:00 |
|
Monty
|
7a0dd5ca10
|
3d icon shading
|
2021-06-07 14:27:49 +02:00 |
|
Marcel Märtens
|
4c29484f22
|
switch to hashbrown 0.11 and specs 0.16.2
|
2021-06-07 13:01:01 +02:00 |
|
Snowram
|
5728d08fce
|
Item tooltip refactor and fixed related to new stats
|
2021-06-07 11:06:32 +02:00 |
|
Sam
|
58bcf27105
|
Adressed comments on energy and armor functions.
|
2021-06-07 11:06:25 +02:00 |
|
Snowram
|
6ee751a9c6
|
Derive str from Material, better deserialization
|
2021-06-07 11:03:50 +02:00 |
|
jshipsey
|
0c550516a1
|
cave adjustments
|
2021-06-07 11:02:34 +02:00 |
|
jshipsey
|
1892554b21
|
comment addressing, cave tweaks
|
2021-06-07 11:01:46 +02:00 |
|
jshipsey
|
5883c8248e
|
tooltip work
|
2021-06-07 11:01:32 +02:00 |
|
jshipsey
|
63f6f313d0
|
migration
|
2021-06-07 11:01:04 +02:00 |
|
Snowram
|
afd43ba3d9
|
Split tags into material class and material
|
2021-06-07 11:00:57 +02:00 |
|
Snowram
|
44ba95a836
|
Add material and armor class tags
|
2021-06-07 11:00:31 +02:00 |
|