Pfauenauge90
1af1b1cf35
cape item
2020-04-12 18:40:56 +02:00
Pfauenauge90
edc0ba0f75
cape item
2020-04-12 18:40:55 +02:00
Imbris
dad932cd50
Drag things!
2020-04-12 18:40:55 +02:00
Imbris
15e98691ce
Make remove skin in armor item images
2020-04-12 18:40:54 +02:00
Imbris
9d63e74da6
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
9bf23c66d1
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
14991cd309
armor slot visuals
2020-04-12 18:40:53 +02:00
Imbris
ce619c2aff
Use new slot widget for armor slots
2020-04-12 18:40:53 +02:00
Imbris
a3f56cae83
Restore slot interaction functionality
2020-04-12 18:40:52 +02:00
Imbris
b3c1c02d55
Setup basic generic slot system and used it for the inventory slots
2020-04-12 18:40:52 +02:00
Songtronix
84f50a79cf
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
edc871b002
Allow passwords with up to 35 characters
2020-04-12 13:52:39 +02:00
Monty Marz
b148c4d697
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
b7a8de94f4
Change how fall damage works
2020-04-10 12:03:15 +02:00
Imbris
4fd0b663ab
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
fac3428609
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
d55ae6e716
Fixed leaf lerp doing weird things
2020-04-09 21:03:17 +01:00
Carbonhell
5d18857ef3
Fixes mouse_input event not being pushed everytime
2020-04-09 18:43:12 +02:00
Marcel
a45d29a49a
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
c571b83c18
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
f90c602c41
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
4ff63345d8
Fixes mouseinput event ignoring cursor_grabbed being true
2020-04-08 23:46:42 +02:00
Joshua Barretto
c0fc0c2186
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
5a3ca149b4
Fixed the player being rendered after dying
2020-04-08 21:28:33 +01:00
Songtronix
45b8dd921e
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
2a93c57fb0
Carbonhell/keybindings
2020-04-08 17:36:37 +00:00
Imbris
1c1eed6c26
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
74eae70662
Fix the problems of players walking over water with dithering
2020-04-07 22:50:01 +00:00
Forest Anderson
ab1f9af297
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
9c96e6fb3b
Prevent projectiles from hitting their owners
2020-04-06 23:08:54 +02:00
Monty Marz
a0a1402a9e
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
721c7e50e1
Small UI fixes
2020-04-04 21:51:06 +00:00
Imbris
ed5ef03952
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
e2b5c48b12
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
9b85882f9a
Add player transparency and silhouette
2020-04-04 19:36:55 +00:00
Imbris
d6004d7cdc
Trim newlines from password when pressing enter
2020-04-04 13:55:25 -04:00
Monty Marz
e0c5157e6c
Merge branch 'de_translation' into 'master'
...
German Translation
See merge request veloren/veloren!884
2020-04-04 14:39:54 +00:00
Monty Marz
d524eacdee
German Translation
2020-04-04 14:39:54 +00:00
Songtronix
6e6fd54731
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
535fe4325f
Update Turkish translation to include new strings
2020-04-02 16:46:59 +00:00
Songtronix
039355c0f8
Merge branch 'shandley/fix-sfx' into 'master'
...
Fix run SFX
See merge request veloren/veloren!880
2020-04-02 07:05:33 +00:00
Songtronix
6787509a43
Merge branch 'imbris/security' into 'master'
...
Update deps with security issues
See merge request veloren/veloren!879
2020-04-02 05:47:50 +00:00
Songtronix
4c3732d20c
Merge branch 'imbris/asset-errors' into 'master'
...
Make Asset impls avoid panics when parsing fails
See merge request veloren/veloren!869
2020-04-02 05:47:28 +00:00
Shane Handley
0f71fe2bdc
fix: Restore run SFX when the character is using a weapon other than the sword.
2020-04-02 14:47:26 +11:00
Imbris
a8fff80b0c
Show errors loading individual files during glob asset loading
2020-04-01 20:37:23 -04:00
Imbris
053ec2d874
Make Asset impls avoid panics when parsing fails
2020-04-01 20:06:15 -04:00
Imbris
f02aa99b8e
Fix security
2020-04-01 20:03:15 -04:00
Imbris
26502fe9f7
Merge branch 'combat' into 'master'
...
Combat rewrite
See merge request veloren/veloren!855
2020-04-01 21:29:19 +00:00
Imbris
baf973a32a
Merge branch 'master' into 'combat'
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:42:27 +00:00
Songtronix
59492dec0b
Merge branch 'Plecra/veloren-fix-windows-tests' into 'master'
...
fix: connect to LOCALHOST address in tests
See merge request veloren/veloren!875
2020-04-01 17:39:58 +00:00