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
3,623 Commits 151 Branches 18 Tags 2.1 GiB
9595eca0be
Commit Graph

3623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songtronix
9595eca0be fix(ci): allow coverage test to fail temporarily 
#538
 2020-04-23 14:47:21 +02:00
Marcel
dc197ce0ab Merge branch 'songtronix/fix-toolchain' into 'master' 
fix toolchain

See merge request veloren/veloren!930
 2020-04-21 20:04:55 +00:00
Songtronix
4028231d3c fix toolchain 2020-04-21 20:04:55 +00:00
Marcel
62ef327a0b Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2020-04-17`

See merge request veloren/veloren!919
 2020-04-18 15:07:31 +00:00
Marcel
2849861b1c update toolchain to nightly-2020-04-17 2020-04-18 15:07:13 +00:00
Monty Marz
e41703149b Merge branch 'pfau/fix_palms' into 'master' 
Wrong model fix for fruit trees

See merge request veloren/veloren!915
 2020-04-16 13:55:15 +00:00
Pfauenauge90
e32b761a62 insert correct model, change offset accordingly 2020-04-16 15:04:02 +02:00
Songtronix
b7f52a0a3b Merge branch 'update-appdata-files' into 'master' 
Update AppData manifest to conform guidelines

See merge request veloren/veloren!907
 2020-04-16 05:25:04 +00:00
Artem
9451fbc6e4 Update AppData manifest to conform guidelines 
https://github.com/flathub/flathub/wiki/AppData-Guidelines

Fix desktop file
 2020-04-16 05:25:04 +00:00
Marcel
96b732adea Merge branch 'docker-compose-update' into 'master' 
Update docker-compose.yml with the same as in production by official server

See merge request veloren/veloren!914
 2020-04-15 12:50:13 +00:00
Marcel
496419fd98 Update docker-compose.yml with the same as in production by official server 2020-04-15 12:49:33 +00:00
Songtronix
0d9945437f Merge branch 'songtronix/fix-532' into 'master' 
rename server settings file to `server_settings.ron`

Closes #532

See merge request veloren/veloren!913
 2020-04-15 12:48:15 +00:00
Songtronix
42f3a18c9e change(server): rename settings file to server_settings.ron 2020-04-15 13:31:16 +02:00
Songtronix
c9c169e486 Merge branch 'ElXreno/proper-assets-path-finding' into 'master' 
Find assets by using other environment variables

See merge request veloren/veloren!912
 2020-04-15 10:38:00 +00:00
Imbris
aab06794c4 Merge branch 'olexorus/fix_serverlist_panic' into 'master' 
Fix panic if default server index is out of bounds

See merge request veloren/veloren!909
 2020-04-14 17:06:51 +00:00
Olexorus
8c54b07fc0 Fix panic if default server index is out of bounds 2020-04-14 18:32:01 +02:00
Monty Marz
c26fb1d5ee Merge branch 'imbris/slots' into 'master' 
Slots! Dragging, right-click to use, capes, lanterns, unequipping.

Closes #526

See merge request veloren/veloren!904
 2020-04-12 20:20:02 +00:00
Pfauenauge
51f5f9fee7 resolved comments 2020-04-12 21:45:19 +02:00
Imbris
75dc6bd455 Clarify todo comment 2020-04-12 15:35:43 -04:00
Imbris
2069c1aca4 fix example 2020-04-12 13:42:09 -04:00
ElXreno
af5476b672
Find assets by using other environment variables 
By using HOME, XDG_DATA_HOME and XDG_DATA_DIRS we can
build potentially proper paths for finding assets folder.
 2020-04-12 20:25:29 +03:00
Pfauenauge90
728158d27d cleanup, slot background, scaling 2020-04-12 18:41:10 +02:00
Imbris
9bf7d7b15c Changelog and small fix 2020-04-12 18:41:09 +02:00
Imbris
254ada45a0 Add backgound to hotbar slots 2020-04-12 18:41:09 +02:00
Imbris
f66681793b Move item amount text to bottom right 2020-04-12 18:41:09 +02:00
Imbris
4a90c1cbea tooltips for the skillbar 2020-04-12 18:41:08 +02:00
jshipsey
0d77be193a lantern visuals, random cape flutter 2020-04-12 18:41:08 +02:00
Imbris
b5f1f5ebcc Lantern tweaks, remove unused bones 2020-04-12 18:41:07 +02:00
Imbris
9c0dc15af9 Basic hotbar functionality 2020-04-12 18:41:07 +02:00
Imbris
fa18a51613 Add right click to use, latern is not armor tweaks 2020-04-12 18:41:07 +02:00
Imbris
215d7f2803 Fix selecting and remove amount text when dragging 2020-04-12 18:41:06 +02:00
Imbris
330b7f3c93 Enable unequipping as well as equipping to specific slots 2020-04-12 18:41:06 +02:00
Imbris
a994449f42 rework slot trait 2020-04-12 18:41:05 +02:00
jshipsey
70dbf99cae cape work 2020-04-12 18:41:05 +02:00
Pfauenauge90
b86dca065b Update de_DE.ron 2020-04-12 18:41:04 +02:00
Pfauenauge90
59e6be851e translation fix 2020-04-12 18:41:04 +02:00
Pfauenauge90
735a3dbe24 hotbar text shadows 2020-04-12 18:41:04 +02:00
Pfauenauge90
249746abd2 7 dwarf accessories 2020-04-12 18:41:03 +02:00
Pfauenauge90
b2d04adc78 hotbar keybindings 2020-04-12 18:41:03 +02:00
Pfauenauge90
1c022d359b fmt 2020-04-12 18:41:02 +02:00
Pfauenauge90
59766b4cb6 starter chest, removed unused key commands 2020-04-12 18:41:02 +02:00
Pfauenauge
2d2bf8b6f8 bag tooltips translation entries 2020-04-12 18:41:01 +02:00
Pfauenauge
8e73e5339e german translation update 2020-04-12 18:41:01 +02:00
Pfauenauge90
b98e411fd7 starter armor in char creation 2020-04-12 18:41:01 +02:00
Pfauenauge90
fb96d3cb54 fix 2020-04-12 18:41:00 +02:00
Pfauenauge90
086e09ff58 starter equip 2020-04-12 18:41:00 +02:00
Pfauenauge
cb3a1f8609 smarter code 2020-04-12 18:40:59 +02:00
Pfauenauge
a4553f3d18 fmt 2020-04-12 18:40:59 +02:00
Pfauenauge
2dec3002c2 png item images, fix map cursor 2020-04-12 18:40:59 +02:00
Pfauenauge90
03ede010fe item images 2020-04-12 18:40:58 +02:00