Joshua Barretto
|
20b16d229c
|
Added river obstacle example
|
2020-04-23 18:19:40 +01:00 |
|
Joshua Barretto
|
944a37b848
|
Initial settlement generation work
|
2020-04-23 18:19:40 +01:00 |
|
Justin Shipsey
|
ecf0b90da2
|
Merge branch 'music' into 'master'
6 new music tracks
See merge request veloren/veloren!929
|
2020-04-23 17:16:46 +00:00 |
|
Justin Shipsey
|
7519e842e9
|
6 new music tracks
|
2020-04-23 17:16:45 +00:00 |
|
Marcel
|
e549910bd1
|
Merge branch 'songtronix/fix-ci' into 'master'
allow coverage test to fail temporarily
See merge request veloren/veloren!934
|
2020-04-23 13:18:27 +00:00 |
|
Songtronix
|
465d4d44ee
|
fix(ci): allow coverage test to fail temporarily
#538
|
2020-04-23 14:47:21 +02:00 |
|
Marcel
|
1ad3fb4e64
|
Merge branch 'songtronix/fix-toolchain' into 'master'
fix toolchain
See merge request veloren/veloren!930
|
2020-04-21 20:04:55 +00:00 |
|
Songtronix
|
26e27f4198
|
fix toolchain
|
2020-04-21 20:04:55 +00:00 |
|
Marcel
|
00f48a12c5
|
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
|
bf43770993
|
update toolchain to nightly-2020-04-17
|
2020-04-18 15:07:13 +00:00 |
|
Monty Marz
|
b4345c3246
|
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
|
5daa7d7b02
|
insert correct model, change offset accordingly
|
2020-04-16 15:04:02 +02:00 |
|
Songtronix
|
51126da127
|
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
|
4aa176daec
|
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
|
ce53be415e
|
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
|
32a8e6d304
|
Update docker-compose.yml with the same as in production by official server
|
2020-04-15 12:49:33 +00:00 |
|
Songtronix
|
d9220261ff
|
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
|
996eee0b42
|
change(server): rename settings file to server_settings.ron
|
2020-04-15 13:31:16 +02:00 |
|
Songtronix
|
866cfa3a8f
|
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
|
b3c54a9bbb
|
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
|
027d0f11da
|
Fix panic if default server index is out of bounds
|
2020-04-14 18:32:01 +02:00 |
|
Monty Marz
|
1dd1318ae0
|
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
|
25a9d5bf2f
|
resolved comments
|
2020-04-12 21:45:19 +02:00 |
|
Imbris
|
9ff816f006
|
Clarify todo comment
|
2020-04-12 15:35:43 -04:00 |
|
Imbris
|
b98680b9cb
|
fix example
|
2020-04-12 13:42:09 -04:00 |
|
ElXreno
|
4cdc1300a1
|
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
|
cee1c2f85b
|
cleanup, slot background, scaling
|
2020-04-12 18:41:10 +02:00 |
|
Imbris
|
053458c2e3
|
Changelog and small fix
|
2020-04-12 18:41:09 +02:00 |
|
Imbris
|
b9a66a93b7
|
Add backgound to hotbar slots
|
2020-04-12 18:41:09 +02:00 |
|
Imbris
|
c6b5570637
|
Move item amount text to bottom right
|
2020-04-12 18:41:09 +02:00 |
|
Imbris
|
cae5313127
|
tooltips for the skillbar
|
2020-04-12 18:41:08 +02:00 |
|
jshipsey
|
d7e605e658
|
lantern visuals, random cape flutter
|
2020-04-12 18:41:08 +02:00 |
|
Imbris
|
2c4c006396
|
Lantern tweaks, remove unused bones
|
2020-04-12 18:41:07 +02:00 |
|
Imbris
|
f81f91162d
|
Basic hotbar functionality
|
2020-04-12 18:41:07 +02:00 |
|
Imbris
|
77d13376d3
|
Add right click to use, latern is not armor tweaks
|
2020-04-12 18:41:07 +02:00 |
|
Imbris
|
f52d66d721
|
Fix selecting and remove amount text when dragging
|
2020-04-12 18:41:06 +02:00 |
|
Imbris
|
c1c09dce1b
|
Enable unequipping as well as equipping to specific slots
|
2020-04-12 18:41:06 +02:00 |
|
Imbris
|
66b4c0d529
|
rework slot trait
|
2020-04-12 18:41:05 +02:00 |
|
jshipsey
|
e2d60b858e
|
cape work
|
2020-04-12 18:41:05 +02:00 |
|
Pfauenauge90
|
66b283209b
|
Update de_DE.ron
|
2020-04-12 18:41:04 +02:00 |
|
Pfauenauge90
|
88a938653b
|
translation fix
|
2020-04-12 18:41:04 +02:00 |
|
Pfauenauge90
|
0a52dc61d6
|
hotbar text shadows
|
2020-04-12 18:41:04 +02:00 |
|
Pfauenauge90
|
eb7ded989f
|
7 dwarf accessories
|
2020-04-12 18:41:03 +02:00 |
|
Pfauenauge90
|
f24ba71d94
|
hotbar keybindings
|
2020-04-12 18:41:03 +02:00 |
|
Pfauenauge90
|
a29f199e80
|
fmt
|
2020-04-12 18:41:02 +02:00 |
|
Pfauenauge90
|
2263b9be95
|
starter chest, removed unused key commands
|
2020-04-12 18:41:02 +02:00 |
|
Pfauenauge
|
479fcaa603
|
bag tooltips translation entries
|
2020-04-12 18:41:01 +02:00 |
|
Pfauenauge
|
9b2785aeae
|
german translation update
|
2020-04-12 18:41:01 +02:00 |
|
Pfauenauge90
|
d62dfffd69
|
starter armor in char creation
|
2020-04-12 18:41:01 +02:00 |
|
Pfauenauge90
|
0fb5b73606
|
fix
|
2020-04-12 18:41:00 +02:00 |
|