Commit Graph

4838 Commits

Author SHA1 Message Date
Isse
3a61fb15b2 fix divide by zero in state::apply_terrain_changes_internal 2023-10-15 23:00:36 +02:00
Samuel Keiffer
e1767ab3ad Merge branch 'sam/bezier-beam' into 'master'
Converted beam system from spherical shell wedges to quadratic beziers

See merge request veloren/veloren!4137
2023-10-15 15:42:02 +00:00
Sam
ef5e37a64d Converted beam system from spherical shell wedges to quadratic beziers 2023-10-14 21:46:28 -04:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Joshua Barretto
e293de5bae Added wielding for wallrunning 2023-10-14 12:27:08 +01:00
Joshua Barretto
32b0b33abe Merge branch 'zesterer/backpack-fixes' into 'master'
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons

See merge request veloren/veloren!4131
2023-10-13 22:21:53 +00:00
Isse
e0c67c470b Merge branch 'isse/small-fixes' into 'master'
Client local time, used for fluid shaders

See merge request veloren/veloren!4128
2023-10-13 12:17:51 +00:00
Isse
56175c2730 rename client_time to local_time 2023-10-13 13:17:52 +02:00
Joshua Barretto
9dd5cd24d1 Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons 2023-10-13 11:57:49 +01:00
Joshua Barretto
0f2d4c261a Merge branch 'zesterer/better-anims' into 'master'
Improving some animations

See merge request veloren/veloren!4127
2023-10-12 20:18:11 +00:00
Joshua Barretto
d1d4d527c7 Fixed test 2023-10-12 20:37:53 +01:00
Joshua Barretto
0b1ffb6695 Fixed footstep timings 2023-10-12 20:31:10 +01:00
Joshua Barretto
1d33d7e4c4 Fixed lantern holding logic 2023-10-12 18:08:24 +01:00
Joshua Barretto
d5565c4a41 Added strafe-like rolling 2023-10-12 12:34:08 +01:00
Isse
68857d5af7 fix client without singleplayer feature 2023-10-12 01:47:30 +02:00
Isse
72db9b61b3 client local time 2023-10-12 01:46:12 +02:00
Isse
472b996c8e Merge branch 'isse/shader-fp-fixes' into 'master'
Shader floating point fixes

See merge request veloren/veloren!4120
2023-10-11 23:04:33 +00:00
Isse
4967eebb0b change time of day repeat to 1000 days 2023-10-11 23:12:54 +02:00
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Isse
7d37646dac renames and comments 2023-10-07 19:53:55 +02:00
Isse
bc436e2c9f make particles only use 1 float for inst time again 2023-10-07 19:53:55 +02:00
Isse
a152e4dfb4 time-proof usages of tick 2023-10-07 19:53:55 +02:00
Isse
b11aac2b5b use look dir for spectator 2023-10-07 19:53:55 +02:00
Isse
6d4be9bd01 time proof time of day in shaders 2023-10-07 19:53:55 +02:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh"
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
Maxicarlos08
a3be68930e
review comments 2023-10-02 23:23:42 +02:00
Maxicarlos08
7734b653e7
replace all uses of Arc<> with references 2023-10-02 16:52:41 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup 2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status 2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen 2023-09-29 23:30:14 +02:00
Imbris
9c398cb06d djust for changes in specs safety refactor 2023-09-24 23:46:59 -04:00
Maxicarlos08
3f6d23ad7f
remove unwrap from controller modifier handler 2023-09-18 18:34:57 +02:00
Isse
f4ca60cbb6 Map selector and generation UI 2023-09-17 17:11:19 +00:00
Imbris
34ee35c524 Prefer locking the cursor when grabbing it (if that option is supported)
over just confining it to the window.

This prevents the cursor from moving around when controlling the camera.
2023-09-10 16:51:31 -04:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode 2023-09-06 17:47:16 +02:00
Thomas S
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles 2023-08-27 19:40:49 +02:00
Imbris
de34726fa7 Merge branch 'imbris/winit-update-v2' into 'master'
Update winit to 0.28

