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
Marcel
640d968eff Merge branch 'GiocArt/update-it_IT' into 'master' 
Update to the Italian translations

See merge request veloren/veloren!2830
 2021-09-14 09:07:38 +00:00
GiocArt
16ec718a67 Update to the Italian translations 2021-09-14 09:07:38 +00:00
Samuel Keiffer
73d3d3e4bb Merge branch 'sam/health-float' into 'master' 
Turned Health into a Float

See merge request veloren/veloren!2824
 2021-09-13 15:23:18 +00:00
Imbris
a77f981b15 Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue 2021-09-10 12:16:55 -04:00
Monty Marz
1d94adc2e1 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
42012fddcb Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Joshua Barretto
c3a0a1b8b5 Made the camera go dark if in a filled block and not moderator 2021-09-08 12:37:15 +01:00
Monty Marz
a23433b402 Bloom settings 2021-09-08 09:50:37 +00:00
Joshua Barretto
b4697555d2 Merge branch 'slipped/icons' into 'master' 
isometric icons

See merge request veloren/veloren!2811
 2021-09-05 00:42:54 +00:00
jshipsey
1a5fd6cfea isometric icons 2021-09-04 19:51:02 -04:00
Marcel
9966e5175c Merge branch 'master' into 'master' 
Added translation for Serbian language

See merge request veloren/veloren!2795
 2021-09-04 23:44:22 +00:00
komamch eros
a1f2c46f30 Added translation for Serbian language 2021-09-04 23:44:22 +00:00
Joshua Yanovski
5500435d2f Revert "Replace shaderc with naga" 
This reverts commit 446d93dda0.
 2021-09-04 11:59:18 -07:00
jshipsey
523a15e5cc more spots 2021-09-04 00:18:58 -04:00
Marcel
ad5cb064e2 Merge branch 'juliancoffee/i18n_formatting' into 'master' 
(en) i18n cleaning

See merge request veloren/veloren!2798
 2021-09-01 22:47:36 +00:00
juliancoffee
f157f8efca (en) i18n cleaning 2021-09-01 19:38:59 +03:00
Imbris
16e2550e46 Merge branch 'capucho/naga' into 'master' 
Replace shaderc with naga

See merge request veloren/veloren!2749
 2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
Monty Marz
13c15b3840 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Monty Marz
7ced7e184e witch lantern 2021-08-28 14:53:31 +01:00
Monty Marz
a8aaeaebec emergency single voxel window fix 2021-08-28 14:53:30 +01:00
Monty Marz
771a380e6c witch stuff 2021-08-28 14:53:30 +01:00
Marcel
738136e70f Merge branch 'alxly/update-ru_RU' into 'master' 
alxly/update-ru_RU: add ru_RU missed translations

See merge request veloren/veloren!2757
 2021-08-17 12:18:33 +00:00
AlxlY
4b62797f03 alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
Marcel
7158ae1936 Merge branch 'update_pt_BR_20210810' into 'master' 
update pt_br translation 2021_08_10

See merge request veloren/veloren!2753
 2021-08-13 07:17:01 +00:00
Nícolas Wildner
dc4574aa49 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
AlxlY
bd26d2ad2a alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
AlxlY
b8f37f474b alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
Marcel
0bedfde53e Merge branch 'trade-window-improvements' into 'master' 
UI: Fixes and enhancements to the trading window

See merge request veloren/veloren!2738
 2021-08-11 09:25:17 +00:00
AlxlY
d47620959b alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
AlxlY
18a6ff3f31 alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
Samuel Keiffer
d5feca45c5 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' 
Consolidate redundant stage sections

See merge request veloren/veloren!2748
 2021-08-10 01:23:26 +00:00
