Commit Graph

2338 Commits

Author SHA1 Message Date
bbcd842208 Test spot entity spawning 2021-08-28 14:53:30 +01:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
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
4b62797f03 alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
130ae1f429 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
e3798e5d2a 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
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
dc4574aa49 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
bd26d2ad2a alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
b8f37f474b alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
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
d47620959b alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
18a6ff3f31 alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
3ac74a8259 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
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
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
172f19376a 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
58cfd690c3 Complete skill preset "max" with sceptre HDuration 2021-08-09 10:09:12 +01:00
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
2b10f818f5 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
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
ea5de81f9b UI: Fixes and enhancements to trading window 2021-08-06 17:11:54 +03:00
8a83ecf57f 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
c4214fedbe Don't use derivatives in vertex shader 2021-08-04 23:14:08 +01:00
998c56c524 Removed extra Warlock skills and made sceptre cultists rarer 2021-08-02 16:22:40 -07:00
38432cc880 Restructured logic for staff AI 2021-08-02 16:22:40 -07:00
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
bceed44614 transp -> opacity 2021-08-02 22:49:10 +02:00
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
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
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
7da064fb23 Add ability to edit shader to enable filtering dim values for experimentation 2021-08-01 18:50:38 -04:00
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
74e01f10e3 Fixes and extra bloom 2021-08-01 18:50:37 -04:00
2d83ef1c0e Initial bloom impl 2021-08-01 18:50:37 -04:00
5012e2ba8b rename hud_settings to settings 2021-08-01 13:47:03 +02:00
bb026ca21b move vector map out of manifest and switch to new manifest format 2021-08-01 13:12:01 +02:00
49072702bc fix #1258 2021-08-01 11:20:51 +02:00
2fd26bf41c make folders POSIX style and move skills to hud 2021-08-01 10:56:10 +02:00
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
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
82489782b4 Fix uniformity bug in ui shader 2021-07-31 21:34:29 +01:00
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
f3d0d3f46a fix i18n 2021-07-31 18:17:34 +02:00
c5c8ae4d30 Replace stamina -> energy in english localization strings 2021-07-31 01:35:28 -04:00
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
c56ecee988 Fix non uniform control flow in shader 2021-07-29 18:05:27 +01:00
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