Imbris
a3ac3b51ce
Merge branch 'capucho/iced-checkbox' into 'master'
...
Add checkbox rendering logic for iced
See merge request veloren/veloren!2827
2021-09-15 17:30:57 +00:00
João Capucho
80190c408d
Improve naming of checkbox images related methods
2021-09-15 15:41:31 +01:00
João Capucho
f27a7853a3
Add option for a hovered and checked background
2021-09-15 15:15:03 +01:00
Monty Marz
0dfddb21b1
Merge branch 'bafon/always-show-bars-setting' into 'master'
...
Add setting to always show energy bars
See merge request veloren/veloren!2836
2021-09-15 12:04:44 +00:00
Bafon
b910c1dd9c
Add setting to always show energy bars
2021-09-15 12:04:44 +00:00
Marcel
d13391f16e
Merge branch 'bafon/map-mouse-events' into 'master'
...
Fix HUD map mouse events
See merge request veloren/veloren!2837
2021-09-14 22:19:31 +00:00
Bafon
eecab6e9ec
Fix HUD map mouse events
...
Fixes dragging, scrolling, and setting the location marker when hovering player marker, location marker, group member markers, site icons, and peaks.
2021-09-14 23:42:04 +02:00
Sam
3d31248ced
Fixed health ui in few places and xp scaling from health.
2021-09-14 10:55:14 -04:00
Joshua Barretto
4118835fb3
Fixed incorrect winding order for debug cylinder triangles
2021-09-13 18:15:12 +00:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
b26ceb6339
Removed a few unnecessary casts.
2021-09-13 10:41:55 -04:00
João Capucho
5323bb3ce8
Add checkbox rendering logic for iced
2021-09-10 21:17:06 +01:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Marcel Märtens
7913e6a9ba
Change the version number to 0.11
2021-09-10 20:19:17 +02:00
Imbris
a77f981b15
Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue
2021-09-10 12:16:55 -04:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04: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