Sam
2103abbb76 Fixed sfx file after consolidation. 2021-08-09 20:24:04 -04:00
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Xeriab Nabil
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
juliancoffee
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
Xeriab Nabil
ea5de81f9b UI: Fixes and enhancements to trading window 2021-08-06 17:11:54 +03:00
João Capucho
c4214fedbe
Don't use derivatives in vertex shader 2021-08-04 23:14:08 +01:00
Monty Marz
a1e22df944 Merge branch 'transp---opacity-in-UI' into 'master' 
transparency -> opacity

See merge request veloren/veloren!2714
 2021-08-02 21:30:37 +00:00
Monty Marz
bceed44614 transp -> opacity 2021-08-02 22:49:10 +02:00
Imbris
a1026c36f5 Make bloom intensity configurable, make whether less blurred layers are added in toggleable, hold onto copy of pipeline modes instead of returning it from pipeline creation 2021-08-01 18:50:39 -04:00
Imbris
6cabd74871 Make bloom optional with a config option that is not exposed in the UI (to give artists time to refine bloom before exposing the option) 2021-08-01 18:50:38 -04:00
Imbris
bfdee903dd Add some of the changes from zesterer's patch including decreasing figure glow power, increasing glow of some particles, and fixing water normal normalization 2021-08-01 18:50:38 -04:00
Imbris
7da064fb23 Add ability to edit shader to enable filtering dim values for experimentation 2021-08-01 18:50:38 -04:00
Imbris
29bfee26c0 Add bloom passes in character select screen, use proper source image for bloom after clouds are applied, add blurred and less blurred stages of bloom together (experimental could remove), add filtering downsample pass that is not yet used 2021-08-01 18:50:37 -04:00
Imbris
74e01f10e3 Fixes and extra bloom 2021-08-01 18:50:37 -04:00
Imbris
2d83ef1c0e Initial bloom impl 2021-08-01 18:50:37 -04:00
Marcel Märtens
5012e2ba8b rename hud_settings to settings 2021-08-01 13:47:03 +02:00
Marcel Märtens
bb026ca21b move vector map out of manifest and switch to new manifest format 2021-08-01 13:12:01 +02:00
Marcel Märtens
49072702bc fix #1258 2021-08-01 11:20:51 +02:00
Marcel Märtens
2fd26bf41c make folders POSIX style and move skills to hud 2021-08-01 10:56:10 +02:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Imbris
97e5ad02ff Merge branch 'imbris/stamina-energy' into 'master' 
Replace stamina with energy

Closes #1214

See merge request veloren/veloren!2704
 2021-08-01 00:26:59 +00:00
João Capucho
82489782b4
Fix uniformity bug in ui shader 2021-07-31 21:34:29 +01:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Monty Marz
f3d0d3f46a fix i18n 2021-07-31 18:17:34 +02:00
Imbris
c5c8ae4d30 Replace stamina -> energy in english localization strings 2021-07-31 01:35:28 -04:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
João Capucho
c56ecee988
Fix non uniform control flow in shader 2021-07-29 18:05:27 +01:00
Marcel
7ef11a41ef Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master' 
Added fr translation for gameinput.greet

See merge request veloren/veloren!2685
 2021-07-28 15:52:16 +00:00
Marcel
7a3755b7b0 Merge branch 'tygyh/Update-missing-swedish-translations' into 'master' 
Tygyh/update missing swedish translations

See merge request veloren/veloren!2667
 2021-07-27 11:14:52 +00:00
