Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
031f5e5
Initial work on switching to Rivet.
oryxel1 May 27, 2026
a7e05c1
rivet test.
oryxel1 May 27, 2026
723cbc8
yeeted imgui for now.
oryxel1 May 27, 2026
2e3d85e
stuff.
oryxel1 May 27, 2026
a40e374
stuff.
oryxel1 May 30, 2026
a2525a2
stuff.
oryxel1 May 30, 2026
d077582
stuff.
oryxel1 Jun 2, 2026
36f214e
Update Rivet.
oryxel1 Jun 2, 2026
44f1cff
improve.
oryxel1 Jun 3, 2026
f67ad8d
more work, separate render elements into components and containers.
oryxel1 Jun 4, 2026
02303d2
more stuff.
oryxel1 Jun 4, 2026
61aa6e9
use scroll container.
oryxel1 Jun 4, 2026
0f24afd
Fixed broken timestamp and allat.
oryxel1 Jun 4, 2026
2540b53
more work or whatever.
oryxel1 Jun 4, 2026
b7302b7
whatever.
oryxel1 Jun 4, 2026
f398d4d
Test
oryxel1 Jun 4, 2026
0de08e4
stuff.
oryxel1 Jun 4, 2026
4dd5dc8
Fix gradlew.
oryxel1 Jun 4, 2026
5737e65
ok initially fix.
oryxel1 Jun 4, 2026
f246dda
Fix layout and proper scrolling.
oryxel1 Jun 5, 2026
a2a7c75
more work.
oryxel1 Jun 5, 2026
2ea064f
more work.
oryxel1 Jun 5, 2026
9842849
Fix scaling on a begg screen resolution for Rivet.
oryxel1 Jun 5, 2026
4db06fb
More work, selection stuff.
oryxel1 Jun 7, 2026
91845e0
more.
oryxel1 Jun 7, 2026
ef85150
Update ThinGL & Rivet.
oryxel1 Jun 7, 2026
4529e69
stuff
oryxel1 Jun 7, 2026
8bacd88
more work (broken).
oryxel1 Jun 7, 2026
ceca315
stuff.
oryxel1 Jun 8, 2026
e978169
Update Rivet.
oryxel1 Jun 28, 2026
fe47ccf
Fixes AO text tab.
oryxel1 Jun 28, 2026
65025fd
stuff.
oryxel1 Jun 30, 2026
3c77995
stuff.
oryxel1 Jul 2, 2026
8ace82f
Fix stuff and update Rivet for the N times.
oryxel1 Jul 3, 2026
3b4e7a9
Merge branch 'master' into rivet-port
oryxel1 Jul 3, 2026
aaac901
Tell JitPack to use Java 25.
oryxel1 Jul 3, 2026
0bd41b3
Oops.
oryxel1 Jul 3, 2026
5726597
Fix niche rivet bug.
oryxel1 Jul 4, 2026
0dafff7
Partial support for moving component around.
oryxel1 Jul 5, 2026
f1c8890
Fixed scrolling desync.
oryxel1 Jul 5, 2026
22e72d1
Disallowing object overlapping when adding new objects.
oryxel1 Jul 5, 2026
3d45fe5
Fixes crashes on minimize, update Rivet.
oryxel1 Jul 5, 2026
a8496b8
Downgrade Rivet.
oryxel1 Jul 5, 2026
7e9e643
Fix jitter object dragging.
oryxel1 Jul 5, 2026
cab78d1
Added extra initial scrolling.
oryxel1 Jul 5, 2026
1870bb4
Nicer looking scroll.
oryxel1 Jul 5, 2026
61dcff6
More fixes, still broken.
oryxel1 Jul 5, 2026
9ee636d
Fix stuff.
oryxel1 Jul 5, 2026
9e08fae
Fixes initial mouse drag.
oryxel1 Jul 7, 2026
339b4b7
Added a play button.
oryxel1 Jul 7, 2026
83a3a88
Fix: scroll bar not showing up for tab.
oryxel1 Jul 10, 2026
57cc444
Fix edge case behaviour for adding element.
oryxel1 Jul 10, 2026
d4250e3
more work and broken stuff.
oryxel1 Jul 12, 2026
9876e8a
stuff.
oryxel1 Jul 12, 2026
6ad34db
start on reworking the ui.
oryxel1 Jul 12, 2026
d08e689
Fix dragging object in.
oryxel1 Jul 12, 2026
245d483
oops.
oryxel1 Jul 12, 2026
bc1fa6a
Added proper object dragging.
oryxel1 Jul 12, 2026
d9f87d5
Fix selection manager.
oryxel1 Jul 12, 2026
688913f
Minor code cleanup.
oryxel1 Jul 12, 2026
47a813c
Minor improvements.
oryxel1 Jul 13, 2026
f156a54
Fixed dragging, minor improvements.
oryxel1 Jul 13, 2026
44c0f05
Move text object into Objects tab.
oryxel1 Jul 13, 2026
f6f720d
Added circle and rectangle.
oryxel1 Jul 13, 2026
40ef013
Move track tab container into timeline container.
oryxel1 Jul 14, 2026
d54494f
Delete everything, rework the UI from scratch.
oryxel1 Jul 15, 2026
d8b9a2e
More stuff.
oryxel1 Jul 15, 2026
449d4fb
More stuff.
oryxel1 Jul 15, 2026
3ba0789
stuff.
oryxel1 Jul 16, 2026
a102ec3
Update Rivet.
oryxel1 Jul 16, 2026
b26ccd6
fix time section.
oryxel1 Jul 17, 2026
517b653
fix resizing.
oryxel1 Jul 17, 2026
7e05ce1
Object tab, added back dropping and dragging.
oryxel1 Jul 17, 2026
baed22f
Update Rivet.
oryxel1 Jul 18, 2026
c281e9b
scaling.
oryxel1 Jul 18, 2026
5421249
stuff.
oryxel1 Jul 19, 2026
579ce5e
Don't scale everything.
oryxel1 Jul 20, 2026
aa08450
stuff.
oryxel1 Jul 20, 2026
c51c9a0
transform.
oryxel1 Jul 20, 2026
ec1ba0b
improvements.
oryxel1 Jul 20, 2026
2ae327e
Cooler color picker.
oryxel1 Jul 20, 2026
078dbc6
Testing color wheel.
oryxel1 Jul 20, 2026
86dcbcf
Switch to a color wheel picker.
oryxel1 Jul 21, 2026
6ff211f
Brightness fix.
oryxel1 Jul 21, 2026
4c2ef09
fix crash... I think?
oryxel1 Jul 21, 2026
284dbc0
whatever this is.
oryxel1 Jul 21, 2026
6351346
better picker.
oryxel1 Jul 21, 2026
129b700
minor code cleanup.
oryxel1 Jul 21, 2026
3aa9d55
Bump Rivet.
oryxel1 Jul 23, 2026
f11c591
merge
oryxel1 Jul 23, 2026
eee0cd3
keyframe thingy.
oryxel1 Jul 24, 2026
7e2510b
more keyframe stuff.
oryxel1 Jul 25, 2026
d81a671
Initial work on dope sheet.
oryxel1 Jul 28, 2026
cd97d54
half assed implementation.
oryxel1 Jul 28, 2026
4c2e42a
More work or whatever.
oryxel1 Jul 31, 2026
8f4705b
Even more keyframe stuff.
oryxel1 Jul 31, 2026
c10d972
fix keyframe positioning, also color.
oryxel1 Jul 31, 2026
74889dd
more keyframe stuff.
oryxel1 Aug 7, 2026
307474a
Update Rivet, move stuff to rivet-extras.
oryxel1 Aug 7, 2026
728f8a7
Merge branch 'master' into rivet-port
oryxel1 Aug 12, 2026
a35872a
Merge branch 'master' into rivet-port
oryxel1 Aug 12, 2026
3bca79b
Fix.
oryxel1 Aug 12, 2026
682cdd4
Update Rivet.
oryxel1 Aug 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you want to download the jar file to run this, just download in [releases](ht
or alternatively in [actions](https://github.com/oryxel1/Base/actions) sections.

## Usage and examples
Download **Java 21** or above, and then run `java -jar Base.jar` (or whatever the jar file is called).
Download **Java 25** or above, and then run `java -jar Base.jar` (or whatever the jar file is called).
<br><br> For example of how to use the program, you can look at the [wiki](https://github.com/oryxel1/Base/wiki).

## Contact
Expand Down
18 changes: 18 additions & 0 deletions api/src/main/java/oxy/base/api/effects/EaseType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package oxy.base.api.effects;

import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public enum EaseType {
EASE_IN("Ease In"), EASE_OUT("Ease Out"), EASE_IN_OUT("Ease In Out");

private final String name;

public static String[] getAlls() {
String[] strings = new String[values().length];
for (int i = 0; i < values().length; i++) {
strings[i] = values()[i].name;
}
return strings;
}
}
2 changes: 2 additions & 0 deletions api/src/main/java/oxy/base/api/effects/Easing.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package oxy.base.api.effects;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public enum Easing {
LINEAR("Linear"), SINE("Sine"), QUAD("Quad"), CUBIC("Cubic"), QUART("Quart"), QUINT("Quint"), EXPO("Expo"), CIRC("Circ"), BACK("Back"), ELASTIC("Elastic"), BOUNCE("Bounce");

@Getter
private final String name;

public static String[] getAlls() {
Expand Down
13 changes: 1 addition & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,4 @@ subprojects {
implementation(rootProject.libs.google.gson)
implementation(rootProject.libs.configurate.yaml)
}
}
//
//dependencies {
// implementation(project(":editor"))
// implementation(project(":core"))
// implementation(project(":api"))
//
// implementation(libs.gdx.base)
// implementation(libs.commons.core)
//
// implementation(libs.imgui.binding)
//}
}
26 changes: 18 additions & 8 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@ var lwjgl = "3.3.6"
var lwjglStd = "3.4.0"
var libGdx = "1.13.1"

repositories {
maven("https://jitpack.io")
}

dependencies {
api(project(":api"))
api(project(":serializer"))

api(variantOf(libs.raphimc.thingl) { classifier("java17") })
api(libs.raphimc.thingl)
api(libs.commons.animations)
api(libs.unnamed.mocha)

api(libs.imgui.lwjgl3)
api(libs.imgui.binding)
api(libs.imgui.natives.windows)
api(libs.imgui.natives.linux)
api(libs.imgui.natives.macos)

api(libs.lwjgl.base)
api(libs.lwjgl.opengl)
api(libs.lwjgl.stb)
Expand All @@ -42,6 +40,8 @@ dependencies {
api(libs.jcraft.jorbis)
api(libs.javazoom.jlayer)

api(libs.weisj.jsvg)

listOf("natives-windows", "natives-windows-arm64", "natives-linux", "natives-linux-arm64").forEach {
api("org.lwjgl:lwjgl:$lwjgl:$it")
api("org.lwjgl:lwjgl-glfw:$lwjgl:$it")
Expand All @@ -57,4 +57,14 @@ dependencies {
}

api("com.badlogicgames.gdx:gdx-platform:$libGdx:natives-desktop")
}

api(libs.rivet.core) {
exclude("net.lenni0451.commons")
}
api(libs.rivet.thingl.backend) {
exclude("org.lwjgl")
exclude("net.lenni0451.commons")
}

api(libs.rivet.extras)
}
Loading