Marcel
2b98127119
Merge branch 'patch-2' into 'master'
...
Update recompile.yml
See merge request veloren/veloren!1354
2020-09-03 07:55:54 +00:00
Capucho
5fd0e0a5b7
Added commands to basic mode
2020-09-03 09:05:15 +02:00
Capucho
6e24ff31ee
Fix all the problems with the tui
2020-09-03 09:04:42 +02:00
Joshua Yanovski
45030530b8
Update recompile.yml
2020-09-02 18:33:36 +00:00
termac
f05c120fab
Fix bug collecting items into full inventory
...
When the inventory is full and a player tries to reclaim an item from a
block, collecting always failed. If the item is stackable and already
present inside the inventory it should be collected though.
The collect case now behaves more like the pickup case, using
inventory's 'push' method to add the item and implicitly check for
available space.
2020-09-02 12:47:56 +02:00
Marcel
5d1f7d7a0a
Merge branch 'update-zh' into 'master'
...
update the Simplified Chinese translation
See merge request veloren/veloren!1350
2020-09-02 08:07:28 +00:00
law4x
87c8351890
update the Simplified Chinese translation
2020-09-02 08:07:27 +00:00
Marcel Märtens
3ee7bb5a98
tmp increase TIMEOUT from 20s to 40s.
...
This will not solve the StreamClose, but make it less annoying for some.
2020-09-01 23:16:11 +02:00
Marcel Märtens
36350a08b1
clean shutdown and do a full frame all 10 ticks. also increase polling time to 100ms and dont poll while drawing but afterwards
2020-09-01 23:03:50 +02:00
Marcel Märtens
f5c8f3fcf8
move tui in multiple files
2020-09-01 23:03:48 +02:00
Capucho
337860de93
Fix lack of scrolling
2020-09-01 23:03:47 +02:00
Capucho
8b1ba19b4f
Fix panic when window is too small
2020-09-01 23:03:45 +02:00
Capucho
752b2510ee
Fix resize issue
2020-09-01 23:03:43 +02:00
Capucho
aa676a4327
Updated the Dockerfile
2020-09-01 23:03:42 +02:00
Capucho
8fd052768e
Fix typo and clippy warnings
2020-09-01 23:03:40 +02:00
Capucho
332cb20df1
Added flags to toggle the tui
2020-09-01 23:03:38 +02:00
Capucho
bf8e455839
Make it easier to add commands and added the help command
2020-09-01 23:03:36 +02:00
Capucho
a893ccc228
Fix the offsetting problem after using the cli
2020-09-01 23:03:35 +02:00
Capucho
6a83da0dfd
Force migration text trough tracing
2020-09-01 23:03:33 +02:00
Capucho
83ff13a035
Coloring done very badly
2020-09-01 23:03:32 +02:00
Capucho
a2d70e6ff6
Escape ansi sequences
2020-09-01 23:03:31 +02:00
Capucho
c399afa7c5
Made the server cli great
2020-09-01 23:03:29 +02:00
Joshua Barretto
d8da10f1ff
Merge branch 'scott-c/fix-missing-firework-particles' into 'master'
...
fix missing firework/bomb particle rng & adjust firework colors
Closes #713
See merge request veloren/veloren!1351
2020-09-01 14:01:13 +00:00
scott-c
69e0bf2023
fix missing firework particle rng & adjust firework colors
2020-09-01 20:33:17 +08:00
Joshua Yanovski
4eeb131f4b
Create (segment, offset) just once per figure.
2020-09-01 11:23:19 +02:00
Joshua Yanovski
7e6975d881
Merge branch 'sharp/typed-body' into 'master'
...
Further generalize the typed module.
See merge request veloren/veloren!1346
2020-09-01 06:29:35 +00:00
Lippy13
7c33e7d714
Work around an issue with Intel Gen7/7.5 GPUs where matrices default to being row major if they are not directly assigned to a matrix that has a column major layout.
2020-08-31 19:50:45 +01:00
Lippy13
7efa3373f6
Fix crash on Intel Gen7 GPUs caused by having two return statements in the same branch of code.
2020-08-31 19:49:01 +01:00
Songtronix
5f350b2bea
Merge branch 'songtronix/fix-assets-finding' into 'master'
...
fix: locate assets in hopefully all cases
Closes #727 and #745
See merge request veloren/veloren!1347
2020-08-31 18:23:54 +00:00
Monty Marz
8c3a448db5
Merge branch 'pfau/fix_orcs-add_inline_tweak' into 'master'
...
Orcs adjustment and inline_tweak crate
See merge request veloren/veloren!1348
2020-08-31 15:26:46 +00:00
Monty Marz
a6abda391f
orcs adjustment and inline_tweak crate
...
Adjust female orc headsize
add inline_tweak crate to voxygen and anim
format cargo.toml alphabetically
2020-08-31 15:26:46 +00:00
Songtronix
11730f2136
change(common): remove find_folder
2020-08-31 16:43:16 +02:00
Songtronix
abaf6ee53e
fix: locate assets in almost all cases
2020-08-31 10:25:45 +02:00
Joshua Yanovski
6f3d5da6f3
Further generalize the typed module.
...
This enables us to automatically create configuration formats from enums
or structs. For enums, we create a structure with a field for each
case, representing a pattern match; the configuration format can then
enter a different expression for each case. For structs, we create an
enum with a variant for each field, representing projecting by that
field; the configuration format selects the field to project from, and
then can write a further expression on that field (for instance, it can
perform another pattern match).
So far we don't actually have anything that *uses* this functionality;
I decided to finish it for the purpose of specifying a default
lantern offset, only to discover that we already return a lantern offset
from the animation crate. So I fixed it there instead.
2020-08-31 05:59:44 +02:00
Marcel
62427cb01f
Merge branch 'vzikl/add-zh-translation' into 'master'
...
Update to OpenSource Font - WQY-ZenHei & add zh_CN
See merge request veloren/veloren!1304
2020-08-30 20:40:01 +00:00
VZIKL
cc55e71a5d
Update to OpenSource Font - WQY-ZenHei & add zh_CN
2020-08-30 20:40:01 +00:00
Marcel
9f75e35d84
Merge branch 'easier_logging' into 'master'
...
make logging easier and not as verbose on windows
See merge request veloren/veloren!1344
2020-08-30 18:02:37 +00:00
Marcel
b6c07718dc
make logging easier and not as verbose on windows
2020-08-30 18:02:37 +00:00
Imbris
67d046c846
Merge branch 'termac/hotbar_hotkey_fix' into 'master'
...
small fix for handling hotbar hotkeys (fixes #687 )
Closes #687
See merge request veloren/veloren!1343
2020-08-29 20:32:07 +00:00
termac
76df71ed3d
small fix for handling hotbar hotkeys ( fixes #687 )
...
Send an 'ChangeHotbarState' event when a hotbar slot is assigned via
hotkey in the inventory.
2020-08-29 18:38:55 +02:00
Monty Marz
92d9a51071
Merge branch 'black-silence/fix-de-translation' into 'master'
...
fix several DE translations
See merge request veloren/veloren!1341
2020-08-28 19:42:23 +00:00
black silence
2587a38f6f
fix several DE translations
2020-08-28 20:37:28 +02:00
Monty Marz
6389df7685
Merge branch 'fix_text_overlap' into 'master'
...
Fix overlapping text
See merge request veloren/veloren!1340
2020-08-28 15:04:57 +00:00
Monty Marz
7041e490ce
fix overlapping text
2020-08-28 16:10:50 +02:00
Joshua Yanovski
e59395bfe0
Merge branch 'sharp/sprite-config' into 'master'
...
Move sprite data to a config file.
See merge request veloren/veloren!1324
2020-08-28 08:30:50 +00:00
Joshua Yanovski
8be3648a4d
Move sprite data to a config file.
2020-08-28 09:23:43 +02:00
Joshua Yanovski
3622c11a8c
Merge branch 'sharp/figure-mesh-background' into 'master'
...
Move figure meshing to a background thread.
See merge request veloren/veloren!1339
2020-08-28 04:14:54 +00:00
Joshua Yanovski
3a96b73b2c
Move figure meshing to a background thread.
2020-08-28 05:25:31 +02:00
Marcel
1aec2ac6ef
Merge branch 'xMAC94x/fix_non_metrics_compile' into 'master'
...
fix compiling without metrics
See merge request veloren/veloren!1338
2020-08-27 08:19:52 +00:00
Marcel Märtens
a7b7ae3a2c
fix compiling with metrics
2020-08-27 09:35:06 +02:00
