diff --git a/assets/sa/classes.db b/assets/sa/classes.db index 86484f26..427109c0 100644 --- a/assets/sa/classes.db +++ b/assets/sa/classes.db @@ -2440,7 +2440,7 @@ GetYAngle,0D03,0,0,("self: Matrix" "yAngle%f") GetZAngle,0D04,0,0,("self: Matrix" "zAngle%f") Multiply,0D00,0,0,("matrixA: Matrix" "matrixB: Matrix" "handle: Matrix") Rotate,0D08,0,0,("self: Matrix" "x%f" "y%f" "z%f") -RotateOnAxis,0D01,0,0,("self: Matrix" "axisX%f" "axisY%f" "axisZ%f" "angle%f" "combineOp%i") +RotateOnAxis,0D01,0,0,("self: Matrix" "axisX%f" "axisY%f" "axisZ%f" "angle%f" "combineOp: RwCombine") SetPosition,0D05,0,0,("self: Matrix" "x%f" "y%f" "z%f") $END diff --git a/assets/sa/opcodes.txt b/assets/sa/opcodes.txt index c3904a95..90fb4f75 100644 --- a/assets/sa/opcodes.txt +++ b/assets/sa/opcodes.txt @@ -2036,7 +2036,7 @@ {0F16:} set_on_mission {status} [bool] {0F17:} [var address: int] = get_model_name_pointer {modelId} [model_any] {0D00:} [var handle: Matrix] = multiply_matrices {matrixA} [Matrix] {matrixB} [Matrix] -{0D01:} rotate_matrix_on_axis [Matrix] {axisX} [float] {axisY} [float] {axisZ} [float] {angle} [float] {combineOp} [int] +{0D01:} rotate_matrix_on_axis [Matrix] {axisX} [float] {axisY} [float] {axisZ} [float] {angle} [float] {combineOp} [RwCombine] {0D02:} [var xAngle: float] = get_matrix_x_angle [Matrix] {0D03:} [var yAngle: float] = get_matrix_y_angle [Matrix] {0D04:} [var zAngle: float] = get_matrix_z_angle [Matrix] @@ -2059,7 +2059,7 @@ {0D15:} set_matrix_z_rotation {matrix} [any] {angle} [float] {0D16:} set_matrix_rotation_from_quat {matrix} [any] {quat} [any] {0D17:} set_quat_from_matrix {matrix} [any] {quat} [any] -{0D18:} rotate_quat_on_axis {quat} [any] {x} [float] {y} [float] {z} [float] {angle} [float] {combineOp} [int] +{0D18:} rotate_quat_on_axis {quat} [any] {x} [float] {y} [float] {z} [float] {angle} [float] {combineOp} [RwCombine] {0D19:} [var quat: any] = get_normalised_quat {quat} [any] {0D1A:} [var quat: any] = multiply_quats {quat1} [any] {quat2} [any] {0D1B:} [var type: EntityTypes], [var class: EntityClasses] = get_entity_type_and_class {entity} [any] diff --git a/assets/sa/sa.json b/assets/sa/sa.json index 87ad01ff..aad205cd 100644 --- a/assets/sa/sa.json +++ b/assets/sa/sa.json @@ -1,7 +1,7 @@ { "meta": { - "last_update": 1733722052360, - "version": "0.807", + "last_update": 1734177289355, + "version": "0.808", "url": "https://library.sannybuilder.com/#/sa" }, "extensions": [ @@ -56544,7 +56544,7 @@ }, { "name": "combineOp", - "type": "int" + "type": "RwCombine" } ], "id": "0D01", @@ -57094,7 +57094,7 @@ }, { "name": "combineOp", - "type": "int" + "type": "RwCombine" } ], "id": "0D18", diff --git a/ngsw.json b/ngsw.json index 0958340a..52974d54 100644 --- a/ngsw.json +++ b/ngsw.json @@ -1,6 +1,6 @@ { "configVersion": 1, - "timestamp": 1734176232265, + "timestamp": 1734177357219, "index": "/index.html", "assetGroups": [ {