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
10,138 Commits 151 Branches 18 Tags 2.1 GiB
3368f43a22
Commit Graph

1713 Commits

Author SHA1 Message Date
IsseW
6a85e231b4 Added part of tip 2021-10-26 00:15:09 +02:00
IsseW
047cda179f Added keybinding shortcut in loading tips 2021-10-25 23:53:27 +02:00
Doctor Kompot
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Nicolas Wildner
515f16d84e update pt_br 20211019 2021-10-18 14:19:52 -03:00
Samuel Keiffer
1e61a279cc Merge branch 'kaedr/pretty_printing_error_messages' into 'master' 
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)

See merge request veloren/veloren!2935
 2021-10-18 03:35:03 +00:00
Joshua Barretto
87293fb9df Fixed lantern lighting bug 2021-10-17 09:07:27 +01:00
kaedr
cc98ccc371 Added localization for server error message display on client 2021-10-16 20:17:38 -04:00
kaedr
eb02a4733d Fixed obfuscation of error messages caused by previous commits 2021-10-16 20:17:37 -04:00
Joshua Barretto
94b0288180 Merge branch 'zesterer/tiny-fixes' into 'master' 
Tiny fixes

See merge request veloren/veloren!2926
 2021-10-16 16:25:59 +00:00
Joshua Barretto
2b74071cdb Merge branch 'kalikatz/add_tools_to_sfx' into 'master' 
add pointers to sceptre and pickaxe pickup sounds

See merge request veloren/veloren!2934
 2021-10-16 16:04:20 +00:00
Joshua Barretto
ef33b2e3ab Better ambiance slider 2021-10-16 15:12:07 +01:00
Joshua Barretto
3322eeb365 Aurora light tint 2021-10-16 14:32:18 +01:00
Joshua Barretto
c4efb5fc68 Better moonlight, added aurora light 2021-10-16 14:31:46 +01:00
Joshua Barretto
53185639a0 Better aurora 2021-10-16 14:31:46 +01:00
Joshua Barretto
3357008601 Merge branch 'zesterer/small-fixes' into 'master' 
Caverns

See merge request veloren/veloren!2763
 2021-10-16 09:33:57 +00:00
Kali
8446fb9383 add pointers to sceptre and pickaxe pickup sounds 2021-10-15 15:40:18 -07:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Marcel
430ee87620 Merge branch 'Limofeus/russian_translation_updates' into 'master' 
Limofeus/russian translation updates

See merge request veloren/veloren!2920
 2021-10-12 17:15:49 +00:00
Limofeus
df1aab877b Upd #2 - removed mixed up tabs and spaces 2021-10-12 19:18:11 +03:00
GLawrence29
e1ea1193c2 i18n: Revised catalan (Catalonia) translation 2021-10-12 15:16:25 +02:00
Limofeus
a2d0911355 Upd #1 - Skills, Settings labels, Tools and Credits translations added 2021-10-12 16:09:55 +03:00
Marcel
94439a4240 Merge branch 'jtriantafylos/background_fps' into 'master' 
Fixes #1350 - Allow players to cap the game FPS when unfocused

Closes #1350

See merge request veloren/veloren!2890
 2021-10-10 15:33:38 +00:00
James Triantafylos
99776a6ebd Fixes #1350 - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00
Joshua Barretto
086097cd56 Better vines and lighting 2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12 cavern sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
f9c635c928 Silly GI for water in caves 2021-10-10 13:41:56 +01:00
Joshua Barretto
0f2afbec8f Fixed clouds and fluids underground 2021-10-10 13:41:56 +01:00
GLawrence29
e7f1260f1d Add catalan (Catalonia) language translation 2021-10-08 19:37:46 +02:00
Joshua Barretto
f13a8a643b Fixed water light extinction 2021-10-05 00:02:34 +01:00
Imbris
691b61e22d Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid. 2021-09-30 02:35:59 -04:00
Imbris
40240a4005 Add basic credits screen to the main menu with some example data loaded from a ron file 2021-09-29 21:06:52 -04:00
Jakub Janeček
8713e56c02 Update assets/voxygen/i18n/cz_CZ/hud/bag.ron, assets/voxygen/i18n/cz_CZ/hud/crafting.ron, assets/voxygen/i18n/cz_CZ/hud/char_window.ron, assets/voxygen/i18n/cz_CZ/hud/chat.ron, assets/voxygen/i18n/cz_CZ/hud/map.ron, assets/voxygen/i18n/cz_CZ/hud/misc.ron, assets/voxygen/i18n/cz_CZ/hud/sct.ron, assets/voxygen/i18n/cz_CZ/hud/settings.ron, assets/voxygen/i18n/cz_CZ/hud/skills.ron, assets/voxygen/i18n/cz_CZ/buff.ron, assets/voxygen/i18n/cz_CZ/char_selection.ron, assets/voxygen/i18n/cz_CZ/common.ron, assets/voxygen/i18n/cz_CZ/gameinput.ron, assets/voxygen/i18n/cz_CZ/main.ron files 2021-09-26 17:15:31 +00:00
Seth
d42d9166a1 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Bafon
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
Imbris
5217b5090c Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass 2021-09-22 21:58:36 -04:00
Marcel
d5b4c5549b Merge branch 'bafon/crafting-station-icons' into 'master' 
Add crafting station icon to crafting menu sidebar

See merge request veloren/veloren!2848
 2021-09-22 13:54:33 +00:00
Bafon
0375b973db Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Justin Shipsey
2c3640b527 Merge branch 'snowram/wyvern' into 'master' 
Snowram/wyvern

See merge request veloren/veloren!2847
 2021-09-21 14:20:33 +00:00
Marcel
a3452af599 Merge branch 'kimtinh/add-vietnamese' into 'master' 
Add Vietnamese translation

See merge request veloren/veloren!2856
 2021-09-21 14:10:40 +00:00
Snowram
9acae9fca0 More wyvern anim work 2021-09-21 15:30:42 +02:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
Mehmet Mallı
9745e7db6c Update buff.ron 2021-09-19 16:05:04 +00:00
Mehmet Mallı
bfb859fff1 added main Turkish translations 2021-09-19 17:36:31 +03:00
Mehmet Mallı
c001d5c0e2 added common Turkish translations 2021-09-19 17:36:05 +03:00
Mehmet Mallı
619bd5b56f changed Turkish translations for uncanny valley in char_selection 2021-09-19 17:35:41 +03:00
Mehmet Mallı
0444a6808f added Turkish translations for buffs 2021-09-19 17:35:08 +03:00
Trung Do
2059d39c7e Add Vietnamese translation 
Not translate skills.ron yet.
 2021-09-18 17:59:28 +07:00
juliancoffee
3b308a3f6f Add CapsulePrism collider variant 
+ Add placeholder physics collision implementation as copy of cylinder
  Box collider.
+ Display it with debug hitboxes.
 2021-09-17 13:28:34 +03:00
Monty Marz
0dfddb21b1 Merge branch 'bafon/always-show-bars-setting' into 'master' 
Add setting to always show energy bars

See merge request veloren/veloren!2836
 2021-09-15 12:04:44 +00:00
Bafon
b910c1dd9c Add setting to always show energy bars 2021-09-15 12:04:44 +00:00