Commit Graph

2159 Commits

Author SHA1 Message Date
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
680492cea6 Merge branch 'juliancoffee/entity_refactor' into 'master'
Improve terms of EntityConfig and LoadoutBuilder

See merge request veloren/veloren!2688
2021-07-28 23:19:04 +00:00
juliancoffee
14ac9a8b4e Improve terms of EntityConfig and LoadoutBuilder
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
2021-07-28 19:19:10 +03: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
Joshua Barretto
43ae09d2f0 Merge branch 'juliancoffee/update-uk_UA' into 'master'
update (uk_UA) translation

See merge request veloren/veloren!2669
2021-07-24 19:56:21 +00:00
juliancoffee
7386da743e (uk_UA) address feedback 2021-07-24 18:34:57 +03:00
Joshua Barretto
4bfc92c65d Changed singleplayer map for a better default experience 2021-07-24 11:56:08 +01: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
Samuel Keiffer
85b9f70469 Merge branch 'knightresspaladin/fix-circle-charge' into 'master'
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request veloren/veloren!2613
2021-07-23 14:56:36 +00:00
schnippl0r
342de16d2e Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +02:00
Knightress Paladin
7766aeb9eb Made Ngoubou rarer to spawn 2021-07-18 23:21:41 -07:00
Knightress Paladin
081c6e5362 Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Snowram
09cbb90f61 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Samuel Keiffer
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master'
Wildlife assetization

See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00: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