Sam
d0c78c3d63
Made poise a float at interface of module.
2021-09-25 14:07:47 -04:00
Samuel Keiffer
fcd865a3c7
Merge branch 'sam/energy-float' into 'master'
...
Changed energy to a float
See merge request veloren/veloren!2838
2021-09-25 06:51:21 +00:00
Snowram
e9a9f0a278
Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master'
...
Add setting to disable hotkey hints
See merge request veloren/veloren!2849
2021-09-24 16:03:06 +00:00
Bafon
f5c90911ec
Add setting to disable hotkey hints
2021-09-24 16:03:05 +00:00
João Capucho
40432b5c83
Fix dir is empty check when setting WGPU_TRACE_DIR
2021-09-24 15:07:12 +01:00
Imbris
c0e0d2080d
Merge branch 'imbris/tex-cleanup' into 'master'
...
Remove old textures that aren't reused when calling replace_graphic
See merge request veloren/veloren!2869
2021-09-24 02:38:27 +00:00
Imbris
1c7b84040e
Remove old textures that aren't reused when calling replace_graphic
2021-09-23 21:50:37 -04:00
Sam
961782851f
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-23 14:11:09 -04:00
Imbris
51bda3f52b
Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass
2021-09-22 21:58:36 -04:00
Marcel
cde6126fb7
Merge branch 'bafon/crafting-station-icons' into 'master'
...
Add crafting station icon to crafting menu sidebar
See merge request veloren/veloren!2848
2021-09-22 13:54:33 +00:00
Bafon
e2f8468016
Add crafting station icon to crafting menu sidebar
2021-09-22 13:54:32 +00:00
Snowram
8d88a29a4b
Adds Xtilt to BirdLarge skeleton
2021-09-21 15:31:46 +02:00
Snowram
46021c31bd
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
jshipsey
7978b16820
animation tweaks
2021-09-21 15:30:43 +02:00
Snowram
cfdcf59844
Split wyvern anims from the other birdlarge anims
2021-09-21 15:30:43 +02:00
jshipsey
be53c407cb
wyvern walk
2021-09-21 15:30:43 +02:00
Snowram
298c1fbccb
More wyvern anim work
2021-09-21 15:30:42 +02:00
Snowram
7384868c57
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Marcel Märtens
636838f510
update crates
2021-09-20 14:39:01 +02:00
Ben Wallis
4349a14064
* Added new Admin Commands window to egui, including Give Items and Kits sections
...
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00
anomaluridae
d0629224d2
remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly
2021-09-17 10:34:20 -07:00
anomaluridae
dc76d5c05f
is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer
2021-09-17 10:34:20 -07:00
anomaluridae
f3d8adf3fa
choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input
2021-09-17 10:34:20 -07:00
anomaluridae
a7cee0f11b
keep MAX_TARGET_RANGE within voxygen
2021-09-17 10:34:20 -07:00
anomaluridae
2789d2ae29
intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed.
2021-09-17 10:34:20 -07:00
anomaluridae
a02488ddd9
properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds.
2021-09-17 10:34:20 -07:00
anomaluridae
0f13db9600
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
anomaluridae
07cfa0ef35
add comment for future direction of Interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
b1adc9c4e0
build positions for place versus remove block are cleaner (less likely to fail) when apply the +0.01 modifier versus -0.01 modifier selectively. this is equivalent to current master, and is simply more explicit now
2021-09-17 10:34:20 -07:00
anomaluridae
9ddc38ba18
changes per MR feedback. simplier Option handling with zip, filter, and fewr unwraps. use kind keyword (not typed). if lets when possible. additional syntax cleanup
2021-09-17 10:34:20 -07:00
anomaluridae
946ca442ab
make Target generic, over the specific typed targets
2021-09-17 10:34:20 -07:00
anomaluridae
01cfe39503
undo macro use for DRY on client event handler, and handle edge detection in mining so that we don't get Empty interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
25c3d2a9e2
MR review updates. Added back the 0.01 modifiers, update naming and comments, keep interactable construction in the interactables mod, remove unneeded curry, syntax updates. only cast for mining and build if enabled.
2021-09-17 10:34:20 -07:00
anomaluridae
20c4054e6a
build is working. to add and remove blocks.
2021-09-17 10:34:20 -07:00
anomaluridae
be1095632f
make Target into a typed struct. delineate the clear difference in Target versus Interactable. comments and naming cleanup, for more explicitness.
2021-09-17 10:34:20 -07:00
anomaluridae
4a723a7930
clippy is a thing
2021-09-17 10:34:20 -07:00
anomaluridae
42426a16f3
make scene interaction be targeted exactly on mining blocks (removing abnormal Empty labels), and don't reset position to None in the middle of mining.
2021-09-17 10:34:20 -07:00
anomaluridae
c8cb7fbe62
make the concepts of targets (under cursor), separate from interactable. interactable is what is (1) indicated visually in gui as able to interact, or (2) is an entity, or (3) is a block capable of Interaction. whereas a target is what occurs under the cursor, regardless of other state and input (such as different InputKind). targets are determined first, then other factors are cosidered to determine interactable.
2021-09-17 10:34:20 -07:00
anomaluridae
d9412b14d3
breakout interactable into seperate file
2021-09-17 10:32:06 -07:00
juliancoffee
938091e8a3
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +03:00
juliancoffee
75954d289e
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
juliancoffee
e56478204e
Adress feedback
...
- Rewrite 2 * PI to TAU
- Some comment formatting
2021-09-17 13:28:34 +03:00
juliancoffee
58a4659c47
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
juliancoffee
feefd36036
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
Imbris
699abadc95
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
763f2b261c
Improve naming of checkbox images related methods
2021-09-15 15:41:31 +01:00
João Capucho
4bcdc31556
Add option for a hovered and checked background
2021-09-15 15:15:03 +01:00
Monty Marz
ad28b2837d
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
d076071c13
Add setting to always show energy bars
2021-09-15 12:04:44 +00:00
Marcel
1eb52ce557
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