See merge request veloren/veloren!4088
2023-08-27 15:10:00 +00:00
Imbris
f5445774de Update winit to 0.28
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
Christof Petig
b20ff5144c determine location names when loading character list 2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event 2023-08-19 11:44:58 +02:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666) 2023-08-17 22:47:35 +02:00
Evgen Kot
9f213019d1 Settings for Si prefixes in the interface menu 2023-08-17 15:24:05 +00:00
Maxicarlos08
e5e26149ed
review 2023-08-17 11:16:20 +02:00
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets 2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation 2023-08-15 12:24:49 +02:00
Maxicarlos08
6a4a6bab9f
dance dance 2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles 2023-08-15 12:24:48 +02:00
Maxicarlos08
13dbf679c5
review 2023-08-15 11:10:54 +02:00
Michal Sroczynski
b7c56c9057
Hud fix 2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
6a080c242c
Add server side check to stop stay when mounted
Add filter to allow telling other pets to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
TelepathicWalrus
25f1f8f6cb
Changed to .filter and .min_by_key for iterator 2023-08-15 11:10:53 +02:00
TelepathicWalrus
5894913ede
Changed mod.rs to use CachedSpatialGrid 2023-08-15 11:10:53 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Youser Nayme
5ef300c72c Add keybinding for zooming the camera 2023-08-10 16:55:09 +00:00
Isse
b3899d6966 Merge branch 'isse/usable-shovel' into 'master'
Usable shovel

See merge request veloren/veloren!4060
2023-08-08 18:45:10 +00:00
DaforLynx
16f53d33ed Play sfx on successful repair 2023-08-05 18:49:49 +00:00
Isse
98385b3b15 animation 2023-08-04 13:59:22 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
b06960ce1c fix interaction_text 2023-08-03 20:56:26 +02:00
Isse
5e225d7f35 add to changelog 2023-08-03 19:38:31 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
flo
57fe2c4adb spawn wyverns 2023-08-02 07:55:10 +00:00
Joshua Barretto
bcbfbbb274 Merge branch 'jimmy/controller-layers' into 'master'
controller layers

See merge request veloren/veloren!3988
2023-07-31 16:20:01 +00:00
JimmyDdotEXE
996bbeb983 add doc comments to LayerEntry and GameLayerEntries structs 2023-07-30 13:34:23 -04:00
JimmyDdotEXE
18d74e6a8e replace conditional LayerEntry construction during input check 2023-07-30 13:19:46 -04:00
DaforLynx
32f3437fb0 Combat music toggle 2023-07-30 08:10:36 +00:00
Sam
e3ad16ef47 Addressed review comments 2023-07-29 19:04:11 -04:00
Sam
d6fcd893bf Addressed testing feedback 2023-07-29 19:04:10 -04:00
Sam
30bafec247 Icons 2023-07-29 19:04:08 -04:00
Monty Marz
a4bfa1d242 skills_bg 2023-07-29 19:04:08 -04:00
Sam
dd616f85a9 Changelog and appease CI 2023-07-29 19:04:07 -04:00
Sam
68181e9b5b Axe skill tree 2023-07-29 19:04:06 -04:00
Sam
93ddb36c0a Axe skill icons 2023-07-29 19:04:06 -04:00
Sam
834a811def Buff icons 2023-07-29 19:04:05 -04:00
Sam
188be17b95 Defiance 2023-07-29 19:04:03 -04:00
Sam
820f8dca94 Sunder 2023-07-29 19:04:02 -04:00
Sam
a2deac19ee Furor 2023-07-29 19:03:59 -04:00
Sam
1cc99c9c4a Fixes to animations and making ability that the animation system thinks is being used more correct 2023-07-29 19:03:56 -04:00
Sam
ff15780c22 Maelstrom 2023-07-29 18:53:48 -04:00
Sam
4a690840e4 Savage sense 2023-07-29 18:53:47 -04:00
Sam
80ab9c26ec Initial setup 2023-07-29 18:53:38 -04:00
Isse
91da702d66 lesser spacing with amount 2023-07-28 18:08:18 +02:00
Avi Weinstock
4669b4ab52 Show item amounts in item tooltips. 2023-07-28 11:47:05 -04:00
JimmyDdotEXE
77fb2150d9 addressed code quality issues noted by pipeline 2023-07-23 21:13:06 -04:00
JimmyDdotEXE
8fd30ea55b left and right bumpers as layer buttons on controller 2023-07-23 21:13:05 -04:00
Samuel Keiffer
9f2ece3199 Merge branch 'remove-coin-counter' into 'master'
Remove coin counter at the bottom of inventories.

See merge request veloren/veloren!3998
2023-07-23 17:29:23 +00:00