Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WolvenKit/WolvenKit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: deanhannigan/WolvenKit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 9 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 14, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f39ca4d View commit details

Commits on Jul 15, 2023

  1. Copy the full SHA
    bd82533 View commit details
  2. Copy the full SHA
    f900bc9 View commit details
  3. Removed unused variables

    deanhannigan committed Jul 15, 2023
    Copy the full SHA
    ef2990e View commit details

Commits on Jul 22, 2023

  1. Error debugging

    deanhannigan committed Jul 22, 2023
    Copy the full SHA
    5ffedc0 View commit details
  2. Copy the full SHA
    668d9f6 View commit details
  3. Removed dep

    deanhannigan committed Jul 22, 2023
    Copy the full SHA
    d58a73e View commit details
  4. Copy the full SHA
    9030af3 View commit details

Commits on Oct 14, 2023

  1. Copy the full SHA
    6224869 View commit details
4 changes: 3 additions & 1 deletion WolvenKit.Common/RED4/CR2W/JSON/PrimitiveConverter.cs
Original file line number Diff line number Diff line change
@@ -1406,7 +1406,9 @@ public T ResolveReference(string referenceId)
{
if (!ReferenceIdToObjectMap.TryGetValue(referenceId, out var value))
{
throw new JsonException();

string json = JsonSerializer.Serialize(ReferenceIdToObjectMap);
throw new JsonException(json);
}

return value;
80 changes: 80 additions & 0 deletions WolvenKit.RED4/Types/Classes/CustomDialogViewController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
using static WolvenKit.RED4.Types.Enums;

namespace WolvenKit.RED4.Types
{
public partial class CustomDialogViewController : inkWidgetLogicController
{
[Ordinal(1)]
[RED("messagesList")]
public inkCompoundWidgetReference MessagesList
{
get => GetPropertyValue<inkCompoundWidgetReference>();
set => SetPropertyValue<inkCompoundWidgetReference>(value);
}

[Ordinal(2)]
[RED("messagesListController")]
public CWeakHandle<CustomEntriesListController> CustomEntriesListController
{
get => GetPropertyValue<CWeakHandle<CustomEntriesListController>>();
set => SetPropertyValue<CWeakHandle<CustomEntriesListController>>(value);
}

[Ordinal(3)]
[RED("scrollController")]
public CWeakHandle<inkScrollController> ScrollController
{
get => GetPropertyValue<CWeakHandle<inkScrollController>>();
set => SetPropertyValue<CWeakHandle<inkScrollController>>(value);
}

[Ordinal(4)]
[RED("journalManager")]
public CWeakHandle<gameJournalManager> JournalManager
{
get => GetPropertyValue<CWeakHandle<gameJournalManager>>();
set => SetPropertyValue<CWeakHandle<gameJournalManager>>(value);
}

[Ordinal(5)]
[RED("messages")]
public CArray<CWeakHandle<gameJournalEntry>> Messages
{
get => GetPropertyValue<CArray<CWeakHandle<gameJournalEntry>>>();
set => SetPropertyValue<CArray<CWeakHandle<gameJournalEntry>>>(value);
}

[Ordinal(6)]
[RED("parentEntry")]
public CWeakHandle<gameJournalEntry> ParentEntry
{
get => GetPropertyValue<CWeakHandle<gameJournalEntry>>();
set => SetPropertyValue<CWeakHandle<gameJournalEntry>>(value);
}

[Ordinal(7)]
[RED("singleThreadMode")]
public CBool SingleThreadMode
{
get => GetPropertyValue<CBool>();
set => SetPropertyValue<CBool>(value);
}

[Ordinal(8)]
[RED("newMessageAninmProxy")]
public CHandle<inkanimProxy> NewMessageAninmProxy
{
get => GetPropertyValue<CHandle<inkanimProxy>>();
set => SetPropertyValue<CHandle<inkanimProxy>>(value);
}

public CustomDialogViewController()
{
Messages = new();

PostConstruct();
}

partial void PostConstruct();
}
}
13 changes: 13 additions & 0 deletions WolvenKit.RED4/Types/Classes/CustomEntriesListController.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

namespace WolvenKit.RED4.Types
{
public partial class CustomEntriesListController : inkListController
{
public CustomEntriesListController()
{
PostConstruct();
}

partial void PostConstruct();
}
}
42 changes: 34 additions & 8 deletions WolvenKit.RED4/Types/Classes/MessengerGameController.cs
Original file line number Diff line number Diff line change
@@ -29,46 +29,70 @@ public inkWidgetReference DialogRef
}

[Ordinal(6)]
[RED("customDialogRef")]
public inkWidgetReference CustomDialogRef
{
get => GetPropertyValue<inkWidgetReference>();
set => SetPropertyValue<inkWidgetReference>(value);
}

[Ordinal(7)]
[RED("virtualList")]
public inkWidgetReference VirtualList
{
get => GetPropertyValue<inkWidgetReference>();
set => SetPropertyValue<inkWidgetReference>(value);
}

[Ordinal(8)]
[RED("buttonHintsController")]
public CWeakHandle<ButtonHints> ButtonHintsController
{
get => GetPropertyValue<CWeakHandle<ButtonHints>>();
set => SetPropertyValue<CWeakHandle<ButtonHints>>(value);
}

[Ordinal(7)]
[Ordinal(9)]
[RED("dialogController")]
public CWeakHandle<MessengerDialogViewController> DialogController
{
get => GetPropertyValue<CWeakHandle<MessengerDialogViewController>>();
set => SetPropertyValue<CWeakHandle<MessengerDialogViewController>>(value);
}

[Ordinal(8)]
[Ordinal(10)]
[RED("customDialogController")]
public CWeakHandle<CustomDialogViewController> CustomDialogController
{
get => GetPropertyValue<CWeakHandle<CustomDialogViewController>>();
set => SetPropertyValue<CWeakHandle<CustomDialogViewController>>(value);
}

[Ordinal(11)]
[RED("listController")]
public CWeakHandle<SimpleMessengerContactsVirtualListController> ListController
{
get => GetPropertyValue<CWeakHandle<SimpleMessengerContactsVirtualListController>>();
set => SetPropertyValue<CWeakHandle<SimpleMessengerContactsVirtualListController>>(value);
}

[Ordinal(9)]
[Ordinal(12)]
[RED("journalManager")]
public CWeakHandle<gameJournalManager> JournalManager
{
get => GetPropertyValue<CWeakHandle<gameJournalManager>>();
set => SetPropertyValue<CWeakHandle<gameJournalManager>>(value);
}

[Ordinal(10)]
[Ordinal(13)]
[RED("menuEventDispatcher")]
public CWeakHandle<inkMenuEventDispatcher> MenuEventDispatcher
{
get => GetPropertyValue<CWeakHandle<inkMenuEventDispatcher>>();
set => SetPropertyValue<CWeakHandle<inkMenuEventDispatcher>>(value);
}

[Ordinal(11)]
[Ordinal(14)]
[RED("activeData")]
public CHandle<MessengerContactSyncData> ActiveData
{
@@ -78,9 +102,11 @@ public CHandle<MessengerContactSyncData> ActiveData

public MessengerGameController()
{
ButtonHintsManagerRef = new inkWidgetReference();
ContactsRef = new inkWidgetReference();
DialogRef = new inkWidgetReference();
ButtonHintsManagerRef = new();
ContactsRef = new();
DialogRef = new();
CustomDialogRef = new();
VirtualList = new();

PostConstruct();
}