Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,971 Commits 151 Branches 18 Tags
Commit Graph

4971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty Marz
492f69ec72 Merge branch 'fix_dummy_cmd' into 'master' 
/dummy -> admin command

See merge request veloren/veloren!1363
 2020-09-05 15:13:36 +00:00
Monty Marz
f5c2d8e73d make dummy cmd an admin cmd to avoid exp cheesing and entity spamming 2020-09-05 16:12:35 +02:00
Marcel
e47c8c2c93 Merge branch 'snowram/issue-622' into 'master' 
Add 1st and 2nd item of inventory in hotbar

See merge request veloren/veloren!1314
 2020-09-05 08:45:21 +00:00
Imbris
f8c5877144 Merge branch 'termac/inventory_collect_when_full_fix' into 'master' 
Fix bug collecting items into full inventory

See merge request veloren/veloren!1333
 2020-09-05 06:51:22 +00:00
Imbris
ad31f48f5e Merge branch 'sharp/default-shadows-real' into 'master' 
Make shadow maps the default.

See merge request veloren/veloren!1361
 2020-09-05 05:47:21 +00:00
Joshua Yanovski
e67a7a92fe Merge branch 'sharp/default-shadows' into 'master' 
Create (segment, offset) just once per figure.

See merge request veloren/veloren!1360
 2020-09-04 15:54:55 +00:00
Joshua Yanovski
90ae22acaf Make shadow maps the default. 2020-09-04 16:41:08 +02:00
Monty Marz
7f9655e2b8 Merge branch 'fix_invite_NPCs' into 'master' 
Make npcs decline invites until we have a better recruitment system

See merge request veloren/veloren!1358
 2020-09-03 23:49:32 +00:00
Monty Marz
b7adc944d4 made npcs decline invites until we have a better recruitment system 2020-09-04 00:46:32 +02:00
Marcel
995e4a9df1 Merge branch 'intel-gpu-fix' into 'master' 
Fix a crash and model/shadow issues on Intel Gen7/7.5 GPUs.

See merge request veloren/veloren!1349
 2020-09-03 09:11:19 +00:00
Marcel
7d333299f2 Merge branch 'capucho/spicy-cli' into 'master' 
Server cli revamp

See merge request veloren/veloren!1237
 2020-09-03 08:27:08 +00:00
Marcel
c489df8755 Merge branch 'patch-2' into 'master' 
Update recompile.yml

See merge request veloren/veloren!1354
 2020-09-03 07:55:54 +00:00
Capucho
b892d71c73 Added commands to basic mode 2020-09-03 09:05:15 +02:00
Capucho
f7951d352b Fix all the problems with the tui 2020-09-03 09:04:42 +02:00
Joshua Yanovski
c7d62a5818 Update recompile.yml 2020-09-02 18:33:36 +00:00
termac
a30e4de4f3 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
466d5cc450 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
5e624456bb update the Simplified Chinese translation 2020-09-02 08:07:27 +00:00
Marcel Märtens
ee89afa76a 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
6ca4f31a9e move tui in multiple files 2020-09-01 23:03:48 +02:00
Capucho
848dd32755 Fix lack of scrolling 2020-09-01 23:03:47 +02:00
Capucho
c80295e10a Fix panic when window is too small 2020-09-01 23:03:45 +02:00
Capucho
6a344c6eea Fix resize issue 2020-09-01 23:03:43 +02:00
Capucho
063146f99d Updated the Dockerfile 2020-09-01 23:03:42 +02:00
Capucho
6fc992f027 Fix typo and clippy warnings 2020-09-01 23:03:40 +02:00
Capucho
d3a2a20d63 Added flags to toggle the tui 2020-09-01 23:03:38 +02:00
Capucho
47b25b35b1 Make it easier to add commands and added the help command 2020-09-01 23:03:36 +02:00
Capucho
3d9eee6190 Fix the offsetting problem after using the cli 2020-09-01 23:03:35 +02:00
Capucho
459eef4820 Force migration text trough tracing 2020-09-01 23:03:33 +02:00
Capucho
278d4cc193 Coloring done very badly 2020-09-01 23:03:32 +02:00
Capucho
2aa82b6096 Escape ansi sequences 2020-09-01 23:03:31 +02:00
Capucho
b2b33741c0 Made the server cli great 2020-09-01 23:03:29 +02:00
Joshua Barretto
4bd1d0ed91 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
1964779355 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Joshua Yanovski
29927c22f8 Create (segment, offset) just once per figure. 2020-09-01 11:23:19 +02:00
Joshua Yanovski
126a3d6c54 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
bcef507bd9 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
3f5a9b9fce 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
685fcb6664 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
729910232d 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
950baf68fc 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
af13a4161a change(common): remove find_folder 2020-08-31 16:43:16 +02:00
Songtronix
c4a3d8853f fix: locate assets in almost all cases 2020-08-31 10:25:45 +02:00
Joshua Yanovski
95b6d5e803 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
61d047d43f 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
e5760d3fd3 Update to OpenSource Font - WQY-ZenHei & add zh_CN 2020-08-30 20:40:01 +00:00
Marcel
439d1235eb 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
af10dc7661 make logging easier and not as verbose on windows 2020-08-30 18:02:37 +00:00
Imbris
125a9b9c30 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
2df76b5af4 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