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,917 Commits 151 Branches 18 Tags 2.1 GiB
26a98a3d9b
Commit Graph

12917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
26a98a3d9b Use normal and material gbuffer to improve quality of SSR 2022-12-30 15:33:23 +00:00
Joshua Barretto
0052af85bc Merge branch 'zesterer/separate-volumetrics-and-transparents' into 'master' 
Separated volumetrics and transparents into independent passes to fix UB

See merge request veloren/veloren!3732
 2022-12-29 20:09:12 +00:00
Joshua Barretto
e87b5739f0 Separated volumetrics and transparents into independent passes to fix UB 2022-12-29 18:38:25 +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
b19d02f7e9 Merge branch 'pfau/bag_icon' into 'master' 
Bag icon improvement

See merge request veloren/veloren!3731
 2022-12-23 15:22:14 +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
836ae17b51 Merge branch 'fix_spanish' into 'master' 
fix spanish file movement

See merge request veloren/veloren!3725
 2022-12-15 22:20:14 +00:00
Marcel Märtens
b8afaafe69 fix spanish file movement 2022-12-15 21:39:59 +01:00
Imbris
c90be1b56c Merge branch 'muphblu/item-img-export' into 'master' 
Items images export for wiki

Closes #1334

See merge request veloren/veloren!3494
 2022-12-15 16:19:49 +00:00
Aidar Shaikhiev
cccc796d31 Items images export for wiki 2022-12-15 16:19:49 +00:00
Marcel
b328377979 Merge branch 'assets_manager-0.9' into 'master' 
Update to `assets_manager 0.9

See merge request veloren/veloren!3723
 2022-12-15 11:34:46 +00:00
LunarEclipse
719520e296 Merge branch 'jgayfer/fix-macos-controller-input' into 'master' 
Fix Xbox controller mappings on MacOS

See merge request veloren/veloren!3724
 2022-12-15 09:11:13 +00:00
James Gayfer
0badaaa4ba Fix Xbox controller mappings on MacOS 
After downloading the game onto my M1 Macbook, I wasn't able to get my
Xbox Series X controller to work properly. The mappings seems all over
the place in ways that didn't make sense, like the right analog stick
bound to primary and secondary attack.

I looked deeper into how controller binds work, and saw that they're
mostly all mapped to sane defaults via gilrs. I setup a test project
that mirrored gilrs's "hello world" example for controller inputs, and
noted that the inputs were logged as expected. This is when I noted the
version mismatch, as Veleron was using 0.9, while my project was using
0.10. After rolling back to 0.9 in my test project, I was able to
reproduce the incorrect mappings.

With the bump to 0.10, controller mappings respect our configured
defaults for my Xbox Series X controller on MacOS.
 2022-12-13 21:42:32 -08:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01:00
Joshua Barretto
4a5bc05050 Merge branch 'mentos1386/fix_llama_standing_kick' into 'master' 
Fixes #1563 - Implements Quad Med Hoof tactic/attack

Closes #1563

See merge request veloren/veloren!3722
 2022-12-13 21:21:53 +00:00
Tine Jozelj
e77537365f Fixes #1563 - Implements Quad Med Hoof tactic/attack 2022-12-13 21:16:48 +01:00
Francesco Vasco
03fae4f434 Italian: hud-map-bridge 2022-12-13 19:36:54 +01:00
Marcel
80a4d7f134 Merge branch 'GammaJPG-master-patch-08316' into 'master' 
update the Spanish translation

See merge request veloren/veloren!3719
 2022-12-05 13:20:54 +00:00
Gamma
0e2fe6ff15 update the Spanish translation 2022-12-04 23:43:51 +00:00
Marcel
0ba5558d7f Merge branch 'master' into 'master' 
Russian translation fixes

See merge request veloren/veloren!3716
 2022-12-04 18:45:59 +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
Isse
def6d1911b Merge branch 'isse/creature-viewpoint' into 'master' 
Creature viewpoint

See merge request veloren/veloren!3712
 2022-11-30 16:22:23 +00:00
IsseW
54bad4b205 Creature viewpoint 2022-11-30 16:51:02 +01: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
Isse
ef2c1633ed Merge branch 'isse/bridges' into 'master' 
Bridges

See merge request veloren/veloren!3680
 2022-11-30 15:07:03 +00:00
Marcel
a813b80850 Merge branch 'xMAC94x/clippy_cleanup' into 'master' 
fix leftovers from toolchain update

See merge request veloren/veloren!3713
 2022-11-30 14:31:28 +00:00
Marcel Märtens
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
Isse
02eadc3002 add doc comment 2022-11-30 15:13:52 +01:00
Isse
560d5c3153 fix doc test 2022-11-30 15:13:52 +01:00
Isse
c81fbf50c4 Fix cylinder primitive and better ramp function 2022-11-30 15:13:52 +01:00
Isse
dda54bcb01 small fixes 2022-11-30 15:13:52 +01:00
IsseW
dd8c429cfc changelog entry 2022-11-30 15:13:52 +01:00