alberttheprince / rpemotes-reborn

Community driven FiveM emote menu with human, animal, and prop support.
GNU General Public License v3.0
64 stars 41 forks source link

Merging. #34

Closed 7D7-Development closed 2 months ago

7D7-Development commented 2 months ago

Merging branches.

alberttheprince commented 2 months ago

What is the point of this PR? Please be more specific in your changes, it's not easy to tell what has been changed.

alberttheprince commented 2 months ago

Is this adding emotes from https://github.com/Mustachedom/md-drugs as well? Please keep to the format of rpemotes-reborn, just to make it easier to actually review these changes.

Additionally, I'm not sure why those use PansexualPropBone and not just PropBone.

alberttheprince commented 2 months ago

Below Mustachedom emotes if you want to resubmit, in the rpemotes format:


    ["uncuff"] = { -- Emotes by Mustachedom
        "mp_arresting",
        "a_uncuff",
        "Uncuff", 
        AnimationOptions = {
            EmoteLoop = true,
            EmoteMoving = true
        }
    },
    ["edible"] = { -- Emotes by Mustachedom
        "mp_player_inteat@burger",
        "mp_player_int_eat_burger",
        "edible",
        AnimationOptions = {   
            EmoteLoop = false,
            EmoteMoving = true
        }
    },
    ["shootup"] = { -- Emotes by Mustachedom
        "rcmpaparazzo1ig_4",
        "miranda_shooting_up",
        "Shoot Up",
        AnimationOptions = {
            EmoteLoop = true,
            EmoteMoving = true,
            Prop = 'prop_syringe_01',
            PropBone = 18905,
            PropPlacement = {
                0.11,
                0.03,
                0.0,
                -124.0,
                0.0,
                0.0
            },
        }
    },
7D7-Development commented 2 months ago

If you see in my main branch, I corrected this. Also... same issue persists with the latest release brother.