Jonathan Berglin
a564602495 Tygyh/update missing swedish translations 2021-07-27 11:14:52 +00:00
Nico Janzen
84b010f16f Fix spelling errors in German translations 2021-07-27 11:06:22 +00:00
Alexis Maheu
9ed6abd3d7 Added fr translation for gameinput.greet 2021-07-26 20:29:30 -04:00
DanTheOne
18b5c1c35a Add shortcut to toggle chat 2021-07-26 02:42:35 +02:00
juliancoffee
7386da743e (uk_UA) address feedback 2021-07-24 18:34:57 +03:00
juliancoffee
2e72f5e1c2 (uk_UA) misc hud translation 2021-07-24 01:50:14 +03:00
juliancoffee
d1f9e34fc3 (uk_UA) force update 2021-07-24 01:13:50 +03:00
juliancoffee
0e3e3bef4e (uk_UA) MEAT translation 2021-07-24 01:13:02 +03:00
juliancoffee
eb3dd0a812 (uk_UA) graphics settings translation 2021-07-24 00:26:38 +03:00
juliancoffee
70a390e1d2 (uk_UA) frozen outcome translation 2021-07-24 00:12:41 +03:00
juliancoffee
c55bcd3475 (uk_UA) gameinput.greet translation 
Здоровенькі були
 2021-07-24 00:07:26 +03:00
juliancoffee
d0b15fa042 (uk_UA) update debuff translation 2021-07-24 00:03:34 +03:00
juliancoffee
a1bc725654 (uk_UA) update mining skills translation 2021-07-23 23:07:15 +03:00
juliancoffee
226dcb9f1a (uk_UA) update healing aura skill translation 2021-07-23 22:44:14 +03:00
juliancoffee
5516e91cfe (uk_UA) update bow skills translation 2021-07-23 22:18:49 +03:00
schnippl0r
342de16d2e Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +02:00
Snowram
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Joshua Barretto
2e6fcd1f37 Merge branch 'zesterer/better-sunsets' into 'master' 
More sunset variation for higher graphics modes

See merge request veloren/veloren!2630
 2021-07-18 00:59:22 +00:00
Joshua Barretto
7686023430 Merge branch 'aweinstock/hats' into 'master' 
Basic implementation of hat visuals.

See merge request veloren/veloren!2485
 2021-07-17 19:42:26 +00:00
Joshua Barretto
5bdea9249c More sunset variation for higher graphics modes 2021-07-17 19:00:12 +01:00
Forest Anderson
54eb2a3ff7 Merge branch 'aylana/asp-sfx' into 'master' 
Princess-Lana - Add asp sound effects for the game

See merge request veloren/veloren!2611
 2021-07-17 01:49:20 +00:00
Avi Weinstock
13fc4de561 Add per-species head offsets. 2021-07-16 19:22:28 -04:00
Avi Weinstock
0a33c98268 Basic implementation of hat visuals. 2021-07-16 18:49:40 -04:00
Samuel Keiffer
f38cde9d40 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Monty Marz
01c9d6d6d0 icon 2021-07-16 18:39:14 +02:00
Marcel
1aa816a780 Merge branch 'zesterer/sfx' into 'master' 
Clipped arrow sound effects for more immediate feedback

See merge request veloren/veloren!2476
 2021-07-16 10:32:29 +00:00
Aylana
a3da5b31d6 Add asp sound effects 2021-07-15 20:15:36 +02:00
Sam
997da21001 Particles for healing aura 2021-07-13 20:54:43 -05:00
Monty Marz
e379aacf8c char selection frames, adjustments 2021-07-13 13:31:01 +02:00
Knightress Paladin
42c3872528 Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
Szabó Lambert
0140e75ed4 Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files) 2021-07-10 17:25:56 +00:00
Samuel Keiffer
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00
Monty Marz
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
juliancoffee
20c0c7f44f Use code-spliced values for i18n skill description 2021-07-07 17:51:30 +03:00
Swagazaki
cb3e932832 Just updated common.ron to correct a few French translations! 2021-07-07 10:55:15 +00:00
Ács Zoltán
9fbd8ae5ce Add Hungarian translation 2021-07-05 15:14:35 +02:00
Ács Zoltán
5f3251ce60 Add support for ő and ű to the haxrcorp font 2021-07-05 15:12:27 +02:00
Joshua Barretto
269c6171e4 Merge branch 'DaforLynx/aeh' into 'master' 
Sfx fixes and new test

See merge request veloren/veloren!2529
 2021-06-30 11:43:01 +00:00