Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
c742a03
Working and fixing stuff
invalid-email-address Oct 25, 2018
136d9a1
Changes
invalid-email-address Oct 25, 2018
64d2c8e
Pushing other os images
invalid-email-address Oct 25, 2018
c743d4e
File renamed
invalid-email-address Oct 25, 2018
fe47705
Working on implement OpenJFX auto updater
invalid-email-address Oct 26, 2018
21086e2
Fixed Bugs in TagsFile
skier233 Oct 31, 2018
c857c5d
added read only option to tagged picture
skier233 Oct 31, 2018
b43be6c
Fixed issues in the main gui
skier233 Nov 1, 2018
e7fa89b
Small Fixes
invalid-email-address Nov 14, 2018
41ad072
Update TagsFile.java
GodDragoner Nov 26, 2018
3269903
Merge branch 'master' into master
GodDragoner Nov 26, 2018
7cd01b2
Merge pull request #13 from skier233/master
GodDragoner Nov 26, 2018
65cd67d
Merge pull request #1 from GodDragoner/master
skier233 Nov 27, 2018
0d77964
Fixed image distortion when scaling issue on the 2 imageviews on the
skier233 Nov 27, 2018
d09eadc
Fixed domme image set, showTaggedImagesExact, and the scrolling issue in
skier233 Nov 27, 2018
e5c55f7
Fixed minor issue with domme images. All is working now.
skier233 Nov 27, 2018
9aee1ba
Media Tagger now correctly shows the correct original dress state of an
skier233 Nov 27, 2018
c15affd
Merge pull request #14 from skier233/master
GodDragoner Nov 28, 2018
edb9165
Reworked some code changes that were made in the latest merge
invalid-email-address Nov 28, 2018
86d20c0
Small changes
invalid-email-address Nov 28, 2018
6970371
Merge pull request #2 from GodDragoner/master
skier233 Nov 29, 2018
d29f6b0
Fixed multiple issues
skier233 Dec 3, 2018
a53a8f4
Merge pull request #15 from skier233/master
GodDragoner Dec 3, 2018
7d55bd8
Small changes
invalid-email-address Dec 4, 2018
58ebaa4
fixed mac issues finally
skier233 Dec 4, 2018
268640c
Added base functionality for image downloading with the new system.
skier233 Dec 23, 2018
bf7307f
tried optimizing pornhub downloader
skier233 Dec 27, 2018
a8465f1
reverting to original pornhub downloader
skier233 Dec 27, 2018
b1ceb82
experimental release
skier233 Dec 28, 2018
2346ab8
Making good progress towards the GUI stage 1 update
skier233 Dec 30, 2018
42699f0
Good portion of the personality settings gui working.
skier233 Dec 31, 2018
c0fed1f
Making good progress on the personality gui.
skier233 Jan 1, 2019
5209f5e
Finished GUI Update Phase 1
skier233 Feb 25, 2019
75217f3
Merge branch 'master' into master
skier233 Feb 25, 2019
495c8aa
Merge pull request #17 from skier233/master
GodDragoner Feb 27, 2019
dc412db
Reworking merge.
invalid-email-address Feb 27, 2019
8c3a2b2
Merge remote-tracking branch 'GodDragoner/master'
skier233 Feb 27, 2019
8179bc1
Finished removing unused libraries and code chunks
skier233 Feb 27, 2019
36b9a2f
Merge pull request #18 from skier233/test
skier233 Feb 27, 2019
0720604
testing pushing
skier233 Feb 27, 2019
ed292a0
Removed unused jars from resource folder
skier233 Feb 27, 2019
8aa2e0b
Themes are working. Please test
invalid-email-address Feb 28, 2019
2e09f8a
Small fix to the send input function
invalid-email-address Feb 28, 2019
3cd10be
Fixed bug with tease date not saving properly
invalid-email-address Feb 28, 2019
4b72254
Small changes
invalid-email-address Mar 1, 2019
f8fe809
Fixed issue with primary color
skier233 Mar 1, 2019
ab9c601
Fully fixed transparent primary color issue
skier233 Mar 1, 2019
56fe836
added css classes and ids to main.fxml and got settings panel mostly
skier233 Mar 2, 2019
9be33bf
disabled custom window controls for now
skier233 Mar 2, 2019
77b1a66
Working on theme styling with css
invalid-email-address Mar 2, 2019
fe63b2c
Test
invalid-email-address Mar 2, 2019
570c945
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Mar 3, 2019
2fa9a85
Now handles GUI settings through css directly in file. Unable to colo…
invalid-email-address Mar 3, 2019
c6cfaa3
Array support
invalid-email-address Mar 7, 2019
29f38c5
Fixed something regarding tagged images
invalid-email-address Mar 9, 2019
e800879
Small bug fixes
invalid-email-address Mar 12, 2019
a0f2881
Working on fixing issue with buttons
skier233 Mar 12, 2019
f83a1aa
fixed bug with multiple colors on a background
skier233 Mar 12, 2019
e027538
missed a file in the last commit
skier233 Mar 12, 2019
243c3d4
Continuing working on buttons and themes
skier233 Mar 12, 2019
fccbb22
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Mar 12, 2019
b88f68c
working with button themes
skier233 Mar 12, 2019
81015fd
about ready for release. plz test
skier233 Mar 18, 2019
8edfca1
Revert "about ready for release. plz test"
invalid-email-address Mar 18, 2019
c300a58
Fixed video player not waiting for video to finish
invalid-email-address Mar 19, 2019
b445820
Fixed an issue where only one Response was triggered even though it r…
invalid-email-address Mar 29, 2019
215bd01
All bugs fixed. Please release gui update
skier233 Mar 30, 2019
55a2db5
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Mar 30, 2019
210546d
Ready for release
skier233 Mar 30, 2019
cc45b3a
Quite a lot of fixes
invalid-email-address Mar 30, 2019
4a8b9d4
Small fixes
invalid-email-address Mar 30, 2019
5f8fdc0
Working on adding progress info for url ripping
skier233 Mar 31, 2019
b239589
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Mar 31, 2019
4d26fee
commit again
skier233 Mar 31, 2019
c379ec7
Small fixes
invalid-email-address Mar 31, 2019
d1a0824
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Mar 31, 2019
89dbb0e
.
skier233 Mar 31, 2019
2b68062
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Mar 31, 2019
b7c69ef
Progress text
invalid-email-address Mar 31, 2019
82a3c3d
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Mar 31, 2019
23e6419
Small fixes
invalid-email-address Mar 31, 2019
7d99f3a
1.1 release
invalid-email-address Apr 1, 2019
e549fa2
1.1 release (theme fix and debug removed)
invalid-email-address Apr 1, 2019
30fe280
Fixed twilight colors
skier233 Apr 1, 2019
7487fd9
fixed colors
skier233 Apr 1, 2019
abef4db
.
skier233 Apr 1, 2019
7947328
1.1 release (theme fix and debug removed)
invalid-email-address Apr 1, 2019
3c7fe3f
Added text to speech
skier233 Apr 18, 2019
fafcb61
Text To Speech fully added
skier233 Apr 18, 2019
84871bf
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Apr 19, 2019
99b5236
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Apr 19, 2019
71f628f
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Apr 19, 2019
6c7cdad
Formatting changes
invalid-email-address Apr 19, 2019
11e4256
Added missing files
skier233 Apr 19, 2019
ac20dbd
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Apr 19, 2019
f65122e
Formatting changes
invalid-email-address Apr 19, 2019
3f028f6
Got most of chatUtils implemented
skier233 Apr 20, 2019
0e7adf3
Fix for IntelliJ and TTS
invalid-email-address Apr 20, 2019
a0eeb51
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Apr 20, 2019
d4a6865
Format changes
invalid-email-address Apr 20, 2019
8f3726c
Small change
invalid-email-address Apr 20, 2019
bb2b046
bit more working on chat stuff. also, optimized imports
skier233 Apr 20, 2019
29feb1e
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
skier233 Apr 20, 2019
282b517
Logger now always outputs console
invalid-email-address Apr 20, 2019
e45c039
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Apr 20, 2019
3d3751b
Added class loader again
invalid-email-address Apr 21, 2019
e7f4070
Reverted imports in fxml files
invalid-email-address Apr 21, 2019
c5ec308
Is Images Locked function
invalid-email-address Apr 21, 2019
5651c0d
Chat changes finished
skier233 Apr 22, 2019
f68073c
Chat changes finished
skier233 Apr 22, 2019
170f06a
Merge remote-tracking branch 'origin/master'
skier233 Apr 22, 2019
fcdc635
Reformat of whole code
invalid-email-address Apr 22, 2019
058ae3e
Few fixes. Especially to new chat changes
invalid-email-address Apr 23, 2019
b351cab
Added a progress bar to loading picture sets
invalid-email-address Apr 30, 2019
702a458
Fixed lazy sub at startup
invalid-email-address Apr 30, 2019
610e402
1.2
invalid-email-address Jul 5, 2019
557205d
Proof of concept for integrating EstimAPI
Jul 7, 2019
a90530a
Added Rudimentary Estim settings
Jul 19, 2019
f683107
Finished Estim settings
Jul 29, 2019
978f740
Correct creator of EstimSettings
Aug 5, 2019
7be60ce
Fixed small bug
invalid-email-address Aug 9, 2019
bec93ba
initial implementation of statistics system complete
skier233 Aug 29, 2019
38fd639
rest of changes for initial statistics implemntation
skier233 Aug 29, 2019
e8b3d34
More progress on statistics system
skier233 Sep 7, 2019
8a98298
Testing
invalid-email-address Sep 14, 2019
e2a8829
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Sep 14, 2019
065fb3e
Testing
invalid-email-address Sep 14, 2019
f855aad
Removed LFS
invalid-email-address Sep 14, 2019
3776bab
Code cleanup
Oct 20, 2019
b14d2da
Move savePower and restorePower from EstimMetronome to EstimState
Oct 21, 2019
003dab9
pushed jar and changes for the statistics system
skier233 Oct 22, 2019
08dc178
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Oct 22, 2019
aa57c98
git ignores
skier233 Oct 22, 2019
445eb47
Fix EstimSettings BPM Min and BPM Max using ChannelA Min and Max values
Oct 23, 2019
10d18c0
Rename EstimSettings BPM Min and BPM Max to estimMetronomeBpm[min,max]
Oct 23, 2019
9cfafac
Fixed responses not waiting for each other
invalid-email-address Oct 23, 2019
9a8e291
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Oct 23, 2019
503e573
Fixed TAJ not identifying the lib folder of java fx correctly
invalid-email-address Oct 24, 2019
d74c6b8
Merged master
Oct 26, 2019
cd3d871
Remove unused imports
Oct 28, 2019
8a10704
Merge pull request #19 from xman2B/master
GodDragoner Oct 28, 2019
add69ad
Estim Integration
invalid-email-address Nov 1, 2019
a74d681
fixed statistics system bug where multiple layers deep of modules werent
skier233 Nov 6, 2019
2ecf340
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava.git
skier233 Nov 6, 2019
a71bed3
fixing gitignores
skier233 Nov 6, 2019
da7239c
.
skier233 Nov 6, 2019
83f73f1
added estimAPI jar
skier233 Nov 6, 2019
a42435e
Small fixes
invalid-email-address Nov 7, 2019
32febe6
Merge branch 'master' of https://github.com/GodDragoner/TeaseAIJava
invalid-email-address Nov 7, 2019
7443cbf
Small "fix"
invalid-email-address Nov 19, 2019
6407f1d
Added GNU License
skier233 Nov 22, 2019
da9562b
Delete License.txt
skier233 Nov 22, 2019
46927d7
Created License
skier233 Nov 22, 2019
65db8e9
Use gradle as proper build system and dependency manager.
morgenkaffe3 Nov 16, 2019
ef2f0b0
Add github workflow
morgenkaffe3 Nov 16, 2019
4227419
Remove deprecated compile
morgenkaffe3 Nov 16, 2019
c290ad3
Add artifacts
morgenkaffe3 Nov 16, 2019
3044b60
Add caching for gradle
morgenkaffe3 Nov 16, 2019
afbbc9c
Move cache after checkout
morgenkaffe3 Nov 16, 2019
e0fb734
Only assemble platform specific archives
morgenkaffe3 Nov 16, 2019
be0aeb6
GH Actions doesn't accept not character
morgenkaffe3 Nov 16, 2019
d2ff78b
Remove old javafx download logic
morgenkaffe3 Nov 22, 2019
9cd9b37
Testing publishing to github packages
morgenkaffe3 Nov 27, 2019
5b0bdb3
Don't use reserved variables
morgenkaffe3 Nov 27, 2019
95ab9ad
Add a version
morgenkaffe3 Nov 27, 2019
c61e962
Trying to figure out why publish is not working
morgenkaffe3 Nov 27, 2019
b8d3797
Remove Github Packages as they can't be downloaded publicly
morgenkaffe3 Nov 27, 2019
0f15ca2
Set Java version
morgenkaffe3 Nov 27, 2019
19e030a
Jitpack JDK Version
morgenkaffe3 Nov 27, 2019
2eafcd2
Add artifact to install
morgenkaffe3 Nov 27, 2019
4b20220
Add JitPack trigger to build
morgenkaffe3 Nov 27, 2019
683c72d
Generate config
morgenkaffe3 Nov 28, 2019
0b149fa
Don't resolve base path property on ci
morgenkaffe3 Nov 28, 2019
cb8df04
Fix base path
morgenkaffe3 Nov 28, 2019
b70a91c
Use GH pages instead of Jitpack; signatures won't work otherwise
morgenkaffe3 Nov 28, 2019
ff90be0
Add access token and other os files. Reduce to running on linux for now
morgenkaffe3 Nov 28, 2019
eac4450
Publish update config
morgenkaffe3 Nov 28, 2019
329dd9f
Streamline actions workflow and add main class to config
morgenkaffe3 Nov 28, 2019
5046ef7
Should have been property, not dynamic property
morgenkaffe3 Nov 28, 2019
5ceda79
Force newer groovy version
morgenkaffe3 Nov 28, 2019
064fef5
Remove TAJUpdater
morgenkaffe3 Nov 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

