Marcel
8777d12afd
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
73fdd0c5ec
alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity
2021-08-16 22:04:17 +02:00
juliancoffee
3b332b9213
Add ori_modifier for DashMelee and nerf it
...
* 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-16 17:27:59 +03:00
juliancoffee
1baef392e6
Abilitiy tweaks
...
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
2021-08-15 23:20:21 +03:00
Marcel
f3afdc681a
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
cc1e7f3804
update pt_br translation 2021_08_10
2021-08-13 07:17:01 +00:00
AlxlY
a5cc713be0
alxly/update-ru_RU: updated transation after review.
2021-08-12 00:16:45 +02:00
AlxlY
b173c71840
alxly/update-ru_RU: fix translation based on @CodeReview comments.
2021-08-11 13:37:05 +02:00
Marcel
a049aa1e32
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
54f6a71637
alxly/update-ru_RU: added proper translations after review. changed indentation to spaces
2021-08-11 00:48:48 +02:00
AlxlY
743865d25e
alxl/update-ru_RU: add ru_RU missed translations
2021-08-10 23:36:02 +02:00
juliancoffee
a93c6931d4
Implement /kit all and a bit of refactoring
...
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
2021-08-10 13:28:38 +03:00
Samuel Keiffer
756249fd04
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
4ecf8649c4
Fixed sfx file after consolidation.
2021-08-09 20:24:04 -04:00
Snowram
efbf538569
Makes dungeons start at level 1 visually
2021-08-09 16:36:37 +02:00
juliancoffee
fc0a66bae0
Tweak boss knockback abilities
...
Tweak Mindflayer vortex knockback (make it rarer)
Tweak Tidal Warrior pincer and wave knockback
Tweak claygolem rocket and shockwave knockback
Tweak Yeti shockwave and strike knockback
2021-08-09 13:05:01 +03:00
juliancoffee
d054ff0162
Complete skill preset "max" with sceptre HDuration
2021-08-09 10:09:12 +01:00
Xeriab Nabil
c1d7aec7f1
UI: Fixes and enhancements to trading window
2021-08-08 20:11:54 +03:00
Samuel Keiffer
3b3bf10e4a
Merge branch 'juliancoffee/pillar_fix' into 'master'
...
Nerf pillars + Fix Beam ori
See merge request veloren/veloren!2732
2021-08-07 16:35:24 +00:00
juliancoffee
65d4d692f2
Add hotkey to toggle Egui Debug
2021-08-06 22:58:36 +03:00
Xeriab Nabil
4c02227de7
UI: Fixes and enhancements to trading window
2021-08-06 17:11:54 +03:00
juliancoffee
163d37e3fc
Fix Beam orientation, remove orientation_behavior
...
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
2021-08-05 21:07:46 +03:00
João Capucho
c9ea426687
Don't use derivatives in vertex shader
2021-08-04 23:14:08 +01:00
Knightress Paladin
7604c6794a
Removed extra Warlock skills and made sceptre cultists rarer
2021-08-02 16:22:40 -07:00
Knightress Paladin
8d88457434
Restructured logic for staff AI
2021-08-02 16:22:40 -07:00
Monty Marz
135e631734
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
79e9313f60
transp -> opacity
2021-08-02 22:49:10 +02:00
Imbris
4719f1f26d
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
47d8b71839
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
d8c080afde
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
088d2077a1
Add ability to edit shader to enable filtering dim values for experimentation
2021-08-01 18:50:38 -04:00
Imbris
c85b5e13cb
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
1de1f4858d
Fixes and extra bloom
2021-08-01 18:50:37 -04:00
Imbris
df171671d8
Initial bloom impl
2021-08-01 18:50:37 -04:00
Marcel Märtens
3a1320634d
rename hud_settings to settings
2021-08-01 13:47:03 +02:00
Marcel Märtens
ad9ccada28
move vector map out of manifest and switch to new manifest format
2021-08-01 13:12:01 +02:00
Marcel Märtens
05d38559d2
fix #1258
2021-08-01 11:20:51 +02:00
Marcel Märtens
999e5130b9
make folders POSIX style and move skills to hud
2021-08-01 10:56:10 +02:00
Joshua Barretto
d74c2b47c8
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
59490b2a89
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
74008e342a
Fix uniformity bug in ui shader
2021-07-31 21:34:29 +01:00
Joshua Barretto
243790a0df
Added menacing, made agent code less hacky
2021-07-31 20:33:28 +01:00
Monty Marz
fddc2e9570
fix i18n
2021-07-31 18:17:34 +02:00
Imbris
6e3c070116
Replace stamina -> energy in english localization strings
2021-07-31 01:35:28 -04:00
Imbris
22b77a7a04
Replace stamina -> energy in code, i18n keys, and asset names
2021-07-31 01:34:40 -04:00
Monty Marz
2466cad155
Remove sceptre, add swords
2021-07-29 22:38:35 +00:00
João Capucho
4bcda1c395
Fix non uniform control flow in shader
2021-07-29 18:05:27 +01:00
Marcel
9b30bb9e7d
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
9c7f96b6c1
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
1116363aec
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
