Commit Graph

3502 Commits

Author SHA1 Message Date
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
flo
3131c178d6 Making Block and Slots1-9 available for gamepad mapping 2021-08-23 10:38:35 +00:00
Ygor Souza
54c3adf9af 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
16fe011061 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
de750e2f46 Refactor sound settings window 2021-08-14 14:24:06 +02:00
DanTheOne
9b555a52dc Add music and sfx volume numbers 2021-08-14 12:25:21 +02:00
Daniil Nemtsev
a5ec81844f Add WGPU adapter selection using WGPU_ADAPTER 2021-08-13 12:39:44 +00:00
Xeriab Nabil
05df63dd79 Small fix for trade window headers 2021-08-12 21:56:38 +03:00
Marcel
0dfc0d39dd 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
8ce679766a Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03:00
Marcel
add74cd0ea 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
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
Marcel Märtens
bc821a46cd code cleanup 2021-08-11 09:42:29 +02:00
Marcel Märtens
889a8d11f5 zest prefers this over await 2021-08-11 01:23:48 +02:00
Illia Denysenko
2a093a9991 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
Marcel Märtens
32e58c4b17 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
6114cbbcf3 Fix skybox jumping 2021-08-10 14:01:09 +02:00
Tavo Annus
5c5f172667 Use old strategy for far distances 2021-08-10 14:00:59 +02:00
Tavo Annus
06b8ad62d3 Minor tweaks to clipping, style fixes 2021-08-10 14:00:51 +02:00
Tavo Annus
ad075b55c9 Allow trees to pass between character and camera for bigger distances 2021-08-10 14:00:42 +02:00
Tavo Annus
e834711293 Fix character being too close in menu 2021-08-10 14:00:34 +02:00
Tavo Annus
a7aa37f7f6 Fix camera shaking & Style fixes 2021-08-10 14:00:13 +02:00
Tavo Annus
42dab09249 Improve camera clipping 2021-08-10 13:59:41 +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
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Sam
52ee598cf1 Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
pacmanmati
5f37509a78 #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
Ludvig Böklin
ebf489984c 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
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
juliancoffee
3411ccc7ee Shift egui debug window right 2021-08-06 22:58:36 +03:00
juliancoffee
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
juliancoffee
abf5a7e136 Add option 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
Imbris
427930081a Add custom error message when there are no compatible graphics backends available 2021-08-03 00:00:30 -04: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
Dr. Dystopia
e62d903041 Add 'UpdateArgs import to 'buttons' file 2021-08-02 13:33:52 +02:00
Dr. Dystopia
323e3166f5 Create 'animation' file 2021-08-02 13:27:33 +02:00
Dr. Dystopia
dffc91045e Move variables closer to usage in 'buttons' file 2021-08-02 13:27:28 +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
147e4f00f6 Enhance bloom::NUM_SIZES docs, add TODO, remove dbgs 2021-08-01 18:50:38 -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
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
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
Joshua Barretto
9426f72916 Merge branch 'imbris/tracy-mem' into 'master'
Add small feature to profile memory allocation with Tracy

See merge request veloren/veloren!2699
2021-07-31 21:54:28 +00:00
Monty Marz
f3d0d3f46a fix i18n 2021-07-31 18:17:34 +02:00