3747 Commits

Author SHA1 Message Date
Ygor Souza
9af9e58a85 Use all armor stats to calculate combat rating
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
2021-08-16 19:59:54 +02:00
Imbris
81cfab39cb Merge branch 'master' into 'master'
Add WGPU adapter selection using WGPU_ADAPTER

See merge request veloren/veloren!2747
2021-08-14 18:09:51 +00:00
DanTheOne
d1faf548de Refactor sound settings window 2021-08-14 14:24:06 +02:00
DanTheOne
988a1ff6ed Add music and sfx volume numbers 2021-08-14 12:25:21 +02:00
Daniil Nemtsev
59f92f9642 Add WGPU adapter selection using WGPU_ADAPTER 2021-08-13 12:39:44 +00:00
Joshua Barretto
5f310163ef Merge branch 'min-persistent-world' into 'master'
min-persistent-world

See merge request veloren/veloren!2662
2021-08-13 12:30:28 +00:00
Xeriab Nabil
5de71b1982 Small fix for trade window headers 2021-08-12 21:56:38 +03:00
Joshua Barretto
432bfa91d9 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00
Marcel
99d94202ea Merge branch 'fix-1278' into 'master'
Fixes the issue mentioned in #1278

See merge request veloren/veloren!2760
2021-08-12 07:24:16 +00:00
Xeriab Nabil
53d1708448 Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03:00
Marcel
d85fc21d3d Merge branch 'xMAC94x/fix_1165' into 'master'
remove futures_executor from renderer and rather pass tokio runtime to it...

See merge request veloren/veloren!2755
2021-08-11 15:26:08 +00: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
Marcel Märtens
8b04770525 code cleanup 2021-08-11 09:42:29 +02:00
Marcel Märtens
a3fda18b63 zest prefers this over await 2021-08-11 01:23:48 +02:00
Illia Denysenko
008790fad7 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
Marcel Märtens
9201b3da42 remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt 2021-08-11 00:38:03 +02:00
Tavo Annus
ed9699b048 Fix skybox jumping 2021-08-10 14:01:09 +02:00
Tavo Annus
f37b9a2c76 Use old strategy for far distances 2021-08-10 14:00:59 +02:00
Tavo Annus
3d6f3eaa69 Minor tweaks to clipping, style fixes 2021-08-10 14:00:51 +02:00
Tavo Annus
d18055e650 Allow trees to pass between character and camera for bigger distances 2021-08-10 14:00:42 +02:00
Tavo Annus
27cdaed7ad Fix character being too close in menu 2021-08-10 14:00:34 +02:00
Tavo Annus
5c788a2354 Fix camera shaking & Style fixes 2021-08-10 14:00:13 +02:00
Tavo Annus
b214e68237 Improve camera clipping 2021-08-10 13:59:41 +02: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
Snowram
efbf538569 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Sam
571fe8aa0d Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
pacmanmati
495e604dfc #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
Treeco
a8559c61f2 Make each race's hitbox and weight scale linearly with their height
This causes all humanoids to handle identically when falling, gliding, or swimming
2021-08-09 10:06:16 +01:00
Ludvig Böklin
ae866ac7c6 Improve gliding
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
2021-08-09 10:06:16 +01:00
Xeriab Nabil
c1d7aec7f1 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
Illia Denysenko
d304aaebe9 Gliding Debug Info 2021-08-07 13:19:58 +00:00
juliancoffee
a8b73e0bba Shift egui debug window right 2021-08-06 22:58:36 +03:00
juliancoffee
65d4d692f2 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
juliancoffee
0fcfec73e6 Add option 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
Marcel Märtens
3710e88c1a write header only once 2021-08-06 12:02:22 +02:00
Marcel
b7bd81388c Merge branch 'umr1352/fix#1260' into 'master'
fix issue #1260: give a warning if an error occurs on language files load

Closes #1260

See merge request veloren/veloren!2724
2021-08-03 21:09:06 +00:00
Enrico Marconi
f2ce496d0e fix issue #1260: give a warning if an error occurs on language files load 2021-08-03 21:09:05 +00:00
Yusuf Bera Ertan
0d41fab95c
build: update keyboard-keynames 2021-08-03 18:16:55 +03:00
Imbris
281e2c4d5b Add custom error message when there are no compatible graphics backends available 2021-08-03 00:00:30 -04: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
Marcel Märtens
3717ca2b8f move translation check to seperate ci step
note: TAGUUID is used to avoid sqlinjections by choosing a branch name
2021-08-02 20:11:02 +02:00
Dr. Dystopia
f70187bfeb Add 'UpdateArgs import to 'buttons' file 2021-08-02 13:33:52 +02:00
Dr. Dystopia
e667208a9a Create 'animation' file 2021-08-02 13:27:33 +02:00
Dr. Dystopia
5754fea270 Move variables closer to usage in 'buttons' file 2021-08-02 13:27:28 +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
48d7e31b41 Enhance bloom::NUM_SIZES docs, add TODO, remove dbgs 2021-08-01 18:50:38 -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
088d2077a1 Add ability to edit shader to enable filtering dim values for experimentation 2021-08-01 18:50:38 -04:00