Skip to content

Commit

Permalink
Merge branch 'praydog:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyhodge authored Dec 11, 2024
2 parents cab2e13 + 23169b9 commit b07267a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ FetchContent_Declare(
)
FetchContent_MakeAvailable(bddisasm)

message(STATUS "Fetching kananlib (61a04d4219e3cb81b524a6990d3924289982bbf6)...")
message(STATUS "Fetching kananlib (8b29e1694dbf4ad4c878ff54bcbcabf280b37168)...")
FetchContent_Declare(
kananlib
GIT_REPOSITORY
https://github.com/cursey/kananlib
GIT_TAG
61a04d4219e3cb81b524a6990d3924289982bbf6
8b29e1694dbf4ad4c878ff54bcbcabf280b37168
)
FetchContent_MakeAvailable(kananlib)

Expand Down
2 changes: 1 addition & 1 deletion cmake.toml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ tag = "v1.34.10"

[fetch-content.kananlib]
git = "https://github.com/cursey/kananlib"
tag = "61a04d4219e3cb81b524a6990d3924289982bbf6"
tag = "8b29e1694dbf4ad4c878ff54bcbcabf280b37168"

[target.utility]
type = "static"
Expand Down
3 changes: 0 additions & 3 deletions scripts/re2_vr_melee.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ local function get_gameobject(component)
return component:call("get_GameObject")
end

local camera = sdk.get_primary_camera()
local camera_gameobject = camera:call("get_GameObject")

local melee_type = sdk.find_type_definition(sdk.game_namespace("implement.Melee"))

local function is_weapon_melee(weapon)
Expand Down

0 comments on commit b07267a

Please sign in to comment.