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
12,346 Commits 151 Branches 18 Tags 2.1 GiB
149763d54a
Commit Graph

3029 Commits

Author SHA1 Message Date
Sam
28a4ce9be1 Various tweaks 2022-07-26 19:44:49 -04:00
Marcel
72b0b26004 Merge branch 'pfau/bg_new' into 'master' 
new bg

See merge request veloren/veloren!3488
 2022-07-22 11:49:57 +00:00
DaforLynx
d2710635d8 Lightning strikes are less audible; cave music restored; fixed audio permanently stopping on logout 2022-07-21 08:27:35 +00:00
Monty Marz
6571068623 new bg 2022-07-19 20:53:06 +02:00
Marcel
35883c61cb Merge branch 'mckol/update-polish-translation' into 'master' 
Update the Polish translation

See merge request veloren/veloren!3399
 2022-07-17 11:50:50 +00:00
Joshua Barretto
0b16baf46a Improved rain performance 2022-07-16 14:44:58 +01:00
Treeco
7efddc33f7 Merge branch 'more_humanoid_models' into 'master' 
Humanoid Model Overhaul

See merge request veloren/veloren!3478
 2022-07-16 11:13:24 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
Mckol
8861e12e70 Updated the Polish translation 2022-07-16 13:07:45 +02:00
Joshua Barretto
ea39f78dfd Minimised rain occlusion problems 2022-07-16 11:14:12 +01:00
Joshua Barretto
b08a501aef Cleaned up ready for merge 2022-07-16 11:09:35 +01:00
Joshua Barretto
3c5de2991b More consistent texturing code 2022-07-15 08:43:35 +01:00
Joshua Barretto
9ad32b37e7 More efficient texture fetches 2022-07-15 08:43:34 +01:00
Joshua Barretto
61792d4135 Apply AO 2022-07-15 08:43:34 +01:00
Joshua Barretto
2694f5f917 Fixed lava 2022-07-15 08:43:34 +01:00
Joshua Barretto
07ba4dcc33 Fixed particles for non-body entities, AO for non-volumetric illumination 2022-07-15 08:43:34 +01:00
Joshua Barretto
b5662163f0 Better lighting and verticality in caves 2022-07-15 08:43:33 +01:00
Joshua Barretto
1f979e4133 More biomes 2022-07-15 08:42:56 +01:00
Joshua Barretto
2cce44fc36 Began work on caves2 2022-07-15 08:42:56 +01:00
Joshua Barretto
62d2982990 Made rainbows ultra only 2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91 Fixed unrolling issue in rain shader 2022-07-15 07:06:11 +00:00
Joshua Barretto
964b315fc5 Fixed lightning point glow 2022-07-14 22:12:34 +00:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master' 
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
 2022-07-14 18:24:21 +00:00
Isse
5c7ed1e712 Merge branch 'vfoulon80/boat-loading-animation' into 'master' 
Add a boat loading animation

See merge request veloren/veloren!3474
 2022-07-14 07:17:30 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Joshua Barretto
