Commit Graph

282 Commits

Author SHA1 Message Date
iSentrie
55db9d5ee6 Add Toggle For Emote Movement ON / OFF (#140)
* feat: toggle between moving emotes and not

* Update Emote.lua

* Update Emote.lua

* Update Emote.lua

* Changes:
• removed `EmoteMoving` from `AnimationOptions`, by default its always `true` now and changeble by toggle
• some refactor and logic changes

Shoutout to @iSentrie 🙏
2023-01-30 13:47:23 +13:00
Mads
790969a38b refactor: improve crawl flip anim (#141)
The current crawl flip anim (back to front) is pretty terrible

Video: https://www.youtube.com/watch?v=3WvGNMcqsSk&ab_channel=MadsNaustdal
2023-01-30 12:32:26 +13:00
TayMcKenzieSA
39b5f4072a 📱Replaced Phone With Custom RPEmotes Phone📱 2023-01-29 23:08:26 +13:00
TayMcKenzieSA
8724287338 🔤Sort Gangster Walkstyles Alphabetically🔤 2023-01-29 04:26:40 +13:00
Mads
99362b1202 🚶‍♂️feat: more walkstyles (#137) 🚶‍♂️
* feat: more walkstyles

* fix: gangster 9 wrong label
2023-01-29 04:18:11 +13:00
TayMcKenzieSA
e61f204abc Added vest and walkie talkie emotes 2023-01-29 03:42:17 +13:00
Mr.Marvellous
aa3a0229db added more argue emotes 🤬💨 (#136)
* added scratch & snot emotes 🤧

* added more argue emotes 🤬💨
2023-01-27 18:11:07 +13:00
Mads
33582e9f4b fix: some model not loading on older gamebuilds (#134)
Check if the model that we are attempting to load is a valid model.
2023-01-27 10:45:59 +13:00
Clément RICATTE
0e34550bc8 feat: add credits for CruncyCat 2023-01-26 22:20:23 +01:00
Mr.Marvellous
79799c4638 added scratch & snot emotes 🤧 (#135) 2023-01-27 10:05:15 +13:00
Mads
4b649ef820 fix: holster command misspelled (#133)
Spelling mistake, should be "holster" not "holdster".

#Tay'sFault
2023-01-27 04:34:21 +13:00
TayMcKenzieSA
d20068d484 😺 Added holdster Emotes by CrunchyCat 😺 2023-01-26 14:58:11 +13:00
Mads
2f34c07e5f refactor: more parameters and smoother fall for crawl dive (#130)
See tile.
2023-01-26 13:41:36 +13:00
Mads
f33004389e fix: cancel anim in gun aim (#131) 2023-01-26 13:22:17 +13:00
TayMcKenzieNZ
5e11a32c5a Fixed Menu Naming Of Police Crowd 2 2023-01-26 12:53:55 +13:00
iSentrie
e91c0c726c refactor/feat: cleaning, minor fixes, new feature to disable specific emotes in vehicle (#129)
Changes:
• cleaning
• deleted unused code
• indentation fixes
• minor fixes (proper source usage in server side)
• new feature to disable specific emotes from playing  inside an vehicle
2023-01-26 11:25:40 +13:00
Mads
0c8477434a Add small wait time (#128)
Add small wait time to prevent crawl movement animations to start being played before we have fully layed down.

Hold down W when entering crawl to see issue.
2023-01-26 10:38:28 +13:00
iSentrie
a71fc73600 Different animation for crawling dive (#127)
* Different animation for crawling dive thanks to NotDoctorMike on Twitter for the suggestion 

* Update Crouch.lua
2023-01-26 10:24:34 +13:00
Mads
f3a45f2388 fix: add pause menu check for crawl (#126)
fix: add pause menu check
2023-01-26 09:55:03 +13:00
iSentrie
b97a5a2a8d Prevent gliching through doors using ragdoll (#125) 2023-01-26 09:42:27 +13:00
Mads
c71353383e Emote fixes and additions (#124)
* fix: first letter should be uppercase

First letter should be uppercase Tay!

* Add better exit emote to surrender/surrender5

* Rename sitlow to elbow

* Add police crowd control emotes
2023-01-26 09:39:59 +13:00
Mads
f4342dcc70 fix: exit emotes cancel bug (#123)
Bug was found by @iSentrie

You could still cancel exit emotes if you started to play another animation and then cancel that emote.
2023-01-26 09:35:01 +13:00
iSentrie
9e34177550 Fix for MenuKeybindEnabled (#121)
* Fix for MenuKeybindEnabled

Fix MenuKeybindEnabled = false not hiding the menu as intended

* Update Emote.lua

* Update Emote.lua
2023-01-26 09:32:56 +13:00
TayMcKenzieSA
0013e42108 Added shopbag4 and cofpose 2023-01-25 19:50:24 +13:00
Mads
b4ecaac7ee Add custom holster animation (#122)
* Add custom holster animation

* add credit

Not really needed, but I might as well I guess?

Yes, add the credits Mads lol - Tay
2023-01-25 17:01:44 +13:00
Mads
0ce0118008 refactor: move crouch chat suggestion (#120)
We don't need to add a chat suggestion unless the crouching is enabled.
2023-01-25 01:02:45 +13:00
Mads
006bb2bd30 refactor: separate out pointing (#119)
* refactor: separate out pointing

Separate out and improve pointing.

New version includes:

Better and working configs
More checks
Export

The reason why it's separated into i's own file is to make the mail file less cluttered.

The new checks also solves issues with pointing and aiming guns etc.

* style: whitespace
2023-01-25 00:01:48 +13:00
Mads
fcfc300130 fix: variable misspelled (#118)
fix: variable misspeled

inExitEmote is a misspelling of InExitEmote.

Should hopefully fix exit emotes from being bypassed
2023-01-24 21:42:49 +13:00
TayMcKenzieSA
c36ac1edfc 🤚Added Block Emote 2023-01-24 20:16:14 +13:00
TayMcKenzieSA
6062e51148 ⚙️Fixed AnimationList ⚙️ 2023-01-24 14:30:50 +13:00
Mads
b9c3bb2c5e fix: remove ability to cancel exit emotes (#117) 2023-01-24 13:34:12 +13:00
TayMcKenzieSA
ecf9a181a9 ⚙️Fix AnimationList.lua Missing Important Code⚙️
Co-Authored-By: copofiscool <66293264+copofiscool@users.noreply.github.com>
2023-01-24 13:30:16 +13:00
TayMcKenzieSA
e7bd3f5b1d Updated Credits - TayMcKenzieNZ 2023-01-24 12:48:00 +13:00
TayMcKenzieSA
5dc504618e Added More Emotes - TayMcKenzieNZ 2023-01-24 12:47:22 +13:00
Mads
dafed05550 feat: Crouch Fix + Added Crawling (#114)
* fix: only setup +-crouch keys if enabled

Keys only need to be set up if keybinding is enabled.

* dev: move function

* fix: add ragdoll test

* refactor: get player ped after anim loaded

* grammar

* refactor: add return to AttemptCrouch

returns if it was successful

* style: add category name

* feat: add crawling

* fix: added missing config

Config was missing, sorry!

* refactor: use PlayAnimOnce

We should use PlayAnimOnce here as it would lower the complexity and make the code easier to read.

* feat: add exports

Add exports to be used by other developers when creating scripts for their own servers.

* refactor: redo config setup

* refactor: add blendInSpeed to PlayAnimOnce

* refactor: use local function instead of global

local functions are much faster to load then global ones.

* refactor: redo CrouchKeyPressed

Rewrite the entire function to use new configs

* style: remove commented code

* dev: add new version of crawl

A temporary version of crawl, still in development.

* refactor: make isProne a global variable

Add @iSentrie 's suggestion to make isProne a global variable so it can be used in Emotes.lua to prevent animations being played while crawling.

Co-authored-by: iSentrie <xvender7@gmail.com>

* refactor: make global isProne uppercase

* fix: add prone check before playing anim

Add a check to see if we are prone before we play any animations.

TODO: This needs to be translated for all the different languages.
Co-Authored-By: iSentrie <29688478+iSentrie@users.noreply.github.com>

* refactor: add function for idle crawl anim

* refactor: increase blend in speed

* refactor: add ChangeHeadingSmooth func

* feat: add on back rotation anims

* feat: use PlayAnimOnce instead

* style: whitespace

* feat: add config to disable keybinds

* fix: convert to PlayAnimOnce func

We aren't loading anim dict, let's use PlayAnimOnce instead to make it simple.

* Update config default states

* refactor: remove unnecessary variable

keyPressed is just not needed, the command 'crouch' should't be fired at the same time regardless, so this can be safely removed.

* refactor: merge functions

* refactor: increase timer

Increase the amount of time we should wait before we move to the idle state again.

* fix: check if we are in water

Only needs to be in crawl, you should be able to crouch along the waterfront.

ClearPedTasks is also necessary to prevent the player getting stuck in an animation.

* refactor: remove chat message

As @iSentrie pointed out these are annoying in some situations. It's pretty self-explanatory why you can't crouch/crawl when these appear anyway.

Co-Authored-By: iSentrie <29688478+iSentrie@users.noreply.github.com>

* refactor: separate out exit crawl animations

* refactor: better crawl entry anim

* refactor: allow heading input on PlayIdleCrawlAnim

* refactor: use PlayIdleCrawlAnim instead

* fix: add inAction checks

Fixes issues @iSentrie commented on.

This may not cover all situations, needs more testing.

* refactor: flip anim

I've yet to find any good anims for this, this is the best, or least worst I've found so far.

Better to have something then to literately do a flip.

* fix: add point checks

Disable pointing while crawling.

* fix: remove clipsetreset

There should be no reason to reset the clipset/walkstyle. This will only mess with crouching.

* fix: disable weapon switching while prone

* fix: don't play idle anim if we can't crawl

We shouldn't play the anim as it will lead to weird behavior when ragdolling/falling while entry anim is played.

* fix: move inAction

Only set inAction to true when we actually can lay down.

* fix: missing pointing check

I'll just sneak this in here, "nobody will notice".

* fix: check if in animation

We should check if we are in an animation before crawling.

* refactor: remove command args

Remove command args to clean thing up. Suggested by @iSentrie

Co-Authored-By: iSentrie <29688478+iSentrie@users.noreply.github.com>

* refactor: cancel emote on crawl

As suggested by @iSentrie

Co-Authored-By: iSentrie <29688478+iSentrie@users.noreply.github.com>

* Add comments

* fix: add water checks

Add checks, to lazy to type more, read the code.

* fix: correct check statement

Don't juge me, it's late ok

Co-authored-by: iSentrie <xvender7@gmail.com>
Co-authored-by: iSentrie <29688478+iSentrie@users.noreply.github.com>
2023-01-24 11:44:07 +13:00
iSentrie
1ae9bb0394 added shield and shield2 (#115)
* added shield and shield2

* i hate unnecessary commas 😡

* its easier that way to set values

* because 😡

* ok github
2023-01-24 11:17:43 +13:00
Mads
6b9d3090cf add puke and kick emotes (#116) 2023-01-24 11:11:04 +13:00
TayMcKenzieSA
600a7f145c 🛹 Added Skateboard Prop & Emotes 🛹
Credits to me, TayMcKenzieNZ for making the prop custom and addon. Credits to Molly for the animation.
2023-01-22 17:34:13 +13:00
Mads
0387b33f01 fix: revert to action mode (#113)
Stealth movement should't be reset here, action mode should. It is still correct to check for stealth movement in the StartCrouch function, but not in the loop, as action mode != stealth movement.
2023-01-21 10:13:23 +13:00
Mads
81e399a2c2 refactor: improve crouch (#112)
* refactor: improve crouch

Should now allow for using the same button as duck (left control by default) and some improvements. To lazy to write more then that.

* fix: typo
2023-01-21 02:16:44 +13:00
Mads
00e32ad88d feat: add crouch (#111) 2023-01-20 10:02:32 +13:00
iSentrie
95fdf70f15 handsup3 (#110)
New animation
2023-01-19 12:18:49 +13:00
iSentrie
a27b9d58fe fix to correctly remove animal animations (#109) 2023-01-19 11:53:56 +13:00
TayMcKenzieSA
118309f736 Added More idcard Emotes 2023-01-18 23:45:50 +13:00
TayMcKenzieNZ
6dde62eb42 Fixed Placeholder Puke Config Text 2023-01-18 02:46:30 +13:00
TayMcKenzieSA
676b63b781 📸 Added Vlogging Emotes 📸 2023-01-17 23:49:51 +13:00
TayMcKenzieSA
af36fae427 🤮 Added Puke Emote🤮 2023-01-17 17:47:47 +13:00
Mads
2efffe5883 fix: change bone name to index (#107)
Change from the usage of GetEntityBoneIndexByName to GetPedBoneIndex to keep consistency.
2023-01-17 05:30:46 +13:00
Mads
e7d11acf8c feat: add support for ptfx bones (#106)
Add the option to use bones when adding particle fx.
2023-01-17 05:10:16 +13:00
TayMcKenzieSA
08842b9189 ⚙️Added More Exit Emotes ⚙️
chill
chillteq
cloudgaze
cloudgaze2
guitarsit
layncry
layncry2
layncry3
layncry4
layncry5
layncry6
laydownsexy
mechanic3
meditate
meditate2
meditate3
passout
passout2
passout3
passout4
passout5
prone
relax
relax2
shot
sleep
surrender
surrender2
surrender3
surrender4
surrender5
surrender6
tighten
2023-01-16 23:20:52 +13:00