Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Character #13

Merged
merged 135 commits into from
Feb 4, 2022
Merged

Refactor Character #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
d53ce4b
ignore more things
Local9 Jan 18, 2022
31bbda2
validate .json
Local9 Jan 18, 2022
ab87dbf
Add RedM CitizenFX Dependancy
Local9 Jan 18, 2022
b91c52a
ignore even more things
Local9 Jan 18, 2022
6c417ee
Add CitizenFX Core Server
Local9 Jan 18, 2022
6815909
Add RedM reference to client
Local9 Jan 18, 2022
e838e83
update to MenuAPI from nuget
Local9 Jan 18, 2022
29e55b1
Code cleanup profile
Local9 Jan 18, 2022
905bef3
add plugin manager
Local9 Jan 18, 2022
5216f68
rename VorpCharacter namespace
Local9 Jan 18, 2022
8e71bbc
intial re-organisation of the server project
Local9 Jan 18, 2022
53c355d
initial refactoring completed with error handling
Local9 Jan 18, 2022
c623bf3
rename class to CharacterAPI
Local9 Jan 18, 2022
459bff5
remove CitizenFX from Build folder
Local9 Jan 18, 2022
9615eb5
Renaming VorpCharacter client namespace
Local9 Jan 19, 2022
4823b7e
move config files
Local9 Jan 19, 2022
5c00eea
valid format json
Local9 Jan 19, 2022
555bf76
move english config
Local9 Jan 19, 2022
c24c70f
added new solution folder
Local9 Jan 19, 2022
337a2ce
added existing file to project
Local9 Jan 19, 2022
3366756
move scripts into folder
Local9 Jan 19, 2022
41fbcd2
update name spaces
Local9 Jan 19, 2022
35b967f
build working after last jigging about
Local9 Jan 19, 2022
350282e
Formatting
Local9 Jan 19, 2022
ba6e3dd
these files have been moved
Local9 Jan 19, 2022
8ba401f
include all files in the config folder
Local9 Jan 19, 2022
0dcea80
finished converting config into a class
Local9 Jan 19, 2022
64d2340
Initiate scripts
Local9 Jan 19, 2022
b6fd972
Client resource builds
Local9 Jan 19, 2022
0260643
change copy setting for En.json
Local9 Jan 19, 2022
88d439f
faces still not loading
Local9 Jan 20, 2022
7dadb81
Revert "Add gitignore"
Local9 Jan 20, 2022
43faa8b
Merge branch 'master' of https://github.com/VORPCORE/VORP-Character
Local9 Jan 20, 2022
76a7367
pass params
Local9 Jan 20, 2022
2bf7dea
add delay before applying default skin settings
Local9 Jan 20, 2022
65714c8
head before body
Local9 Jan 20, 2022
c095025
PedID changes when model changes
Local9 Jan 20, 2022
99ec6ae
Cache PlayerPedID
Local9 Jan 20, 2022
88f5e7e
fix static
Local9 Jan 20, 2022
aced7fa
Model changes player ped id - Credit @DintyGadget
Local9 Jan 20, 2022
282601c
Change tick around player model and scale and added fade
Local9 Jan 20, 2022
cf47127
delay before setting hair/eyes/beard
Local9 Jan 20, 2022
6b3a7af
move order of Neck Tie and Shirt base on @DintyGadget work
Local9 Jan 20, 2022
e5aab53
Added coat closed command - Credit @DintyGadget
Local9 Jan 20, 2022
6d5bb9f
Update to use RemoveTagFromMetaPed
Local9 Jan 20, 2022
279a4e1
use cache method for playerPedId
Local9 Jan 20, 2022
05cdfb4
update to use UpdatePedVariation
Local9 Jan 20, 2022
d9e07af
IsMetapedUsingComponent
Local9 Jan 20, 2022
0d4a066
use ApplyShopItemToPed
Local9 Jan 20, 2022
916ba59
Additional hashes - Credit @DintyGadget
Local9 Jan 20, 2022
31e583c
update build folder
Local9 Jan 20, 2022
a130427
Refactor commands to lose all the copy and paste
Local9 Jan 20, 2022
a775063
add ePedFaceFeature
Local9 Jan 20, 2022
d38a421
Added ePedComponent
Local9 Jan 20, 2022
8e5189e
Code cleanup Client
Local9 Jan 20, 2022
fcdfab5
code clean up server
Local9 Jan 20, 2022
44d51df
correct build error
Local9 Jan 20, 2022
9146902
delay scale changes
Local9 Jan 20, 2022
8176ad5
refactor methods to setting up the character
Local9 Jan 20, 2022
c85e245
initial refactoring so all characters use the same method
Local9 Jan 20, 2022
3634c91
Set the clock during character selection
Local9 Jan 20, 2022
528f035
Single method now sets up characters
Local9 Jan 20, 2022
a765b58
remove delay thats not required
Local9 Jan 20, 2022
c6990ce
remove another delay
Local9 Jan 20, 2022
8216ae9
add IsPedCuffed and IsPedHogtied
Local9 Jan 20, 2022
7eb4ca2
Added additional Ped Components
Local9 Jan 20, 2022
5c58f24
Add some error handling
Local9 Jan 20, 2022
218b1b1
Added missing items to dictionary
Local9 Jan 20, 2022
f904053
update ped scale method
Local9 Jan 20, 2022
577abbb
refactor menu creation
Local9 Jan 20, 2022
1c2426f
Initial completion of Skin Menu refactor
Local9 Jan 21, 2022
b88fdef
remove unused variable
Local9 Jan 21, 2022
9dce22f
set private body index
Local9 Jan 21, 2022
9a689a4
Change method for skin menu setup
Local9 Jan 21, 2022
92ede21
Refactored some methods to use Utilities
Local9 Jan 21, 2022
e64fff9
Skin menu now editing items correctly, notes added
Local9 Jan 21, 2022
8a251f4
added comment
Local9 Jan 21, 2022
b4fa1cd
Remove old console color code
Local9 Jan 21, 2022
cf275e5
Add note for later
Local9 Jan 21, 2022
1e8d278
VorpPlayer now sets and returns position and heading
Local9 Jan 21, 2022
7de9128
don't load from KVP if its a new character
Local9 Jan 22, 2022
eff9491
Moved ApplyDefaultSkinSettings
Local9 Jan 22, 2022
02b7bdd
Replace API.PlayerPedID()
Local9 Jan 24, 2022
e445b9f
handle chances of missing items when loading a ped skin
Local9 Jan 24, 2022
2f317d8
Move a lot of code into methods
Local9 Jan 24, 2022
96cb1a3
Change order of methods
Local9 Jan 24, 2022
df4535f
Change order of methods
Local9 Jan 24, 2022
d802fb9
Merge branch 'refactor-character' of https://github.com/VORPCORE/VORP…
Local9 Jan 24, 2022
d9f9dbe
Remove some logging information
Local9 Jan 28, 2022
7d847bf
linting
Local9 Jan 28, 2022
9cb289c
Add Character Deletion Prompt
Local9 Jan 28, 2022
0f0fa85
Nuget NewtonSoft v12.0.2
Local9 Jan 28, 2022
4978bb8
Initial classes for Discord Webhook Messaging
Local9 Jan 28, 2022
08ce561
Complete work to include Discord webhook and config
Local9 Jan 28, 2022
aefd135
Completed work on adding webhook configuration
Local9 Jan 28, 2022
ea15fbd
Complete implementation of Discord
Local9 Jan 28, 2022
60f9cac
Always copy the resource file
Local9 Jan 28, 2022
71d97f0
text file is content, not compile ¬.¬
Local9 Jan 28, 2022
05fd9ca
ignore zips in build folder
Local9 Jan 28, 2022
3751385
Allow Webhook to be updated in a live server
Local9 Jan 28, 2022
b55a4be
Revert NewtonSoft to local dependancy
Local9 Jan 28, 2022
ada15e7
Remove more duplication and only allow a skirt if pants are not set
Local9 Jan 28, 2022
d1c7f4e
Remove logging output
Local9 Jan 28, 2022
7b615c9
don't include zip files!
Local9 Jan 28, 2022
7b585cb
loop till component is added
Local9 Jan 29, 2022
5fbfe3a
fix missing translation gets in Menu
Local9 Jan 29, 2022
6e338a3
change build settings
Local9 Jan 29, 2022
0d0ad46
updated to latest CFX Core dlls
Local9 Jan 29, 2022
84595df
changed delay to 50ms
Local9 Jan 29, 2022
9993713
added DEVELOPMENT symbol
Local9 Jan 29, 2022
292ae64
await SetPlayerComponent and don't get stuck in using component
Local9 Jan 29, 2022
984f837
Update method of checking component
Local9 Jan 29, 2022
47b0a4a
Lower number of delays
Local9 Jan 29, 2022
3ae86db
Remove skin loading from resource key, this is done in the refresh
Local9 Jan 29, 2022
4ba849c
cannot use negative numbers with unsigned ints
Local9 Jan 29, 2022
069d2c3
Added beard and hair hashes
Local9 Jan 29, 2022
0462bb4
ApplyShopItemToPed is now awaitable
Local9 Jan 29, 2022
48725b2
allow rc command to have a "clothes" argument
Local9 Jan 29, 2022
3d0255c
remove event "vorpcharacter:loadPlayerSkin"
Local9 Jan 29, 2022
811c082
Added BOW_FEMALE, ARMOR_FEMALE, ARMOR_MALE
Local9 Jan 29, 2022
278e985
Added items to ACCESSORIES_FEMALE
Local9 Jan 29, 2022
7e0fa4c
Added items to sk dictionary
Local9 Jan 29, 2022
7d29101
formatting
Local9 Jan 29, 2022
473f29f
code cleanup
Local9 Jan 29, 2022
07fccbb
update build with release versions
Local9 Jan 29, 2022
c5ebbc7
correct .pdb file outputs
Local9 Jan 29, 2022
dd997ff
Updated builds
Local9 Jan 29, 2022
dae1027
ignore all zips in Build
Local9 Jan 29, 2022
ee87857
method doesn't have to be async
Local9 Jan 29, 2022
9c19a8e
updated build
Local9 Jan 29, 2022
c4ad826
added a comment
Local9 Jan 29, 2022
a17e875
await SetPedBodyComponent
Local9 Jan 29, 2022
09b4ead
move check for Pant/Skirt
Local9 Jan 29, 2022
42e5568
Reset order of component loading
Local9 Jan 29, 2022
a008ba0
Only register command if in DEVELOPMENT
Local9 Jan 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
/.vs
/VORP-Character\[Client-Server\]/vorpcharacter_cl/obj
/VORP-Character\[Client-Server\]/vorpcharacter_cl/obj/**
/VORP-Character\[Client-Server\]/vorpcharacter_cl/bin
/VORP-Character\[Client-Server\]/vorpcharacter_sv/obj
/VORP-Character\[Client-Server\]/vorpcharacter_sv/obj
/VORP-Character\[Client-Server\]/vorpcharacter_sv/obj/**
/VORP-Character\[Client-Server\]/vorpcharacter_sv/bin
/VORP-Character\[Client-Server\]/build/vorp_character/*.pdb
/VORP-Character\[Client-Server\]/.vs
/VORP-Character\[Client-Server\]/.idea
VORP-Character\[Client-Server\]/build/vorp_character/CitizenFX.Core.xml
VORP-Character\[Client-Server\]/build/vorp_character/CitizenFX.Core.dll
/VORP-Character\[Client-Server\]/build/**.zip
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
Binary file added .vs/VORP-Character/v16/.suo
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions .vs/VSWorkspaceState.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ExpandedNodes": [
""
],
"PreviewInSolutionExplorer": false
}
Binary file added .vs/slnx.sqlite
View file
Open in desktop
Binary file not shown.
67 changes: 36 additions & 31 deletions VORP-Character[Client-Server]/VORP-Character[Client-Server].sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vorpcharacter_cl", "vorpcharacter_cl\vorpcharacter_cl.csproj", "{51083C52-7FE7-422E-AED9-023D0903C6E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vorpcharacter_sv", "vorpcharacter_sv\vorpcharacter_sv.csproj", "{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Release|Any CPU.Build.0 = Release|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {02CB118E-E75D-4523-94D2-318ECF36E58D}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vorpcharacter_cl", "vorpcharacter_cl\vorpcharacter_cl.csproj", "{51083C52-7FE7-422E-AED9-023D0903C6E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vorpcharacter_sv", "vorpcharacter_sv\vorpcharacter_sv.csproj", "{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Development|Any CPU = Development|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Development|Any CPU.ActiveCfg = Development|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Development|Any CPU.Build.0 = Development|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51083C52-7FE7-422E-AED9-023D0903C6E6}.Release|Any CPU.Build.0 = Release|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Development|Any CPU.ActiveCfg = Development|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Development|Any CPU.Build.0 = Development|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAF3ACC4-8378-4923-ADD0-5959DC21DA03}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {02CB118E-E75D-4523-94D2-318ECF36E58D}
EndGlobalSection
EndGlobal
Binary file removed VORP-Character[Client-Server]/build/vorp_character.zip
View file
Open in desktop
Binary file not shown.
Loading