Merge remote-tracking branch 'upstream/Integration' into feat/frame_pacing_metal
# Conflicts: # VoidLink/Base.lproj/iPad.storyboard # VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents
This commit is contained in:
commit
7691d2c0eb
16 files changed
+363
-66
No files matched your search
@@ -33,6 +33,7 @@
|
||||
@property (nonatomic, retain) NSNumber * touchMoveEventInterval;
|
||||
@property (nonatomic, retain) NSNumber * touchPointerVelocityFactor;
|
||||
@property (nonatomic, retain) NSNumber * gyroSensitivity;
|
||||
@property (nonatomic, retain) NSNumber * emulatedControllerType;
|
||||
@property (nonatomic, retain) NSNumber * mousePointerVelocityFactor;
|
||||
@property (nonatomic, retain) NSNumber * pointerVelocityModeDivider;
|
||||
@property (nonatomic, retain) NSString * uniqueId;
|
||||
|
||||
Reference in new issue
Block a user