flo
2955f75be1
change gamepad mapping
2021-09-30 18:48:42 +00:00
Joshua Barretto
dcd0c47247
Fixed incorrect winding order for debug cylinder triangles
2021-09-13 18:15:12 +00:00
Samuel Keiffer
0f7cd1baa4
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
e331082a97
Removed a few unnecessary casts.
2021-09-13 10:41:55 -04:00
Sam
727c5f107c
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Marcel Märtens
215b20fa92
Change the version number to 0.11
2021-09-10 20:19:17 +02:00
Imbris
8ef5c60b72
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
0e0cbae08c
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
a4c6621fa0
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
00062bd6e0
Capped camera distance without privilege
2021-09-08 13:17:22 +01:00
Joshua Barretto
1a55468f59
Made the camera go dark if in a filled block and not moderator
2021-09-08 12:37:15 +01:00
Monty Marz
8506d31736
Bloom settings
2021-09-08 09:50:37 +00:00
Joshua Yanovski
81f78b43ce
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 11:59:18 -07:00
jshipsey
6919f535d4
address comments
2021-09-04 13:17:56 -04:00
jshipsey
78af24a4ed
more spots
2021-09-04 00:18:58 -04:00
Marcel Märtens
5357ec43d6
disable mumble-link on macos
2021-09-04 00:32:16 +02:00
juliancoffee
29d91cdd6a
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
a7e08abec6
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
71604e0f6d
switch to SharedLink and unset context
2021-09-02 12:29:01 +02:00
Imbris
0b922deed6
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
0476f9ce0b
Replace shaderc with naga
2021-08-31 22:53:10 +01:00
jshipsey
0acd5c6d92
finished anim
2021-08-31 13:37:35 -04:00
Sam
ac6f00cbae
Added attack hook event, attacks now cancel item use and sprite interaction.
2021-08-31 13:37:32 -04:00
Sam
0f7e0b4152
Fixed compile error when importing sprite position.
2021-08-31 13:36:05 -04:00
jshipsey
c7690958b6
anim basics
2021-08-31 13:36:04 -04:00
Joshua Barretto
ea04c17cf7
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
3a27787b21
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
ab3c6989b4
Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed
2021-08-31 13:31:52 +01:00
Monty Marz
2e5414d3e0
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Joshua Barretto
a66f1922aa
More block particles, changes ore vein colour
2021-08-28 14:53:30 +01:00
juliancoffee
c3b72fa562
Rewrite multiplier_to_percentage to return f32
2021-08-28 02:36:26 +03:00
juliancoffee
ee17345648
Handle some skill description in special way
2021-08-26 14:49:52 +03:00
juliancoffee
122345e307
Declarative skill icons
2021-08-26 14:49:52 +03:00
juliancoffee
f5dde393d3
Inline skills::Boost to voxygen code
2021-08-26 14:49:52 +03:00
juliancoffee
217e1a4cb3
Inline redundant functions
2021-08-26 14:49:52 +03:00
juliancoffee
56846c63df
Split skilltree window handling per tree
2021-08-26 14:49:52 +03:00
juliancoffee
6ead29a2a3
Use PositionSpecifier for skill position
2021-08-26 14:49:52 +03:00
juliancoffee
2f01951613
Inline create_new_text
2021-08-26 14:49:52 +03:00
juliancoffee
beba850353
Diary refactoring
2021-08-26 14:49:52 +03:00
flo
a318461621
Making Block and Slots1-9 available for gamepad mapping
2021-08-23 10:38:35 +00:00
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
