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
13,101 Commits 151 Branches 18 Tags 2.1 GiB
0d0b7a8889
Commit Graph

2481 Commits

Author SHA1 Message Date
Monty Marz
e21e4a6dd4 Add 0.14 background image 2023-01-12 17:56:50 +00:00
Joshua Barretto
4d7526b920 Made point shadows with shadow mapping an experimental shader 2023-01-12 15:39:11 +00:00
Joshua Barretto
0bdc66b10a Addressed review comments, minor fixes 2023-01-12 15:30:13 +00:00
tygyh
3fb7674e6a Update swedish translations 2023-01-05 10:30:11 +01:00
DaforLynx
b493a89b7f Soundtrack fix... 2023-01-03 22:27:19 +00:00
Marcel
2ff24259be Merge branch 'zesterer/lod-models' into 'master' 
New LoD model, wind sway pays attention to wind velocity

See merge request veloren/veloren!3739
 2023-01-02 14:51:00 +00:00
Marcel
10bb78792a Merge branch 'thanosfisherman/new_music_track_rectifications' into 'master' 
Thanosfisherman/new music track rectifications

See merge request veloren/veloren!3740
 2023-01-02 12:14:39 +00:00
Thanos Psaridis
7bafd5f63c Thanosfisherman/new music track rectifications 2023-01-02 12:14:39 +00:00
Francesco Vasco
a20c563ccd Added hud-bag-sort_by_tag in italian 2023-01-01 22:42:39 +01:00
Marcel
081f48e73c Merge branch 'thanosfisherman/add_music_track' into 'master' 
Thanosfisherman/add music track

See merge request veloren/veloren!3737
 2023-01-01 19:36:22 +00:00
Thanos Psaridis
2608e63316 Thanosfisherman/add music track 2023-01-01 19:36:22 +00:00
Joshua Barretto
0067825187 Reflection smearing 2022-12-31 19:19:52 +00:00
Joshua Barretto
f48e1ca951 Make wind sway change according to weather wind velocity 2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
Joshua Barretto
1f2d56c032 Better reflections 2022-12-31 13:04:28 +00:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category 2022-12-31 02:32:41 +02:00
Joshua Barretto
313527cf46 Correct material for LoD water 2022-12-30 19:22:07 +00:00
Joshua Barretto
6e344f58e8 Remove unnecessary cloud sampling from shiny water 2022-12-30 17:33:54 +00:00
Joshua Barretto
799bb17d75 Fixed underground sky blend test 2022-12-30 17:24:36 +00:00
Joshua Barretto
4bd7ec26d3 Fixed drop shadows 2022-12-30 17:01:26 +00:00
Joshua Barretto
367ec3e8f4 Added ViewMaterials experimental shader 2022-12-30 16:42:56 +00:00
Joshua Barretto
9098abc3d2 Merge reflections on horizontal border 2022-12-30 16:30:29 +00:00
Joshua Barretto
78fbaa82b3 Fixed ViewNormals 2022-12-30 16:26:32 +00:00
Joshua Barretto
c6fc833acb Don't blend sky for underwater reflections 2022-12-30 16:23:38 +00:00
Joshua Barretto
d50bda8d09 Better SSR sky blending 2022-12-30 16:01:06 +00:00
Joshua Barretto
26a98a3d9b Use normal and material gbuffer to improve quality of SSR 2022-12-30 15:33:23 +00:00
Joshua Barretto
6070bd6538 Merge branch 'master' into 'master' 
Italian: hud-map-bridge

See merge request veloren/veloren!3717
 2022-12-29 13:09:21 +00:00
Christof Petig
0fba3a73e4 Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master' 
Update description of the flashing lights setting

See merge request veloren/veloren!3727
 2022-12-29 13:01:59 +00:00
Monty Marz
6b74437c8c Bag icon improvement 2022-12-23 15:22:13 +00:00
Marcel
5f4f285523 Merge branch 'christmas-2022' into 'master' 
Christmas 2022 changes