f48665366b More lightning position variety 2022-07-13 21:45:37 +01:00
Vincent Foulon
2240fa4a23
Add a boat loading animation 2022-07-13 22:41:34 +02:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Joshua Barretto
25c55b6a25 Better rain performance, wetness 2022-07-13 18:34:34 +01:00
Joshua Barretto
4e854a28ff Fixed occlusion bias 2022-07-10 16:56:45 +01:00
Joshua Barretto
d4906f55bc Fixed rain occlusion issues 2022-07-10 16:40:49 +01:00
Joshua Barretto
fc21b54f02 Better rain performance 2022-07-10 13:53:31 +01:00
Joshua Barretto
47b236b1f0 Better lightning rates, fixed shaders 2022-07-10 13:44:11 +01:00
Joshua Barretto
3b758cc7b0 Minor colour tweak 2022-07-09 02:25:24 +01:00
Joshua Barretto
85a292a854 Always take origin as lightning end point 2022-07-09 02:16:13 +01:00
Joshua Barretto
6fea7205fa Better lightning at distance 2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
edc2720416 Better lightning effect 2022-07-09 00:39:18 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
Joshua Barretto
622b67d24e Relative offset fix 2022-07-08 20:49:51 +01:00
Joshua Barretto
90d2ceab2e Fixed rain clipping issue 2022-07-08 20:40:08 +01:00
Joshua Barretto
4b738c8b8f Balanced rain intensity 2022-07-08 20:22:09 +01:00
Joshua Barretto
6c4b10d881 Use existing humidity 2022-07-08 20:18:07 +01:00
Joshua Barretto
28bc9db198 Better cloud cover 2022-07-08 18:09:13 +01:00
Joshua Barretto
853d622e19 Better fall rate 2022-07-08 16:41:31 +01:00
Joshua Barretto
23aea72466 Fixed fall rate 2022-07-08 16:09:36 +01:00
Joshua Barretto
32fe997506 Use tilted origin for rain 2022-07-08 16:07:15 +01:00
Joshua Barretto
d5c0e878d7 Adjusted depths 2022-07-08 15:09:38 +01:00
Joshua Barretto
eae917ee8f Use DDA for rain rendering 2022-07-08 14:48:59 +01:00
DaforLynx
fc80a6278c Fixing looping issues 2022-07-07 16:09:13 -07:00
DaforLynx
bcaa026bff "Adventurous Soul" plays in Snowland too 2022-07-07 21:26:12 +00:00
DaforLynx
00f1e9c407 Music, reorganization, metadata, and fixes 2022-07-07 04:14:20 +00:00
Julio Cezar Silva
fd34666d03 Portuguese translations parity to global 2022-07-06 07:32:43 +00:00
IsseW
6d8cbe6f0f remove relative rain direction and increase FALL_RATE 2022-07-04 18:18:43 +02:00
Imbris
e4dfc7729f Fix rain being visible indoors by making rpos properly line up with where the rain is being drawn and suppressing any leaks of rain occlusion map via flooring the sampled output 2022-07-04 18:18:41 +02:00
IsseW
e7208c9537 make iterations const 2022-07-04 18:18:41 +02:00
Imbris
a5a082cf41 Also use 4 iterations for medium clouds and adjust the factor multiplied by rain_dist each iteration based on the number of iterations so that the last iteration is always the same. 2022-07-04 18:18:40 +02:00
Imbris
b2d3759105 Cleanup profiling comments and commented code 2022-07-04 18:18:39 +02:00
Imbris
b29bad015c Misc notes in cloud-frag.glsl 2022-07-04 18:18:39 +02:00
Imbris
5866e23e32 Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader 2022-07-04 18:18:38 +02:00
IsseW
e2969dc5f9 turn off rain for CLOUD_MODE_NONE and adjust iterations 2022-07-04 18:18:38 +02:00
IsseW
80e29e2c20 put rain_density in uniform 2022-07-04 18:18:37 +02:00
IsseW
5b7b13adce Add medium check to rain 2022-07-04 18:18:36 +02:00
IsseW
a7c724a46d Limit figures drawn for rain occlusion 2022-07-04 18:18:35 +02:00
DaforLynx
ac82689f83 Clean up audio code, fix egui bug 2022-07-04 18:18:34 +02:00
IsseW
72a0f56788 better rainbows 2022-07-04 18:18:34 +02:00
IsseW
cb969e5b87 Move atan2 to lod.glsl 2022-07-04 18:11:45 +02:00
IsseW
7752696387 pos_to_uv -> wpos_to_uv 2022-07-04 18:11:44 +02:00
DaforLynx
9104a07530 Code cleanup, doubled volume of leaves.ogg 2022-07-04 18:11:43 +02:00
Treeco
0d21361e05 Add player-relative rain direction 2022-07-04 18:11:42 +02:00
IsseW
fa589e915e make rain view distance smaller, dont put wind in texture 2022-07-04 18:11:41 +02:00
IsseW
fd12c8abdb Remove dead shader code, clean up weather.rs 2022-07-04 18:10:06 +02:00
DaforLynx
dc8424c549 Moving audio code 2022-07-04 18:10:05 +02:00
IsseW
b82bb5b247 Don't have rain be behind an expiremental shader 2022-07-04 18:07:22 +02:00
IsseW
3eabe24f12 base occlusion texture size of off voxels 2022-07-04 18:07:19 +02:00
IsseW
08b0989789 add slider for rain map resolution 2022-07-04 18:07:18 +02:00
IsseW
54f958acc7 more correct occlusion 2022-07-04 18:07:16 +02:00
DaforLynx
83ee54001e Ambience slider; fix to utterances 2022-07-04 18:07:15 +02:00
DaforLynx
088d1cfe9d Remove debug lines, re-mix some sfx, add crafting sfx, separate inv event sfx into spatial and nonspatial 2022-07-04 18:07:13 +02:00
IsseW
234ed5afb2 Rain occlusion projection matrix 2022-07-04 18:07:13 +02:00
Joshua Barretto
295b89d446 Better bias 2022-07-04 18:07:12 +02:00
Joshua Barretto
bfb4769315 Random depth for rain drops for better occlusion 2022-07-04 18:07:11 +02:00
IsseW
79cac935c8 Added rain occlusion 2022-07-04 18:07:11 +02:00
DaforLynx
b3200ed89f More ambience :) 2022-07-04 18:07:10 +02:00
DaforLynx
16ca1410be Remove extraneous sfx code 2022-07-04 18:07:08 +02:00
Joshua Barretto
48117988e1 Better rain threshold 2022-07-04 18:07:06 +02:00
Joshua Barretto
767093105f Rebalanced rain 2022-07-04 18:07:05 +02:00
Joshua Barretto
6093e1972a Add directional rain back 2022-07-04 18:07:05 +02:00
IsseW
e37f2be820 Put rainbows behind experimental 2022-07-04 18:07:03 +02:00
Joshua Barretto
86814eba04 Made rain look better 2022-07-04 18:07:03 +02:00
Benjam Soule H. Walker
99c76be297 added sound for rain 2022-07-04 18:07:02 +02:00
Joshua Barretto
502145a6f9 Cloud movement is more prominent 2022-07-04 18:07:01 +02:00
Joshua Barretto
dc90d637c1 Smoother clouds 2022-07-04 18:07:01 +02:00
Joshua Barretto
4181331e6b Balanced rain density 2022-07-04 18:07:00 +02:00
IsseW
273c5ed2f0 Temporary noise solution 2022-07-04 18:07:00 +02:00
IsseW
67683f315f Put rain behind expiremental shader 2022-07-04 18:06:59 +02:00
IsseW
9c84a20cef better sim 2022-07-04 18:06:58 +02:00
IsseW
547301ff5f rainbows 2022-07-04 18:06:57 +02:00
IsseW
78c1de19cf More accurate weather sim 2022-07-04 18:04:39 +02:00
IsseW
6585ef1513 weather dependant music 2022-07-04 18:11:43 +02:00