Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
TomGrobbe committed Jan 10, 2019
2 parents 09ea560 + 59636f6 commit b48d050
Show file tree
Hide file tree
Showing 50 changed files with 3,249 additions and 1,953 deletions.
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Tom Grobbe - https://www.vespura.com/

Copyright © 2017-2018
Copyright © 2017-2019

-----

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ vMenu v2.0.0 and earlier was [using a modified version of NativeUI](https://gith

Tom Grobbe - https://www.vespura.com/

Copyright © 2017-2018
Copyright © 2017-2019


THIS PROJECT USES A CUSTOM LICENSE. MAKE SURE TO READ IT BEFORE THINKING ABOUT DOING ANYTHING WITH VMENU.
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ after_build:
deploy:
- provider: GitHub
release: "[Release] vMenu $(VERSION_NAME)"
tag: $(VERSION_NAME)
artifact: vMenu-$(VERSION_NAME).zip
draft: true
prerelease: false
Expand Down
Binary file modified dependencies/client/CitizenFX.Core.dll
Binary file not shown.
115 changes: 114 additions & 1 deletion dependencies/client/CitizenFX.Core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30159,7 +30159,7 @@
Corrected p1. it's basically the 'carriage/trailer number'. So if the train has 3 trailers you'd call the native once with a var or 3 times with 1, 2, 3.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash.GET_VEHICLE_ALARM_TIME_LEFT">
<member name="F:CitizenFX.Core.Native.Hash.GET_VEHICLE_ACCELERATION">
<summary>
static - max acceleration
</summary>
Expand Down Expand Up @@ -32852,6 +32852,19 @@
Registers a set of archetypes with the game engine. These should match `CBaseArchetypeDef` class information from the game.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash.REGISTER_COMMAND">
<summary>
Registered commands can be executed by entering them in the client console (this works for client side and server side registered commands). Or by entering them in the server console/through an RCON client (only works for server side registered commands). Or if you use a supported chat resource, like the default one provided in the cfx-server-data repository, then you can enter the command in chat by prefixing it with a `/`.

Commands registered using this function can also be executed by resources, using the [`ExecuteCommand` native](#_0x561C060B).

The restricted bool is not used on the client side. Permissions can only be checked on the server side, so if you want to limit your command with an ace permission automatically, make it a server command (by registering it in a server script).

**Example result**:

![](https://i.imgur.com/TaCnG09.png)
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash.REGISTER_ENTITIES">
<summary>
**Experimental**: This native may be altered or removed in future versions of CitizenFX without warning.
Expand Down Expand Up @@ -40393,6 +40406,14 @@
Pushes an integer for the Scaleform function onto the stack.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._PUSH_SCALEFORM_MOVIE_METHOD_PARAMETER_STRING_2">
<summary>
GRAPHICS::\_0x77FE3402004CD1B0(HUD::\_GET_LABEL_TEXT("YACHT_GSY"));
GRAPHICS::\_0x77FE3402004CD1B0(PLAYER::GET_PLAYER_NAME(PLAYER::PLAYER_ID()));

Both \_0xBA7148484BD90365 / \_0x77FE3402004CD1B0 works, but \_0x77FE3402004CD1B0 is usually used for "name" (organisation, players..).
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._REMOVE_CURRENT_RISE">
<summary>
p0 is the handle returned from _0xFDBF4CDBC07E1706
Expand Down Expand Up @@ -41472,6 +41493,15 @@
3 = Back
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._SET_VEHICLE_ROOF_LIVERY">
<summary>
Used to set the tornado custom (convertible) rooftop livery.

Livery value that works for tornado custom is between 0 and 9 from what i can tell. Maybe 0-8 even.

Might work on other custom vehicles but im not sure what those might be, only confirmed it working with the tornado custom.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._SET_VEHICLE_SILENT">
<summary>
If set to TRUE, it seems to suppress door noises and doesn't allow the horn to be continuous.
Expand Down Expand Up @@ -41664,6 +41694,11 @@
Stops recording and saves the recorded clip.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._STOP_RECORDING_THIS_FRAME">
<summary>
This disable the recording feature and has to be called every frame.
</summary>
</member>
<member name="F:CitizenFX.Core.Native.Hash._STOP_SCREEN_EFFECT">
<summary>
Example and list of screen FX: www.pastebin.com/dafBAjs0
Expand Down Expand Up @@ -53941,6 +53976,30 @@
1.0.335.2, 1.0.350.1/2, 1.0.372.2, 1.0.393.2, 1.0.393.4, 1.0.463.1;
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.N_0xd40aac51e8e4c663(System.UInt32)">
<summary>
Decompiled scripts have this listed as `FILES::_GET_NUM_DLC_PED_PROPS_UNK`, but that seems wrong.
Has something to do with ped (dlc) helmet props.
This native returns 1/true when the player helmet has a visor (there is another prop index for the same helmet with closed/opened visor variant) that can be toggled, 0/false if there's no alternative version with a visor for this helmet prop.
So something like `_DOES_HELMET_HASH_HAVE_A_VISOR`, anyone that knows the joaat hash?
Decompiled scripts handle this as an int. But the result is always 0 or 1 (after testing every prop hash on freemode peds). So might actually be a bool?
```
iVar16 = PED::GET_PED_PROP_INDEX(PLAYER::PLAYER_PED_ID(), 0);
iVar17 = PED::GET_PED_PROP_TEXTURE_INDEX(PLAYER::PLAYER_PED_ID(), 0);
iVar18 = FILES::GET_HASH_NAME_FOR_PROP(PLAYER::PLAYER_PED_ID(), 0, iVar16, iVar17);
if (FILES::_GET_NUM_DLC_PED_PROPS_UNK(iVar18) &gt; 0) // _0xD40AAC51E8E4C663
{
HUD::BEGIN_TEXT_COMMAND_DISPLAY_HELP("VISOR_TOGGLE");
HUD::END_TEXT_COMMAND_DISPLAY_HELP(0, 0, true, 6000);
iVar15++;
func_12660(7668, iVar15, -1, 1);
MISC::SET_BIT(&amp;(Global_2512581.f_1710), 24);
}
```
</summary>
<param name="propHash">Ped helmet prop hash</param>
<returns>This native returns 1 when the player helmet has a visor (there is another prop index for the same helmet with closed/opened visor variant) that can be toggled. 0 if there's no alternative version with a visor for this helmet prop.</returns>
</member>
<member name="M:CitizenFX.Core.Native.API.N_0xd4c4642cb7f50b5d(System.Int32)">
<summary>
Only used like this:
Expand Down Expand Up @@ -56380,13 +56439,39 @@
Pushes an integer for the Scaleform function onto the stack.
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.PushScaleformMovieMethodParameterString_2(System.String)">
<summary>
GRAPHICS::\_0x77FE3402004CD1B0(HUD::\_GET_LABEL_TEXT("YACHT_GSY"));
GRAPHICS::\_0x77FE3402004CD1B0(PLAYER::GET_PLAYER_NAME(PLAYER::PLAYER_ID()));
Both \_0xBA7148484BD90365 / \_0x77FE3402004CD1B0 works, but \_0x77FE3402004CD1B0 is usually used for "name" (organisation, players..).
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.N_0x77fe3402004cd1b0(System.String)">
<summary>
GRAPHICS::\_0x77FE3402004CD1B0(HUD::\_GET_LABEL_TEXT("YACHT_GSY"));
GRAPHICS::\_0x77FE3402004CD1B0(PLAYER::GET_PLAYER_NAME(PLAYER::PLAYER_ID()));
Both \_0xBA7148484BD90365 / \_0x77FE3402004CD1B0 works, but \_0x77FE3402004CD1B0 is usually used for "name" (organisation, players..).
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.RegisterArchetypes(CitizenFX.Core.Native.InputArgument)">
<summary>
**Experimental**: This native may be altered or removed in future versions of CitizenFX without warning.
Registers a set of archetypes with the game engine. These should match `CBaseArchetypeDef` class information from the game.
</summary>
<param name="factory">A function returning a list of archetypes.</param>
</member>
<member name="M:CitizenFX.Core.Native.API.RegisterCommand(System.String,CitizenFX.Core.Native.InputArgument,System.Boolean)">
<summary>
Registered commands can be executed by entering them in the client console (this works for client side and server side registered commands). Or by entering them in the server console/through an RCON client (only works for server side registered commands). Or if you use a supported chat resource, like the default one provided in the cfx-server-data repository, then you can enter the command in chat by prefixing it with a `/`.
Commands registered using this function can also be executed by resources, using the [`ExecuteCommand` native](#_0x561C060B).
The restricted bool is not used on the client side. Permissions can only be checked on the server side, so if you want to limit your command with an ace permission automatically, make it a server command (by registering it in a server script).
**Example result**:
![](https://i.imgur.com/TaCnG09.png)
</summary>
<param name="commandName">The command you want to register.</param>
<param name="handler">A handler function that gets called whenever the command is executed.</param>
<param name="restricted">If this is a server command and you set this to true, then players will need the command.yourCommandName ace permission to execute this command.</param>
</member>
<member name="M:CitizenFX.Core.Native.API.RegisterEntities(CitizenFX.Core.Native.InputArgument)">
<summary>
**Experimental**: This native may be altered or removed in future versions of CitizenFX without warning.
Expand Down Expand Up @@ -62092,6 +62177,24 @@
Reduces grip significantly so it's hard to go anywhere.
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.SetVehicleRoofLivery(System.Int32,System.Int32)">
<summary>
Used to set the tornado custom (convertible) rooftop livery.
Livery value that works for tornado custom is between 0 and 9 from what i can tell. Maybe 0-8 even.
Might work on other custom vehicles but im not sure what those might be, only confirmed it working with the tornado custom.
</summary>
<param name="vehicle">The vehicle handle.</param>
<param name="livery">Livery index.</param>
</member>
<member name="M:CitizenFX.Core.Native.API.N_0xa6d3a8750dc73270(System.Int32,System.Int32)">
<summary>
Used to set the tornado custom (convertible) rooftop livery.
Livery value that works for tornado custom is between 0 and 9 from what i can tell. Maybe 0-8 even.
Might work on other custom vehicles but im not sure what those might be, only confirmed it working with the tornado custom.
</summary>
<param name="vehicle">The vehicle handle.</param>
<param name="livery">Livery index.</param>
</member>
<member name="M:CitizenFX.Core.Native.API.SetVehicleSearchlight(System.Int32,System.Boolean,System.Boolean)">
<summary>
Only works during nighttime.
Expand Down Expand Up @@ -63313,6 +63416,16 @@
Stops recording and saves the recorded clip.
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.StopRecordingThisFrame">
<summary>
This disable the recording feature and has to be called every frame.
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.N_0xeb2d525b57f42b40">
<summary>
This disable the recording feature and has to be called every frame.
</summary>
</member>
<member name="M:CitizenFX.Core.Native.API.StopScreenEffect(System.String)">
<summary>
Example and list of screen FX: www.pastebin.com/dafBAjs0
Expand Down
Binary file modified dependencies/client/MenuAPI.net.dll
Binary file not shown.
Binary file modified dependencies/server/CitizenFX.Core.Server.dll
Binary file not shown.
Loading

0 comments on commit b48d050

Please sign in to comment.