Yusuf Bera Ertan
84a7f666c2
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
33c00839e9
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03:00
Marcel
f4d5a196b4
Merge branch 'kinggred-master-patch-80352' into 'master'
...
Update main.ron
See merge request veloren/veloren!2123
2021-04-17 18:28:31 +00:00
Marcel
46601da581
Merge branch 'imbris/test' into 'master'
...
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
See merge request veloren/veloren!2140
2021-04-17 17:48:21 +00:00
Imbris
8b41409227
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 21:58:59 -04:00
Imbris
203fcb551f
Merge branch 'aweinstock/serverphysics-fix-20210416' into 'master'
...
Make physics anticheat less aggressive.
See merge request veloren/veloren!2139
2021-04-16 22:51:40 +00:00
Avi Weinstock
b1a60eede7
Make physics anticheat less aggressive.
2021-04-16 18:07:54 -04:00
Samuel Keiffer
8a83b00e78
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
4d74fe9d7c
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
a62598c62c
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
191d60266a
m2 staff
2021-04-16 00:48:20 +03:00
Imbris
b72867da60
Merge branch 'xvar/fixed-overitem-primcount' into 'master'
...
Fixed bug causing UI elements to move around when they shouldn't
See merge request veloren/veloren!2133
2021-04-15 21:38:57 +00:00
gGmMsS123
90a47a20ea
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
f0ab4bbb28
Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn
2021-04-15 21:45:09 +01:00
gGmMsS123
db8d189ebd
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Ben Wallis
e8f5d1711f
Merge branch 'xvar/fix-cargo-test-server' into 'master'
...
Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required
See merge request veloren/veloren!2132
2021-04-15 19:31:30 +00:00
Avi Weinstock
26fbe51786
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
Ben Wallis
404aca3e20
Fixed cargo test-server. Removed -Z package-features from .cargo/config as it is no longer required
2021-04-15 19:07:46 +01:00
Justin Shipsey
b4757616f6
Merge branch 'slipped/changes' into 'master'
...
combat tweaks
See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
16869933b7
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
599981fca4
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
0f4162a26c
Add teleport/speedhack mitigation.
2021-04-15 08:50:17 -04:00
Avi Weinstock
1064e3777b
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Avi Weinstock
41d624461b
Minimal implementation of server-authoritative physics.
2021-04-15 08:26:15 -04:00
Marcel
219f577106
Merge branch 'hqurve/settings-cleanup' into 'master'
...
Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up
See merge request veloren/veloren!2130
2021-04-15 09:06:10 +00:00
Samuel Keiffer
755def09e0
Merge branch 'yusdacra/chore/nix' into 'master'
...
Nix chores
See merge request veloren/veloren!2127
2021-04-15 01:25:02 +00:00
Justin Shipsey
f4a97a27f5
Merge branch 'sam/2h-offhand-anim-fixes' into 'master'
...
2 Hand Offhand Animation Fixes
See merge request veloren/veloren!2129
2021-04-15 01:21:52 +00:00
Ben Wallis
ad02a21e61
Merge branch 'xvar/rework-char-deletes' into 'master'
...
Character deletes are now processed by CharacterUpdater and clear any pending...
See merge request veloren/veloren!2128
2021-04-15 00:39:17 +00:00
hqurve
b54cfeefc6
Debug change visibility from settings_window works again
2021-04-14 19:24:28 -04:00
hqurve
9f0b794e46
Seem to have missed minimap again
2021-04-14 19:10:18 -04:00
hqurve
5709c76e4e
simplified settings changing within hud and settings_window
2021-04-14 19:10:18 -04:00
hqurve
bf22f631ca
forgot to add minimap to settings_change
2021-04-14 19:10:17 -04:00
hqurve
84ba336c81
cleaned up settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
fd11654e29
Wrapped settings changes from the ui into a single enum and handling moved to session/settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
94d3e79115
Moved session.rs into session/mod.rs
2021-04-14 19:10:17 -04:00
hqurve
64e3a52934
Split settings.rs into multiple files
2021-04-14 19:10:17 -04:00
hqurve
c647e81a54
Moved settings.rs to settings/mod.rs
2021-04-14 19:10:17 -04:00
Samuel Keiffer
782f9930bb
Merge branch 'sam/handed-stat-adjustment' into 'master'
...
Adjusts Stats for Handedness Correctly
See merge request veloren/veloren!2125
2021-04-14 22:11:17 +00:00
Sam
b76181aaa0
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Ben Wallis
6c9994ab58
Character deletes are now processed by CharacterUpdater and clear any pending logout updates for the deleted character
2021-04-14 22:30:53 +01:00
Yusuf Bera Ertan
70d1bb78f6
build(nix): remove useless rustpkgs
2021-04-15 00:28:35 +03:00
Yusuf Bera Ertan
5002ea57aa
chore(deps): update nix flake lock
2021-04-15 00:19:55 +03:00
Samuel Keiffer
89d58590fd
Merge branch 'pfau/temp_disable_death_msg' into 'master'
...
Temporarily remove death messages
See merge request veloren/veloren!2124
2021-04-14 20:45:54 +00:00
Sam
207e7d45a3
Stats adjusted for 2h. Poise adjusted by handedness.
2021-04-14 15:03:37 -04:00
Monty
b140745da2
Temporarily remove death messages
2021-04-14 20:31:34 +02:00
Samuel Keiffer
17d51db095
Merge branch 'holychowders/resolve_issue_#978_extract_skillset_into_own_component' into 'master'
...
Resolve Issue #978 - Extract SkillSet Into Its Own Component
Closes #1065 and #978
See merge request veloren/veloren!2116
2021-04-14 15:35:35 +00:00
holychowders
793e7982b0
Resolve Issue #978 - Extract SkillSet Into Its Own Component
2021-04-14 15:35:34 +00:00
Stanisław Grupiński
ee445137c3
Update main.ron
2021-04-14 12:40:02 +00:00
Ben Wallis
088d87f85c
Merge branch 'xvar/fix-saves-dir-creation' into 'master'
...
Fixed initial creation of saves directory
See merge request veloren/veloren!2122
2021-04-14 07:41:59 +00:00
