Commit Graph

8289 Commits

Author SHA1 Message Date
Avi Weinstock
af47c0dc21 Added /server_physics admin command. 2021-04-17 13:44:22 -04:00
Imbris
30e34aad44 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
c83c1a5571 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
513c7ff068 Make physics anticheat less aggressive. 2021-04-16 18:07:54 -04:00
Samuel Keiffer
a1d9ba15d9 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
f441c8c206 Normalize + shrink all sfx; tweaks to combat music; change footstep sounds 2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e 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
85ee4c8cd1 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
d5a887f195 m2 staff 2021-04-16 00:48:20 +03:00
Imbris
4419c24eab 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
e33961e1fa M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
Ben Wallis
1144eefa46 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
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Ben Wallis
5445094174 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
2fb7575d60 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00
Ben Wallis
95d7a3d761 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
803e67b1fb Merge branch 'slipped/changes' into 'master'
combat tweaks

See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Avi Weinstock
bf6ac56eb0 Add teleport/speedhack mitigation. 2021-04-15 08:50:17 -04:00
Avi Weinstock
50d0314a75 Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Avi Weinstock
d6f4537d39 Minimal implementation of server-authoritative physics. 2021-04-15 08:26:15 -04:00
Marcel
a386a27411 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
9c59033976 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
f7f2eb4b9b 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
b6cd1f836e 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
6ac2b87006 Debug change visibility from settings_window works again 2021-04-14 19:24:28 -04:00
hqurve
9018ead8d0 Seem to have missed minimap again 2021-04-14 19:10:18 -04:00
hqurve
399795dbf1 simplified settings changing within hud and settings_window 2021-04-14 19:10:18 -04:00
hqurve
4503d5160c forgot to add minimap to settings_change 2021-04-14 19:10:17 -04:00
hqurve
56deb5919f cleaned up settings_change.rs 2021-04-14 19:10:17 -04:00
hqurve
df38dfbaf8 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
732fe3bb40 Moved session.rs into session/mod.rs 2021-04-14 19:10:17 -04:00
hqurve
685eeb42d8 Split settings.rs into multiple files 2021-04-14 19:10:17 -04:00
hqurve
8effdb1773 Moved settings.rs to settings/mod.rs 2021-04-14 19:10:17 -04:00
Samuel Keiffer
d37d310a87 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
c88df846a7 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
378561598e 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
6331f4e1cc
build(nix): remove useless rustpkgs 2021-04-15 00:28:35 +03:00
Yusuf Bera Ertan
ff1d86cee3
chore(deps): update nix flake lock 2021-04-15 00:19:55 +03:00
Samuel Keiffer
e6f10e5176 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
94042bdf79 Stats adjusted for 2h. Poise adjusted by handedness. 2021-04-14 15:03:37 -04:00
Monty
ed233efc53 Temporarily remove death messages 2021-04-14 20:31:34 +02:00
Samuel Keiffer
435b5d5912 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
568a8d9666 Resolve Issue #978 - Extract SkillSet Into Its Own Component 2021-04-14 15:35:34 +00:00
Stanisław Grupiński
fd7bf41678 Update main.ron 2021-04-14 12:40:02 +00:00
Ben Wallis
6db79d5439 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
Ben Wallis
d6b3eb3784 Fixed initial creation of saves directory. Added path of old singleplayer saves directory to information logged when it is moved to the new userdata directory 2021-04-14 07:15:51 +01:00
Samuel Keiffer
6f9f28af18 Merge branch 'slipped/animtweaks' into 'master'
1h weapons

See merge request veloren/veloren!2117
2021-04-14 03:02:22 +00:00
jshipsey
808634aa75 addressing commments 2021-04-13 20:19:35 -04:00