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,833 Commits 151 Branches 18 Tags 2.1 GiB
bc2560ea90
Commit Graph

3833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pfauenauge90
85f9f80024 starter equip 2020-04-12 18:41:00 +02:00
Pfauenauge
6dcdd80ec8 smarter code 2020-04-12 18:40:59 +02:00
Pfauenauge
c6eda08679 fmt 2020-04-12 18:40:59 +02:00
Pfauenauge
d5128b751d png item images, fix map cursor 2020-04-12 18:40:59 +02:00
Pfauenauge90
039f7f9f14 item images 2020-04-12 18:40:58 +02:00
Pfauenauge90
ca667fd02b tooltips 2020-04-12 18:40:58 +02:00
Pfauenauge90
156b554023 item types 2020-04-12 18:40:57 +02:00
jshipsey
ea2c646df3 initial cape implementation 2020-04-12 18:40:57 +02:00
Pfauenauge90
fa03f9ddb9 slot kinds 2020-04-12 18:40:56 +02:00
Pfauenauge90
f5a768dccf more armour types 2020-04-12 18:40:56 +02:00
Pfauenauge90
7f97fbac0b cape item 2020-04-12 18:40:56 +02:00
Pfauenauge90
771baaaae5 cape item 2020-04-12 18:40:55 +02:00
Imbris
1f31b7f123 Drag things! 2020-04-12 18:40:55 +02:00
Imbris
6c336c015e Make remove skin in armor item images 2020-04-12 18:40:54 +02:00
Imbris
77948d27ca Scale content image based on slot size, fix weapon images not showing, stop selection of empty slots 2020-04-12 18:40:54 +02:00
Imbris
4c5f668203 Don't show icon when slot is filled and have a separate image for filled 
slot backgrounds
 2020-04-12 18:40:54 +02:00
Pfauenauge
cac2321464 armor slot visuals 2020-04-12 18:40:53 +02:00
Imbris
0b932ae99a Use new slot widget for armor slots 2020-04-12 18:40:53 +02:00
Imbris
968c064874 Restore slot interaction functionality 2020-04-12 18:40:52 +02:00
Imbris
9c76bdde0e Setup basic generic slot system and used it for the inventory slots 2020-04-12 18:40:52 +02:00
Songtronix
ff4894e454 Merge branch 'olexorus/password_length' into 'master' 
Allow passwords with up to 35 characters

See merge request veloren/veloren!905
 2020-04-12 13:41:17 +00:00
Olexorus
4bd7e5ab67 Allow passwords with up to 35 characters 2020-04-12 13:52:39 +02:00
Monty Marz
198b8a4994 Merge branch 'olexorus/change_falldmg' into 'master' 
Improve fall damage calculation

See merge request veloren/veloren!902
 2020-04-10 11:04:18 +00:00
Olexorus
7c0a3bafe6 Change how fall damage works 2020-04-10 12:03:15 +02:00
Imbris
31db87040a Merge branch 'carbonhell/missing_mouse_event' into 'master' 
Fixes mouse_input event not being pushed everytime

See merge request veloren/veloren!898
 2020-04-10 04:28:17 +00:00
Joshua Barretto
a60f4ea4e2 Merge branch 'treeco/fix-tree-artefact' into 'master' 
Fixed leaf lerp doing weird things

See merge request veloren/veloren!899
 2020-04-09 21:39:45 +00:00
Treeco
542491c48d Fixed leaf lerp doing weird things 2020-04-09 21:03:17 +01:00
Carbonhell
c0c92c4259 Fixes mouse_input event not being pushed everytime 2020-04-09 18:43:12 +02:00
Marcel
ead469a411 Merge branch 'xMAC94x/small-fixes' into 'master' 
Install meta package librust-backtrace+libbacktrace-dev in debian, this might...

See merge request veloren/veloren!896
 2020-04-09 12:35:02 +00:00
Marcel
342e46afcb Install meta package librust-backtrace+libbacktrace-dev in debian, this might fix the problem that we dont have server backtraces. 
According to its documentation its specifically tailed down to deliver everything for rust backtrace crate:
https://packages.debian.org/buster/librust-backtrace+libbacktrace-dev
The official requierement would be install `cc` and `ar`, where `ar` is in binutils, and `cc` seems to be in gcc-8 or a subpackage of it. Both would requiere about 100MB additionally for backtraces, while this package should requiere additional 8MB
 2020-04-09 11:22:34 +00:00
Joshua Yanovski
8414987e58 WIP -- lighting changes and soft shadows. 2020-04-09 02:38:40 +02:00
Monty Marz
9427d5154b Merge branch 'carbonhell/cursor_grabbed_fix' into 'master' 
Fixes mouseinput event ignoring cursor_grabbed being true

See merge request veloren/veloren!895
 2020-04-08 23:03:47 +00:00
Carbonhell
20ec77eeb0 Fixes mouseinput event ignoring cursor_grabbed being true 2020-04-08 23:46:42 +02:00