Skip to content

Actions: Xlinka/Project-Obsidian

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
183 workflow runs
183 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #77 from Nytra/audioWork Check for merge conflicts #192: Commit 62b4ca8 pushed by Xlinka
January 26, 2025 03:18 29s main
main
January 26, 2025 03:18 29s
Fix audio effect nodes passing through the carrier signal, and add new Phase Modulation algorithm that doesn't click Check for merge conflicts #191: Pull request #77 synchronize by Nytra
January 24, 2025 20:31 25s Nytra:audioWork
Nytra:audioWork
January 24, 2025 20:31 25s
Fix audio effect nodes passing through the carrier signal, and add new Phase Modulation algorithm that doesn't click Check for merge conflicts #190: Pull request #77 opened by Nytra
January 22, 2025 10:41 23s Nytra:audioWork
Nytra:audioWork
January 22, 2025 10:41 23s
Merge pull request #76 from Nytra/audioWork Check for merge conflicts #189: Commit 7cb7cf3 pushed by Xlinka
January 6, 2025 00:34 24s main
main
January 6, 2025 00:34 24s
Fix for null ref exception on loading a world Check for merge conflicts #188: Pull request #76 opened by Nytra
January 5, 2025 19:05 24s Nytra:audioWork
Nytra:audioWork
January 5, 2025 19:05 24s
Merge pull request #75 from Nytra/audioWork Check for merge conflicts #187: Commit db9cfa9 pushed by Xlinka
January 5, 2025 18:52 22s main
main
January 5, 2025 18:52 22s
A bunch of new audio nodes and other related changes Check for merge conflicts #186: Pull request #75 synchronize by Nytra
January 5, 2025 18:19 27s Nytra:audioWork
Nytra:audioWork
January 5, 2025 18:19 27s
A bunch of new audio nodes and other related changes Check for merge conflicts #185: Pull request #75 synchronize by Nytra
January 5, 2025 18:16 22s Nytra:audioWork
Nytra:audioWork
January 5, 2025 18:16 22s
A bunch of new audio nodes and other related changes Check for merge conflicts #184: Pull request #75 synchronize by Nytra
January 5, 2025 18:16 25s Nytra:audioWork
Nytra:audioWork
January 5, 2025 18:16 25s
A bunch of new audio nodes and other related changes Check for merge conflicts #183: Pull request #75 synchronize by Nytra
January 5, 2025 17:00 24s Nytra:audioWork
Nytra:audioWork
January 5, 2025 17:00 24s
A bunch of new audio nodes and other related changes Check for merge conflicts #182: Pull request #75 opened by Nytra
January 5, 2025 16:46 24s Nytra:audioWork
Nytra:audioWork
January 5, 2025 16:46 24s
Merge pull request #73 from Nytra/audioWork Check for merge conflicts #181: Commit 405e5ee pushed by Xlinka
January 5, 2025 00:28 33s main
main
January 5, 2025 00:28 33s
Merge pull request #74 from Nytra/squareTriangle Check for merge conflicts #180: Commit 01a4179 pushed by Xlinka
January 4, 2025 16:53 32s main
main
January 4, 2025 16:53 32s
Add SquareGenerator and TriangleGenerator Check for merge conflicts #179: Pull request #74 opened by Nytra
January 3, 2025 20:58 24s Nytra:squareTriangle
Nytra:squareTriangle
January 3, 2025 20:58 24s
Add PhaseModulator, Add RingModulator, rename FrequencyModulator to SineShapedRingModulator Check for merge conflicts #178: Pull request #73 opened by Nytra
January 2, 2025 11:03 24s Nytra:audioWork
Nytra:audioWork
January 2, 2025 11:03 24s
Merge pull request #72 from Nytra/audioWork Check for merge conflicts #177: Commit c5b409b pushed by Xlinka
January 1, 2025 16:20 27s main
main
January 1, 2025 16:20 27s
Add SawtoothGenerator and fix a problem with Frequency Quantize when the input is zero Check for merge conflicts #176: Pull request #72 opened by Nytra
January 1, 2025 10:54 26s Nytra:audioWork
Nytra:audioWork
January 1, 2025 10:54 26s
Merge pull request #71 from Nytra/audioWork Check for merge conflicts #175: Commit 6d69152 pushed by Xlinka
December 31, 2024 17:05 24s main
main
December 31, 2024 17:05 24s
Clamp audio buffer values to prevent audio breaking, Use IsActive, update filters to handle different types, use audio update callback Check for merge conflicts #174: Pull request #71 synchronize by Nytra
December 31, 2024 15:59 28s Nytra:audioWork
Nytra:audioWork
December 31, 2024 15:59 28s
Clamp audio buffer values to prevent audio breaking, Use IsActive, update filters to handle different types, use audio update callback Check for merge conflicts #173: Pull request #71 opened by Nytra
December 31, 2024 10:15 25s Nytra:audioWork
Nytra:audioWork
December 31, 2024 10:15 25s
Merge pull request #68 from Nytra/audioWork Check for merge conflicts #172: Commit 6e7b125 pushed by Xlinka
December 30, 2024 14:52 24s main
main
December 30, 2024 14:52 24s
Add ADSR Envelope node and adjust frequency modulator's modulation range Check for merge conflicts #171: Pull request #68 opened by Nytra
December 30, 2024 14:13 25s Nytra:audioWork
Nytra:audioWork
December 30, 2024 14:13 25s
Merge pull request #67 from Nytra/audioWork Check for merge conflicts #170: Commit bac01eb pushed by Xlinka
December 29, 2024 15:22 32s main
main
December 29, 2024 15:22 32s
Remove comment and useless line of code Check for merge conflicts #169: Pull request #67 opened by Nytra
December 29, 2024 14:08 28s Nytra:audioWork
Nytra:audioWork
December 29, 2024 14:08 28s
Merge pull request #66 from Nytra/audioWork Check for merge conflicts #168: Commit 536d406 pushed by Xlinka
December 29, 2024 14:05 22s main
main
December 29, 2024 14:05 22s