Marcel Märtens
|
7afa77a06f
|
move tracing code to own crate
|
2021-03-30 16:35:36 +02:00 |
|
Joshua Barretto
|
bb88d42295
|
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
|
b6481e759d
|
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
|
5e9bd564da
|
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
|
f5bd61a683
|
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
|
c91a2e0d28
|
Fixed merchant wandering
|
2021-03-29 17:27:56 -07:00 |
|
Joshua Barretto
|
5cc6061606
|
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
|
97e5c26838
|
Added indicator text to terrain sprites
|
2021-03-30 01:04:23 +01:00 |
|
Snowram
|
95924315fb
|
Fix a staff icon, some offset fixes, lower wolf spawn rate
|
2021-03-30 00:27:03 +02:00 |
|
Samuel Keiffer
|
c978386d40
|
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
|
286f6823b9
|
Added patch for sticky hitboxes
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
6ca8cd9bb2
|
Fixed training dummy hitbox
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
8ecc0d5231
|
Improved hit particles
|
2021-03-29 21:52:05 +01:00 |
|
Joshua Barretto
|
6f72e53295
|
Improved archery with feedback sfx and particles
|
2021-03-29 21:52:04 +01:00 |
|
Snowram
|
5526dfa4fc
|
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
|
699f992774
|
Made entity spawn room check more intuitive to understand
|
2021-03-29 13:05:04 -04:00 |
|
Snowram
|
843f295eef
|
Addresses comments
|
2021-03-29 18:35:12 +02:00 |
|
Snowram
|
58b5e5fcee
|
Changelog, cleanup, clippy
|
2021-03-29 18:35:10 +02:00 |
|
Snowram
|
a7064fdbbd
|
Skillbar uses item tooltip
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
2fe2d91ab0
|
Add several new i18n lines
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
a5c125fdef
|
Tooltip now use ItemDesc instead of Item
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
6451caf15b
|
Set the item tooltip for every bag slots
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
f6715c8217
|
Use a dummy item for the new() function
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
a3f0589dcc
|
Kinda working tooltip height but not really
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
12c1e47b89
|
More item tooltip UI layout
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
71fabb1637
|
Make the new tooltip item specific
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
763cf70b70
|
New tooltip
|
2021-03-29 18:34:45 +02:00 |
|
Marcel
|
51a3048742
|
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
|
c4eca42fd8
|
Implement a basic dialogue system
|
2021-03-29 14:47:42 +00:00 |
|
Sam
|
d17edfcd64
|
Mindflayer balance tweaks.
|
2021-03-29 10:44:46 -04:00 |
|
Marcel
|
ea7934ec4b
|
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
|
449243539e
|
Update cpal
Fixes the alsa distortion in some configs
|
2021-03-29 11:33:27 +01:00 |
|
Marcel Märtens
|
06951048eb
|
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
|
df6abd4c9c
|
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
|
6ad0c48df3
|
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
|
1db475e1dc
|
do a clear teardown of tokio runtime
|
2021-03-29 10:34:33 +02:00 |
|
Marcel Märtens
|
9702d1c835
|
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
|
1fb4376b74
|
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
|
f2f2c41f86
|
Fix emerald sceptre. Remove duplicate asset.
|
2021-03-28 21:19:01 -04:00 |
|
Snowram
|
a1067a2ddb
|
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
|
4b95401f7c
|
Add new batch of starves and scepter (by Gemu)
|
2021-03-29 01:27:55 +02:00 |
|
Imbris
|
e010b00db0
|
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
|
beea24ef2e
|
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
|
e01c3dec05
|
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
|
89a2786bbf
|
Turn off incremental compilation to avoid fingerprints bug
|
2021-03-28 15:49:58 -04:00 |
|
Marcel
|
7cc4f2472f
|
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
|
dfbfd25934
|
Less horrible spawn
|
2021-03-28 20:12:27 +01:00 |
|
Marcel Märtens
|
063d57b60c
|
make msg::terrain parallel via rayon, we parallelize over the number of clients, so this is a change servers with more than 1 player profit from.
|
2021-03-28 21:08:40 +02:00 |
|
Marcel Märtens
|
ac9734bee5
|
display error when rodio panic is fixed
|
2021-03-28 20:40:07 +02:00 |
|
Joshua Barretto
|
e4b5f02df2
|
Merge branch 'treeco/new-map' into 'master'
A new map and clouds
See merge request veloren/veloren!2007
|
2021-03-28 18:32:20 +00:00 |
|