See merge request veloren/veloren!3721
 2022-12-22 21:06:51 +00:00
DaforLynx
5e282340ba Christmas 2022 changes 2022-12-22 21:06:51 +00:00
Joshua Barretto
1798cdcffe Merge branch 'zesterer/floofy-clouds' into 'master' 
Floofy Clouds (improved cloud performance and visuals)

See merge request veloren/veloren!3726
 2022-12-17 15:41:08 +00:00
Joshua Barretto
dcc4762106 Fixed moon lighting of clouds 2022-12-17 15:04:57 +00:00
Joshua Barretto
5cf3aefb87 Better storm clouds 2022-12-17 14:57:55 +00:00
Rares
d63f8850a4 Update description of the flashing lights setting 
The lights are supposed to be enabled when the setting is checked
The new description should better reflect the intended behaviour
Only the English descriptions have been updated.
 2022-12-16 21:34:22 +02:00
Joshua Barretto
94c0e3749e Improved cloud visuals and performance 2022-12-15 23:56:28 +00:00
Marcel Märtens
b8afaafe69 fix spanish file movement 2022-12-15 21:39:59 +01:00
Francesco Vasco
03fae4f434 Italian: hud-map-bridge 2022-12-13 19:36:54 +01:00
Gamma
0e2fe6ff15 update the Spanish translation 2022-12-04 23:43:51 +00:00
rmdlv
f64af1dc86 Russian translation fixes 2022-12-03 19:40:45 +08:00
Marcel
122d2df04f Merge branch 'tygyh/Swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3705
 2022-12-01 14:10:00 +00:00
Jonathan Berglin
511026fd65 Update swedish translations 2022-12-01 14:09:59 +00:00
Marcel
f96776b060 Merge branch 'alejandrohernandezcarbonero83-master-patch-36663' into 'master' 
Update npc.ftl

See merge request veloren/veloren!3715
 2022-12-01 13:39:25 +00:00
electro79
dfc31eb0b5 Update npc.ftl 2022-11-30 16:55:10 +00:00
Marcel
ba62cc853e Merge branch 'Madrots/update-es_LA' into 'master' 
Madrots/update-es_LA

See merge request veloren/veloren!3708
 2022-11-30 15:34:33 +00:00
Madrots
605a0a07b0 Madrots/update-es_LA 2022-11-30 15:34:32 +00:00
Marcel
82e4520407 Merge branch 'master' into 'master' 
Added 'hud-skill-set_as_exp_bar' in italian.

See merge request veloren/veloren!3710
 2022-11-30 15:34:29 +00:00
Francesco Vasco
0ba7e5a06e Added 'hud-skill-set_as_exp_bar' in italian. 2022-11-30 15:34:27 +00:00
Marcel
44bca9a1b0 Merge branch 'floppy_dagon_kit' into 'master' 
dagon_kit

See merge request veloren/veloren!3696
 2022-11-30 15:27:21 +00:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
Marcel
7191ee9325 Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master' 
Update char_selection.ftl

See merge request veloren/veloren!3711
 2022-11-30 15:18:04 +00:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
electro79
b5cb66d053 Update char_selection.ftl 2022-11-29 21:56:21 +00:00
DaforLynx
d338906b19 More music and artist links 2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1 Merge branch 'master' into 'master' 
Italian transaltion

See merge request veloren/veloren!3687
 2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8 Italian transaltion 2022-11-21 16:24:06 +00:00
Marcel
107cc8963f Merge branch 'Halosesparta13-master-patch-90913' into 'master' 
Translation for the "ability.ftl" file to the es_LA folder

See merge request veloren/veloren!3613
 2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32 Translation for the "ability.ftl" file to the es_LA folder 2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8 Merge branch 'kuba1001t/update-pl_PL' into 'master' 
Update polish translations

See merge request veloren/veloren!3677
 2022-11-20 18:13:01 +00:00
