Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Cysharp/R3
Browse files Browse the repository at this point in the history
  • Loading branch information
neuecc committed Aug 15, 2024
2 parents f7be1bf + d24b875 commit cf13052
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2202,6 +2202,7 @@ Operator methods are defined as extension methods to `Observable<T>` in the stat
| **Where**(this `Observable<T>` source, `TState` state, `Func<T, TState, Boolean>` predicate) | `Observable<T>` |
| **Where**(this `Observable<T>` source, `TState` state, `Func<T, Int32, TState, Boolean>` predicate) | `Observable<T>` |
| **WhereAwait**(this `Observable<T>` source, `Func<T, CancellationToken, ValueTask<Boolean>>` predicate, `AwaitOperation` awaitOperation = AwaitOperation.Sequential, `Boolean` configureAwait = true, `Boolean` cancelOnCompleted = false, `Int32` maxConcurrent = -1) | `Observable<T>` |
| **WhereNotNull**(this `Observable<TResult>` source) | `Observable<TResult>` |
| **WithLatestFrom**(this `Observable<TFirst>` first, `Observable<TSecond>` second, `Func<TFirst, TSecond, TResult>` resultSelector) | `Observable<TResult>` |

In dotnet/reactive, methods that return a single `IObservable<T>` (such as `First`) are all provided only as `***Async`, returning `Task<T>`. Additionally, to align with the naming of Enumerable, `Buffer` has been changed to `Chunk`.
Expand Down
1 change: 1 addition & 0 deletions docs/reference_operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
| **Where**(this `Observable<T>` source, `TState` state, `Func<T, TState, Boolean>` predicate) | `Observable<T>` |
| **Where**(this `Observable<T>` source, `TState` state, `Func<T, Int32, TState, Boolean>` predicate) | `Observable<T>` |
| **WhereAwait**(this `Observable<T>` source, `Func<T, CancellationToken, ValueTask<Boolean>>` predicate, `AwaitOperation` awaitOperation = AwaitOperation.Sequential, `Boolean` configureAwait = true, `Boolean` cancelOnCompleted = false, `Int32` maxConcurrent = -1) | `Observable<T>` |
| **WhereNotNull**(this `Observable<TResult>` source) | `Observable<TResult>` |
| **WithLatestFrom**(this `Observable<TFirst>` first, `Observable<TSecond>` second, `Func<TFirst, TSecond, TResult>` resultSelector) | `Observable<TResult>` |


2 changes: 1 addition & 1 deletion src/R3.Godot/addons/R3.Godot/plugin.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
name="R3.Godot"
description="The new future of dotnet/reactive and UniRx."
author="Cysharp"
version="1.2.4"
version="1.2.5"
language="C-sharp"
script="GodotR3Plugin.cs"
2 changes: 1 addition & 1 deletion src/R3.Unity/Assets/R3.Unity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "com.cysharp.r3",
"displayName": "R3",
"author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
"version": "1.2.4",
"version": "1.2.5",
"unity": "2021.3",
"description": "Reactive Extensions for Unity.",
"keywords": [ "rx", "event", "Scripting" ],
Expand Down

0 comments on commit cf13052

Please sign in to comment.