mdx97
03abe234ee
Fix diary toggling when escape menu is open.
2021-04-11 18:53:45 -05:00
Marcel
fd317417fb
Merge branch 'aweinstock/npcpotions' into 'master'
...
Give NPCs the ability to use potions.
See merge request veloren/veloren!2092
2021-04-11 23:47:30 +00:00
Avi Weinstock
ddf6a26577
Give NPCs the ability to use potions.
2021-04-11 23:47:29 +00:00
Marcel
5e7adc6767
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
4403cd71a5
Update and fix zh_CN
2021-04-11 22:55:59 +00:00
Marcel
eca27a30b5
Merge branch 'danielduel/PL-local' into 'master'
...
Add/Extend PL locale
See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
Joshua Yanovski
508dba61a1
Merge branch 'xMAC94x/deps' into 'master'
...
update deps
See merge request veloren/veloren!2095
2021-04-11 22:55:56 +00:00
Joshua Yanovski
2ee8fc378f
Merge branch 'vfoulon80/reorganize-assets' into 'master'
...
Reorganize and optimize assets
See merge request veloren/veloren!2099
2021-04-11 22:55:54 +00:00
hqurve
fd80a97f3d
Got rid of content setup macro
2021-04-11 17:36:02 -04:00
hqurve
690419ad90
Placed tabs in a loop and combined tab content chooser using macro
2021-04-11 17:36:02 -04:00
hqurve
469cb391d3
cleaned widget_ids
2021-04-11 17:36:02 -04:00
hqurve
04eea482ce
Moved settings window sections into separate files
2021-04-11 17:36:02 -04:00
hqurve
f2340105c1
Moved settings_window.rs to to settings_window/mod.rs
2021-04-11 17:36:02 -04:00
Imbris
f7f584fc49
Update the ci cache image with image from https://gitlab.com/veloren/veloren-docker-ci/-/merge_requests/38
2021-04-11 19:16:00 +00:00
BuildTools
c4294d968d
Add/modify Polish translations
2021-04-11 19:10:09 +02:00
Joshua Yanovski
dc4c02baad
Merge branch 'sharp/fix-silly-bug' into 'master'
...
Fix players being able to pick up other players.
See merge request veloren/veloren!2104
2021-04-11 16:34:06 +00:00
Vincent Foulon
a2e92c6715
add new loader + move some images
2021-04-11 16:35:25 +02:00
Snowram
52a53963ec
Lossless compression of UI assets
2021-04-11 16:35:25 +02:00
Vincent Foulon
de9d5b5e14
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
95f69fea36
remove unused images
2021-04-11 16:35:23 +02:00
Vincent Foulon
2097fbcacd
optimized all images
2021-04-11 16:35:23 +02:00
Vincent Foulon
7128c3d3f6
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Joshua Yanovski
90c3923119
Fix players being able to pick up other players.
2021-04-11 15:52:55 +02:00
Monty Marz
dab2a59e05
Merge branch 'pfau/map-things' into 'master'
...
UI fixes and more
See merge request veloren/veloren!2100
2021-04-11 03:49:47 +00:00
Monty Marz
6772e71aaa
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
8b034ed56f
Merge branch 'sharp/sprites-in-background' into 'master'
...
Mesh sprites in background.
See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
Marcel
db8c167797
Merge branch 'UMR1352/fix#1059' into 'master'
...
fix issue #1059 : Debug items should disappear when dropped
Closes #1059
See merge request veloren/veloren!2088
2021-04-10 17:41:43 +00:00
Marcel
adb18ef645
Merge branch 'mdx97/default-names' into 'master'
...
Use username as default character name in multiplayer character creation.
See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
mdx97
eb4fb33f45
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Joshua Yanovski
1bdf3b13a8
Mesh sprites in the background.
...
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case. It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.
To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites. Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
Marcel
99e494976d
Merge branch 'ccm7676/lang_bug_fix' into 'master'
...
fixed the Select a Language text on languages where it was broken
See merge request veloren/veloren!2089
2021-04-10 15:47:28 +00:00
Marcel
e6683bb764
Merge branch 'juliancoffee/uk_UA-localizaion' into 'master'
...
Update localization files for Ukrainian
See merge request veloren/veloren!2090
2021-04-10 14:54:13 +00:00
Illia Denysenko
4717ad25a8
Update localization files for Ukrainian
2021-04-10 14:54:12 +00:00
Marcel
12c3ee440e
Merge branch 'MigraineX/update-es-ES' into 'master'
...
Updated the Spanish (ES) translation
See merge request veloren/veloren!2094
2021-04-10 14:20:40 +00:00
Marcel Märtens
655a35d128
update deps
2021-04-10 15:53:00 +02:00
MigraineX
07fd6f16f8
Updated the Spanish (ES) translation
2021-04-10 14:31:57 +02:00
Joshua Yanovski
d66b165ffe
Merge branch 'sharp/remove-panics' into 'master'
...
Remove panics and unwraps, part 1.
See merge request veloren/veloren!2087
2021-04-10 10:10:01 +00:00
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Carl Marino
d2151ad76c
fixed the Select a Language text on languages where it was broken
2021-04-09 18:39:53 +02:00
Enrico Marconi
4c5de60d0d
fix issue #1059 : Debug items should disappear when dropped
2021-04-09 13:46:43 +02:00
Marcel
90aa671e42
Merge branch 'xMAC94x/logspam' into 'master'
...
remove spamming of the logs
See merge request veloren/veloren!2086
2021-04-09 01:06:23 +00:00
Marcel
f40e1db384
Merge branch 'xMAC94x/network_atomic' into 'master'
...
change some Ordering::Relaxed to Ordering::SeqCst when we do not want to have...
See merge request veloren/veloren!2083
2021-04-08 22:39:19 +00:00
Marcel Märtens
1a9425526b
remove spamming of the logs
2021-04-08 23:55:13 +02:00
Imbris
0eecc61ddf
Merge branch 'vfoulon80/behavior-component' into 'master'
...
New Component: Behavior
See merge request veloren/veloren!2033
2021-04-08 19:16:28 +00:00
Vincent Foulon
d80db38bc9
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
Vincent Foulon
bc1797a240
Address comments
2021-04-08 18:33:00 +02:00
Joshua Barretto
6656f1e4af
Merge branch 'desttinghim/rtsim-path-following' into 'master'
...
RtSim pathfinding improvements
See merge request veloren/veloren!2013
2021-04-08 13:39:06 +00:00
Louis Pearson
4c9eede9fd
Document Travel enum
2021-04-08 05:40:56 -06:00
