Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

CyberArchPlugins
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c5ae848d

Commit c5ae848d authored 1 year ago by Kevin Nguyen

Downloads
- Patches
- Plain Diff

Fix merge conflict database reader onto main

parent d9f7f0eb

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Plugins/CyberArchWarehouse/Content/DataStreaming/Blueprints/BP_LocusDBReader.uasset 2 additions, 2 deletions

.../Content/DataStreaming/Blueprints/BP_LocusDBReader.uasset
Plugins/CyberArchWarehouse/Content/DataStreaming/Blueprints/StreamingAdministrator.uasset 2 additions, 2 deletions

...nt/DataStreaming/Blueprints/StreamingAdministrator.uasset
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Private/LocusDBReader.cpp 9 additions, 4 deletions

...house/Source/CyberArchWarehouse/Private/LocusDBReader.cpp
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Private/VoxelSystem.cpp 18 additions, 2 deletions

...rehouse/Source/CyberArchWarehouse/Private/VoxelSystem.cpp
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Private/WarehouseFunctionLibrary.cpp 52 additions, 0 deletions

...e/CyberArchWarehouse/Private/WarehouseFunctionLibrary.cpp
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h 6 additions, 4 deletions

...arehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/VoxelSystem.h 3 additions, 0 deletions

...hWarehouse/Source/CyberArchWarehouse/Public/VoxelSystem.h
Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/WarehouseFunctionLibrary.h 6 additions, 0 deletions

...urce/CyberArchWarehouse/Public/WarehouseFunctionLibrary.h

with 98 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment