Ben Wallis
823120f923
Hacked in support for tokio console-subscriber
2021-09-09 11:35:07 +01:00
Joshua Barretto
c442822885
Capped camera distance without privilege
2021-09-08 13:17:22 +01:00
Joshua Barretto
c3a0a1b8b5
Made the camera go dark if in a filled block and not moderator
2021-09-08 12:37:15 +01:00
Monty Marz
a23433b402
Bloom settings
2021-09-08 09:50:37 +00:00
Joshua Yanovski
5500435d2f
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0
2021-09-04 11:59:18 -07:00
jshipsey
6187cb8d23
address comments
2021-09-04 13:17:56 -04:00
jshipsey
523a15e5cc
more spots
2021-09-04 00:18:58 -04:00
Marcel Märtens
02d6462858
disable mumble-link on macos
2021-09-04 00:32:16 +02:00
juliancoffee
6c1ecc9766
Add support for override asset folder
...
- ASSETS_OVERRIDE environment variable with asset path which has higher
priority.
2021-09-02 20:24:23 +03:00
Marcel
970d57f905
Merge branch 'juliancoffee/skill_boost_rework' into 'master'
...
ECS & Diary info synchronization
See merge request veloren/veloren!2771
2021-09-02 16:04:23 +00:00
Marcel Märtens
cf1a6b1806
switch to SharedLink and unset context
2021-09-02 12:29:01 +02:00
Imbris
16e2550e46
Merge branch 'capucho/naga' into 'master'
...
Replace shaderc with naga
See merge request veloren/veloren!2749
2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga
2021-08-31 22:53:10 +01:00
jshipsey
42a0dd785b
finished anim
2021-08-31 13:37:35 -04:00
Sam
44c3b0f153
Added attack hook event, attacks now cancel item use and sprite interaction.
2021-08-31 13:37:32 -04:00
Sam
513982ca43
Fixed compile error when importing sprite position.
2021-08-31 13:36:05 -04:00
jshipsey
3ddcde645f
anim basics
2021-08-31 13:36:04 -04:00
Joshua Barretto
171e329609
Merge branch 'xvar/fix-egui-toggle' into 'master'
...
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled
See merge request veloren/veloren!2793
2021-08-31 17:07:13 +00:00
Ben Wallis
ad079377fb
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled
2021-08-31 17:21:13 +01:00
Joshua Barretto
6f15233448
Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed
2021-08-31 13:31:52 +01:00
Monty Marz
13c15b3840
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Joshua Barretto
8b8adcc1b8
More block particles, changes ore vein colour
2021-08-28 14:53:30 +01:00
juliancoffee
24569b544a
Rewrite multiplier_to_percentage to return f32
2021-08-28 02:36:26 +03:00
juliancoffee
75a0ce429f
Handle some skill description in special way
2021-08-26 14:49:52 +03:00
juliancoffee
758fe19ccb
Declarative skill icons
2021-08-26 14:49:52 +03:00
juliancoffee
9211b4a00a
Inline skills::Boost to voxygen code
2021-08-26 14:49:52 +03:00
juliancoffee
74183ae5ec
Inline redundant functions
2021-08-26 14:49:52 +03:00
juliancoffee
cc8b3c188e
Split skilltree window handling per tree
2021-08-26 14:49:52 +03:00
juliancoffee
39b02411e9
Use PositionSpecifier for skill position
2021-08-26 14:49:52 +03:00
juliancoffee
9aacc33495
Inline create_new_text
2021-08-26 14:49:52 +03:00
juliancoffee
d76f65fc5a
Diary refactoring
2021-08-26 14:49:52 +03: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
Joshua Barretto
5e7e560c10
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
05df63dd79
Small fix for trade window headers
2021-08-12 21:56:38 +03:00
Joshua Barretto
c2498d81c7
Added feature flag for terrain persistence
2021-08-12 10:48:00 +01: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
