Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,744 Commits 151 Branches 18 Tags 2.1 GiB
f7d9885723
Commit Graph

5359 Commits

Author SHA1 Message Date
jshipsey
cf425a09c8 setup 2023-10-19 00:14:12 -04:00
Joshua Barretto
e81516a154 Log shader warnings 2023-10-18 21:50:40 +01:00
Joshua Barretto
cb2de226a2 Fixed tracing span ordering issue 2023-10-18 19:56:19 +01:00
Joshua Barretto
ba763f2da5 Make no terrain pop the default 2023-10-18 09:58:00 +01:00
Joshua Barretto
bf92d0287b Skip animating figures outside of the frustum 2023-10-18 09:58:00 +01:00
Christof Petig
e22046c5f4 Address zesterer's comments 2023-10-17 22:10:19 +02:00
Christof Petig
12ee21a289 first part of load items from plugin 2023-10-17 21:07:23 +02:00
Justin Shipsey
0d5017932d Merge branch 'zesterer/backpack-fixes' into 'master' 
Added wielding for wallrunning

See merge request veloren/veloren!4133
 2023-10-16 20:00:06 +00:00
Isse
b862a7aa22 Merge branch 'isse/fix-div0' into 'master' 
Fix divide by zero in state::apply_terrain_changes_internal

See merge request veloren/veloren!4140
 2023-10-16 11:35:17 +00:00
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
Joshua Barretto
e6ca99cbb4 Fixed rolling limbs 2023-10-15 15:53:34 +01:00
Joshua Barretto
eec60a3277 Improved walking animations 2023-10-15 15:33:51 +01:00
Joshua Barretto
b21ccbf480 Reduced shoulder bopping 2023-10-15 12:21:20 +01:00
Sam
ef5e37a64d Converted beam system from spherical shell wedges to quadratic beziers 2023-10-14 21:46:28 -04:00
Joshua Barretto
c327d0cc85 Better wielded rolling 2023-10-14 21:35:54 +01:00
Raul Wagner Costa
46cf1f1914 Linearize light colors on the CPU 2023-10-14 18:10:35 +00:00
Joshua Barretto
748cde14be Factored out common lantern animation 2023-10-14 15:46:20 +01:00
Joshua Barretto
30ecc997ea Factor tool back animation code out 2023-10-14 15:06:08 +01:00
Joshua Barretto
03f698034b Nicer running 2023-10-14 14:27:01 +01: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
Joshua Barretto
64cb9b099d Better rolling 2023-10-13 22:35:34 +01:00
Joshua Barretto
510b5eaf98 Fixed vanishing legs 2023-10-13 21:55:40 +01:00
Joshua Barretto
6dc5a5b366 Made bird legs more reasonable 2023-10-13 21:25:39 +01:00
Joshua Barretto
921c1cc0d9 Fixed glidewield 2023-10-13 21:09:33 +01:00
Joshua Barretto
f29e7846f2 Better backward strafing 2023-10-13 20:22:39 +01:00
Joshua Barretto
adf77c48df Fixed glider shoulders 2023-10-13 19:44:55 +01:00
Joshua Barretto
93632c59af Somewhat balanced racial running speeds 2023-10-13 19:28:21 +01:00
Joshua Barretto
46b8533681 Better hand movement during strafe 2023-10-13 19:09:48 +01:00
Joshua Barretto
755ce65357 Revert quadmed change 2023-10-13 18:56:18 +01:00
Joshua Barretto
825c59d8d7 Much improved strafing 2023-10-13 17:11:01 +01:00
Joshua Barretto
a1349d8176 Added foot motion when turning on the spot 2023-10-13 15:16:47 +01:00
Joshua Barretto
f8c24666eb Fixed strafing 2023-10-13 14:44:37 +01:00
Joshua Barretto
7f922d8a27 Improved running animation of several skeletons 2023-10-13 14:07:49 +01: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
245855bf5c Remove redundant code, fix riding 2023-10-12 19:00:51 +01:00
Joshua Barretto
dc6c5190f2 Correct shoulder orientation when holding lantern 2023-10-12 18:13:46 +01:00
Joshua Barretto
1d33d7e4c4 Fixed lantern holding logic 2023-10-12 18:08:24 +01:00
Joshua Barretto
eab9e0e047 Shift feet due to run tilt 2023-10-12 17:57:02 +01:00
Joshua Barretto
dac228d733 Account for tilting for foot orientation 2023-10-12 17:43:29 +01:00
Joshua Barretto
ecc2991ef5 Vary animation speed based on humanoid scale 2023-10-12 17:27:22 +01:00
Joshua Barretto
a895243cb2 Fixed shoulder pads for new running animation 2023-10-12 17:01:57 +01:00
Joshua Barretto
4439d1e3fe Improved riding animation 2023-10-12 16:39:32 +01:00
Joshua Barretto
2880dd7af4 Minor improvements to running 2023-10-12 16:18:53 +01:00
Joshua Barretto
2d68a93a78 Improved existing weapon wielding animations 2023-10-12 15:12:35 +01:00
Joshua Barretto
148069b4ad Fixed rolling angles 2023-10-12 15:12:23 +01:00
Joshua Barretto
1c6aa4a53e Improved wielding animation 2023-10-12 14:18:54 +01:00
Joshua Barretto
d52f3af727 Better gliding 2023-10-12 12:34:17 +01:00
Joshua Barretto
d5565c4a41 Added strafe-like rolling 2023-10-12 12:34:08 +01:00
Joshua Barretto
ad580ab33c Better head movement 2023-10-12 01:28:21 +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
Joshua Barretto
7c170ce246 Improved running animation 2023-10-12 00:07:48 +01: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
540f0d10f2 cargo clippy after toolchain-update 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
Imbris
cd98dd5245 Remove unused deps flagged by cargo-machete 2023-09-21 22:59:50 -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
Xiretza
06111612a3 voxygen: better translation of buff-death messages 
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.

Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.

```
function getbuff --argument langfile buff
    grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end

set buffs burning bleeding curse crippled frozen mysterious

function replacebuffs --argument langfile entity
	set slug 'hud-chat-died_of_'$entity'_buff_msg'
    for buff in $buffs[-1..1]
        set bstr (getbuff $langfile $buff)
        or continue
        sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
    end
    sed -i -E 's/('$slug' \=).*/\1/' $langfile
end

function dofile --argument langfile
    sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
    for entity in pvp npc nonexistent
        replacebuffs $langfile $entity
    end
    sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
    sed -i -e /hud-outcome-/d $langfile
    sed -i -e '/#.*outcomes/d' $langfile
end

for langfile in assets/voxygen/i18n/*/hud/chat.ftl
    echo doing $langfile
    dofile $langfile
end
```
 2023-08-29 17:09:48 +00:00
Xiretza
9ef2875db7 voxygen: avoid unnecessary allocation 
Cow::to_string() goes through &str even for an Owned variant,
Cow::into_owned() passes Owned variants through as-is. As it happens,
the values here are always Owned (see comment in try_msg_ctx()
implementation).
 2023-08-29 17:09:31 +00:00
Thomas S
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
Marcel
f6b1d39cf4 Merge branch 'xMAC94x/update_dependencies' into 'master' 
xmac94x/update dependencies

See merge request veloren/veloren!4090
 2023-08-28 17:08:55 +00:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles 2023-08-27 19:40:49 +02:00
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +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
eec1b5853e Remove unused cpal version 
Also it turns out directories-next is in use for something that we need
 2023-08-23 00:47:31 -04: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