43 changes: 43 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Java CI

on: [push]

jobs:
build:
strategy:
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1

- uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.11

- name: Build with Gradle
run: ./gradlew build

- name: Create update4j configuration
run: ./gradlew generateUpdateConfig

- name: Deploy to Github Pages
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
# Need to create a personal access token until this is resolved:
# https://github.community/t5/GitHub-Actions/Github-action-not-triggering-gh-pages-upon-push/m-p/31266/highlight/true#M743
#GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BASE_BRANCH: master # The branch the action should deploy from.
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: build/pages # The folder the action should deploy.

25 changes: 18 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
*.properties
# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build

# TeaseAI files
Themes/
log/
Personalities/*
Images/*
Logs/*
TeaseAI.properties

# IntelliJ
.idea
*.iml
out
target

# Eclipse
.settings
.project
.classpath
.git
Personalities/*
Images/*
Logs/*
bin/
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions META-INF/MANIFEST.MF

This file was deleted.

81 changes: 81 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
plugins {
// Apply the java plugin to add support for Java
id 'java'

// Apply the application plugin to add support for building a CLI application.
id 'application'

id 'org.openjfx.javafxplugin' version '0.0.8'

id 'maven-publish'

id 'com.palantir.git-version' version '0.12.2'
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

javafx {
version = "13"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing' ]
}

repositories {
jcenter()

// Used to import EstimAPI from Github
maven { url "https://jitpack.io" }
}

dependencies {
// This dependency is used by the application.
implementation 'com.google.guava:guava:28.0-jre'
implementation 'com.google.code.gson:gson:2.8.6'
implementation group: 'de.dfki.mary', name: 'voice-cmu-slt-hsmm', version: '5.2'

// https://mvnrepository.com/artifact/de.dfki.mary/voice-dfki-prudence-hsmm
implementation group: 'de.dfki.mary', name: 'voice-dfki-prudence-hsmm', version: '5.2'


// jsoup HTML parser library @ https://jsoup.org/
implementation 'org.jsoup:jsoup:1.12.1'

// https://mvnrepository.com/artifact/org.json/json
implementation group: 'org.json', name: 'json', version: '20190722'
// TODO Update to commons-configuration2?
// https://mvnrepository.com/artifact/commons-configuration/commons-configuration
implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.10'

implementation 'com.github.GodDragoner:EstimAPI:master-SNAPSHOT'

// Use JUnit test framework
testImplementation 'junit:junit:4.12'
}

configurations.all {
resolutionStrategy {
// Force newer groovy version (required by voice-dfki-prudence-hsmm) because older one fails with module resolution in update4j.
force 'org.codehaus.groovy:groovy-all:2.5.8'
}
}

application {
// Define the main class for the application.
mainClassName = 'me.goddragon.teaseai.Main'
}

version gitVersion()

publishing {
publications {
maven(MavenPublication) {
groupId = 'com.github.GodDragoner'
artifactId = 'TeaseAIJava'
from components.java
}
}
}

apply plugin: 'me.goddragon.updater'
6 changes: 6 additions & 0 deletions buildSrc/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

5 changes: 5 additions & 0 deletions buildSrc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
15 changes: 15 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
description = "Exposes gradle buildSrc for IDE support"

apply plugin: "groovy"

repositories {
mavenLocal()
mavenCentral()
}

dependencies {
implementation gradleApi()
implementation localGroovy()

implementation group: 'org.update4j', name: 'update4j', version: '1.4.4'
}
43 changes: 43 additions & 0 deletions buildSrc/src/main/java/me/goddragon/updater/GitHubRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package me.goddragon.updater;

public class GitHubRepository {
private final String owner;
private final String repository;

public GitHubRepository(String owner, String repository) {
super();
this.owner = owner;
this.repository = repository;
}

public String getOwner() {
return owner;
}

public String getRepository() {
return repository;
}

private static String getActionString() {
String actionString = System.getenv("GITHUB_REPOSITORY");

if(actionString == null) {
throw new RuntimeException("This task is only available on Github Actions!");
}

return actionString;
}

public static GitHubRepository fromActionsString() {

String[] parts = getActionString().split("/", 2);
String owner = parts[0];
String repository = parts[1];
return new GitHubRepository(owner, repository);
}

public String getPagesUrl(String file) {
return String.format("https://%s.github.io/%s/%s",
this.owner, this.repository, file);
}
}
10 changes: 10 additions & 0 deletions buildSrc/src/main/java/me/goddragon/updater/Update4JPlugin.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package me.goddragon.updater;

import org.gradle.api.Plugin;
import org.gradle.api.Project;

public class Update4JPlugin implements Plugin<Project> {
public void apply(Project project) {
project.getTasks().create("generateUpdateConfig", Update4JTask.class).dependsOn("jar");
}
}
Loading