Commit Graph

3677 Commits

Author SHA1 Message Date
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
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
Joshua Barretto
1567e77a39 Merge branch 'capucho/player-dead-render-fix' into 'master'
Fixed the player being rendered after dying

See merge request veloren/veloren!894
2020-04-08 21:31:59 +00:00
Capucho
b6078d832a Fixed the player being rendered after dying 2020-04-08 21:28:33 +01:00
Songtronix
6353367577 Merge branch 'carbonhell/keybindings' into 'master'
Carbonhell/keybindings

Closes #178

See merge request veloren/veloren!886
2020-04-08 17:36:41 +00:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Imbris
611359e52f Merge branch 'capucho/player-effects' into 'master'
Fix the problems of players walking over water with dithering

See merge request veloren/veloren!890
2020-04-07 22:50:02 +00:00
Capucho
8f6686adc1 Fix the problems of players walking over water with dithering 2020-04-07 22:50:01 +00:00
Forest Anderson
dea7fd4549 Merge branch 'qutrin/projectile-betrayal-fix' into 'master'
Prevent arrows from hitting their owners

Closes #383

See merge request veloren/veloren!891
2020-04-06 22:19:02 +00:00
Piotr Korgól
84b1abdfcb Prevent projectiles from hitting their owners 2020-04-06 23:08:54 +02:00
Monty Marz
32db0df208 Merge branch 'pfau/small_ui_fixes' into 'master'
Small UI fixes

See merge request veloren/veloren!888
2020-04-04 21:51:06 +00:00
Monty Marz
07242644ca Small UI fixes 2020-04-04 21:51:06 +00:00
Imbris
e2c818b556 Merge branch 'imbris/fix' into 'master'
Remove newline from password when pressing enter

See merge request veloren/veloren!887
2020-04-04 21:45:30 +00:00
Joshua Barretto
7d0efd0b0b Merge branch 'capucho/player-effects' into 'master'
Add player transparency and silhouette

See merge request veloren/veloren!881
2020-04-04 19:36:56 +00:00
Capucho
a21ae27a77 Add player transparency and silhouette 2020-04-04 19:36:55 +00:00
Imbris
d36c2cac99 Trim newlines from password when pressing enter 2020-04-04 13:55:25 -04:00
Monty Marz
e0e86de21d Merge branch 'de_translation' into 'master'
German Translation

See merge request veloren/veloren!884
2020-04-04 14:39:54 +00:00
Monty Marz
1af82604b5 German Translation 2020-04-04 14:39:54 +00:00
Songtronix
22f3319b44 Merge branch 'yusdacra/update-turkish-translation' into 'master'
Update Turkish translation to include new strings

See merge request veloren/veloren!878
2020-04-02 16:46:59 +00:00
Yusuf Bera Ertan
d62770fd6e Update Turkish translation to include new strings 2020-04-02 16:46:59 +00:00
Songtronix
4fdf6896ab Merge branch 'shandley/fix-sfx' into 'master'
Fix run SFX

See merge request veloren/veloren!880
2020-04-02 07:05:33 +00:00