Marcel
|
3753406eeb
|
Merge branch 'aweinstock/fast-stacking' into 'master'
Allow fast stacking into and out of a trade with {ctrl,shift} click.
See merge request veloren/veloren!2036
|
2021-03-31 08:34:18 +00:00 |
|
Avi Weinstock
|
0122dca3c3
|
Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
|
2021-03-30 18:39:10 -04:00 |
|
Marcel
|
aafdc209d3
|
Merge branch 'xMAC94x/code_reduction' into 'master'
move tracing code to own crate
See merge request veloren/veloren!2026
|
2021-03-30 16:21:39 +00:00 |
|
Marcel Märtens
|
ccb78eeb5c
|
move tracing code to own crate
|
2021-03-30 16:35:36 +02:00 |
|
Joshua Barretto
|
3c19713e63
|
Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites
See merge request veloren/veloren!2034
|
2021-03-30 11:41:14 +00:00 |
|
Marcel
|
895de16dd6
|
Merge branch 'james/fix-merchant-wander' into 'master'
Fix merchant wandering
See merge request veloren/veloren!2035
|
2021-03-30 10:52:42 +00:00 |
|
Marcel
|
5ccbfba8fe
|
Merge branch 'xMAC94x/terrainoptimisation' into 'master'
if more than 1 player is in the area of a newly created chunk, skip additional copies
See merge request veloren/veloren!2030
|
2021-03-30 08:27:13 +00:00 |
|
Snowram
|
4128f7fe45
|
Merge branch 'snowram/new-weapons-fix' into 'master'
Fix a staff icon, some offset fixes, lower wolf spawn rate
See merge request veloren/veloren!2025
|
2021-03-30 01:04:37 +00:00 |
|
James Melkonian
|
8e522596a5
|
Fixed merchant wandering
|
2021-03-29 17:27:56 -07:00 |
|
Joshua Barretto
|
92afdaf423
|
Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements
See merge request veloren/veloren!2032
|
2021-03-30 00:16:45 +00:00 |
|
Joshua Barretto
|
bed863c50c
|
Added indicator text to terrain sprites
|
2021-03-30 01:04:23 +01:00 |
|
Snowram
|
606dd64741
|
Fix a staff icon, some offset fixes, lower wolf spawn rate
|
2021-03-30 00:27:03 +02:00 |
|
Samuel Keiffer
|
12ec46c572
|
Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.
See merge request veloren/veloren!2031
|
2021-03-29 21:05:49 +00:00 |
|
Joshua Barretto
|
ead861e509
|
Added patch for sticky hitboxes
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
85237c7a32
|
Fixed training dummy hitbox
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
8f3233365d
|
Improved hit particles
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
b0acbda236
|
Improved archery with feedback sfx and particles
|
2021-03-29 21:52:04 +01:00 |
|
Snowram
|
88f99986af
|
Merge branch 'snowram/items-infos' into 'master'
Snowram/items infos
See merge request veloren/veloren!1956
|
2021-03-29 20:16:35 +00:00 |
|
Sam
|
92973a470c
|
Made entity spawn room check more intuitive to understand
|
2021-03-29 13:05:04 -04:00 |
|
Snowram
|
6adaac8106
|
Addresses comments
|
2021-03-29 18:35:12 +02:00 |
|
Snowram
|
b8ac90d049
|
Changelog, cleanup, clippy
|
2021-03-29 18:35:10 +02:00 |
|
Snowram
|
5b99b7ca18
|
Skillbar uses item tooltip
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
508e35ca17
|
Add several new i18n lines
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
d1e734b9b1
|
Tooltip now use ItemDesc instead of Item
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
2c09180189
|
Set the item tooltip for every bag slots
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
b7dd2d6685
|
Use a dummy item for the new() function
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
955008c3c1
|
Kinda working tooltip height but not really
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
0405f04d53
|
More item tooltip UI layout
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
aa71dcb9c7
|
Make the new tooltip item specific
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
4786f84afd
|
New tooltip
|
2021-03-29 18:34:45 +02:00 |
|
Marcel
|
88cdd24847
|
Merge branch 'vfoulon80/dialogues' into 'master'
Implement a basic dialogue system
See merge request veloren/veloren!1986
|
2021-03-29 14:47:43 +00:00 |
|
Vincent Foulon
|
a35fa19409
|
Implement a basic dialogue system
|
2021-03-29 14:47:42 +00:00 |
|
Sam
|
71ba9b6a54
|
Mindflayer balance tweaks.
|
2021-03-29 10:44:46 -04:00 |
|
Marcel
|
206efcfc3a
|
Merge branch 'capucho/cpal-update' into 'master'
Update cpal
See merge request veloren/veloren!2029
|
2021-03-29 12:02:54 +00:00 |
|
João Capucho
|
3445ec2820
|
Update cpal
Fixes the alsa distortion in some configs
|
2021-03-29 11:33:27 +01:00 |
|
Marcel Märtens
|
fdd1eac6ed
|
if more than 1 player is in the area of a newly created chunk, skip additional copies
|
2021-03-29 12:21:07 +02:00 |
|
Marcel
|
b0376c690f
|
Merge branch 'xMAC94x/voxygen_panic' into 'master'
do a clear teardown of tokio runtime
See merge request veloren/veloren!2028
|
2021-03-29 10:02:09 +00:00 |
|
Marcel
|
3f10d003f9
|
Merge branch 'xMAC94x/dependencies' into 'master'
update dependencies and fix audio issues
Closes #1005, #1004, #816, #807, #1025, #1029, #1017, #1020, #1033, and #1027
See merge request veloren/veloren!2027
|
2021-03-29 09:18:46 +00:00 |
|
Marcel Märtens
|
e7452aa7ab
|
do a clear teardown of tokio runtime
|
2021-03-29 10:34:33 +02:00 |
|
Marcel Märtens
|
2907850ffe
|
update dependencies and fix audio issues
fixed #1027
fixed #1033
fixed #1020
fixed #1017
fixed #1029
fixed #1025
fixed #807
fixed #816
fixed #1004
fixed #1005
|
2021-03-29 09:45:00 +02:00 |
|
Imbris
|
9df3004843
|
Merge branch 'sam/fix' into 'master'
Fix emerald sceptre. Remove duplicate asset.
See merge request veloren/veloren!2023
|
2021-03-29 01:21:37 +00:00 |
|
Sam
|
f6e4626887
|
Fix emerald sceptre. Remove duplicate asset.
|
2021-03-28 21:19:01 -04:00 |
|
Snowram
|
c8e191e138
|
Merge branch 'snowram/new-scepters-starves' into 'master'
Add new batch of starves and scepter (by Gemu)
See merge request veloren/veloren!2022
|
2021-03-29 00:08:19 +00:00 |
|
Snowram
|
5295894105
|
Add new batch of starves and scepter (by Gemu)
|
2021-03-29 01:27:55 +02:00 |
|
Imbris
|
813d9fded3
|
Merge branch 'imbris/no-increments' into 'master'
Turn off incremental compilation to avoid fingerprints bug
See merge request veloren/veloren!2021
|
2021-03-28 20:56:00 +00:00 |
|
Joshua Barretto
|
75944d19eb
|
Merge branch 'treeco/less-horrible-spawn' into 'master'
Less horrible spawn
See merge request veloren/veloren!2020
|
2021-03-28 20:15:23 +00:00 |
|
Marcel
|
b2f6e3bdc7
|
Merge branch 'xMAC94x/fearless_concurency_terrainmsg' into 'master'
make msg::terrain parallel via rayon, we parallelize over the number of...
See merge request veloren/veloren!2019
|
2021-03-28 20:05:01 +00:00 |
|
Imbris
|
1a7fc900e8
|
Turn off incremental compilation to avoid fingerprints bug
|
2021-03-28 15:49:58 -04:00 |
|
Marcel
|
c131407a91
|
Merge branch 'rodio_panicfix' into 'master'
display error when rodio panic is fixed
See merge request veloren/veloren!2018
|
2021-03-28 19:16:11 +00:00 |
|
Treeco
|
eb7122e8e9
|
Less horrible spawn
|
2021-03-28 20:12:27 +01:00 |
|