Marcel
833ae2331a Merge branch 'tygyh/Swedish-translations' into 'master' 
Update swedish translations

See merge request veloren/veloren!3682
 2022-11-20 18:12:59 +00:00
Justin Shipsey
aa2fabcd45 Merge branch 'mossdrake' into 'master' 
Moss Drake

See merge request veloren/veloren!3693
 2022-11-12 13:00:44 +00:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Justin Shipsey
420e824a3e Merge branch 'train-track-shadows' into 'master' 
Train track shadows

See merge request veloren/veloren!3688
 2022-11-12 13:00:24 +00:00
Christof Petig
a820eee289 Merge branch 'floppy-bat-wing-tweaks' into 'master' 
tweak bat wing animation

See merge request veloren/veloren!3684
 2022-11-12 10:18:11 +00:00
flo
df70381a7c tweak bat wing animation 2022-11-12 10:18:10 +00:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
DaforLynx
b2b14e7ab4 Event music can use more than one event at a time. Added test for soundtracks. 2022-11-07 22:39:25 +00:00
Avi Weinstock
18657fdb66 Render train tracks to the shadow map. 2022-11-06 20:54:58 -05:00
Avi Weinstock
db251273ed Apply shadow map shadows to train tracks. 2022-11-06 18:09:07 -05:00
Samuel Keiffer
72bffe0df8 Merge branch 'train-tracks' into 'master' 
Train tracks

See merge request veloren/veloren!3679
 2022-11-05 22:56:07 +00:00
Avi Weinstock
f5c1293e9f Address review comments for MR 3679: 
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
 2022-11-03 15:20:53 -04:00
Joshua Barretto
b64ca9e698 Tweaked door opening, many entities push grass 2022-11-02 14:44:18 +00:00
Avi Weinstock
ff5acf18d7 Doors now animate opening when entities are near them. 2022-11-01 19:29:51 -04:00
tygyh
abd2e0832f Update swedish translations 2022-11-01 11:05:51 +01:00
Avi Weinstock
08a50afd9f Mostly working train tracks. 2022-10-28 21:36:42 -04:00
Kuba 1001
92465bfe59 lang(pl_PL): update polish translations 2022-10-28 17:46:17 +02:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
1782408676 Address UX issues of contextual abilities. 2022-10-27 20:07:08 -04:00
Sam
bc8f794309 New ability icons 2022-10-27 20:06:59 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed. 
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
 2022-10-27 20:06:55 -04:00
Sam
356c26cc66 UI for sword skill tree. 2022-10-27 20:06:54 -04:00
Sam
871d480639 Combo related skill icons 2022-10-27 20:06:50 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
fd05795b4c Titles and descriptions for each ability. 2022-10-27 20:06:31 -04:00
flo
42ffb54fd7 fix soundtrack 2022-10-27 17:40:51 +00:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
DaforLynx
926c1bc533 Halloween soundtrack with automatic functionality 2022-10-27 06:56:39 +00:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Joshua Barretto
4db88bb22c Better sampling of noisy regions 2022-10-27 01:15:21 +01:00
Joshua Barretto
589f59b771 Improve FxUpscale quality for distant objects 2022-10-27 01:15:21 +01:00
Joshua Barretto
f29b1da583 Implemented FxUpscale 2022-10-27 01:15:20 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master' 
Improve and fix Thai translation.

See merge request veloren/veloren!3666
 2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master' 
Halloween event

See merge request veloren/veloren!3668
 2022-10-25 21:37:34 +00:00
IsseW
18659f7d09 Consumable sounds 2022-10-25 00:31:33 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
9b692d072f Added checkbox in the settings for poisebar 
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
 2022-10-24 22:05:11 +05:30
kitswas
65e6db9ef8 Separated the poise images 
The energy images were duplicated.
 2022-10-24 22:05:11 +05:30
Joshua Barretto
428816c65e Addressed review comments 2022-10-23 23:54:55 +01:00