Skip to content

Commit

Permalink
Merge branch 'dev' into rc
Browse files Browse the repository at this point in the history
  • Loading branch information
Doxoh committed Oct 15, 2023
2 parents f3e71a5 + 34737c5 commit a910cc9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions api/AltV.Net.Client/Alt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,7 @@ public static bool GetBaseObjectById(BaseObjectType type, uint id, [MaybeNullWhe
public static bool IsWebViewGpuAccelerationActive => Core.IsWebViewGpuAccelerationActive;
public static IWorldObject GetWorldObjectByScriptID(BaseObjectType type, uint scriptId) => Core.GetWorldObjectByScriptID(type, scriptId);
public static VoiceConnectionState GetVoiceConnectionState() => Core.GetVoiceConnectionState();

public static int NetTime => Core.NetTime;
}
}
2 changes: 2 additions & 0 deletions api/AltV.Net/Alt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ public static Task ForEachColShapes(IAsyncBaseObjectCallback<IColShape> baseObje
public static IReadOnlyCollection<IMetric> GetAllMetrics() => Core.GetAllMetrics();
public static VoiceConnectionState GetVoiceConnectionState() => Core.GetVoiceConnectionState();

public static int NetTime => Core.NetTime;

public static ushort MaxStreamingPeds
{
get => Core.MaxStreamingPeds;
Expand Down

0 comments on commit a910cc9

Please sign in to comment.