Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
912eef9
Update README
Wirlaa Dec 14, 2022
c7880da
Init
Yonell Dec 14, 2022
247eef3
Another init
Yonell Dec 14, 2022
de8e919
Another init
Yonell Dec 14, 2022
79e5874
Merge branch 'main' of https://github.com/Wirlaa/TheAbyss
Yonell Dec 14, 2022
1382a76
Merge branch 'main' of https://github.com/Wirlaa/TheAbyss
Yonell Dec 14, 2022
2e4e9a8
Merge branch 'main' of https://github.com/Wirlaa/TheAbyss
Yonell Dec 14, 2022
37f01e1
Mapa i animalsy
Yonell Dec 17, 2022
7d52145
Rozgrzebany i zostawiony silnik, parametry symulacji do przemyslenia,…
Yonell Dec 18, 2022
1395404
Added so many new things I cant really remember them all
Yonell Dec 20, 2022
15f0d39
Trying to remove cached intelliJ files
Yonell Dec 20, 2022
cb43559
Another try
Yonell Dec 20, 2022
f990e15
Dodanie visualizera, dokończenie zwierzątek i zaczęcie roślin, do pop…
Yonell Dec 20, 2022
f4cbb53
Dodanie visualizera, dokończenie zwierzątek i zaczęcie roślin, do pop…
Yonell Dec 20, 2022
0fa4893
Naprawienie merge conflict w main
Yonell Dec 20, 2022
b86604e
Finished backend I guess. There might be bugs, but the core works. We…
Yonell Dec 21, 2022
b78e51e
Added Utils class with static function fightForYourDeath()
Yonell Dec 26, 2022
29fed1f
Changed the parameters of genotype constructor. Now as a parameter it…
Yonell Dec 26, 2022
0981751
Added basic gui structure
Wirlaa Dec 28, 2022
014e3ec
Some main changes
Yonell Dec 29, 2022
2081412
Some main changes
Yonell Dec 29, 2022
60e640f
Sooo.. The animal didn't know about its children. Now it at least kno…
Yonell Dec 29, 2022
af0e9d4
Added a start view
Wirlaa Jan 1, 2023
4d629d2
Repaired EquatorPreferableFields
Yonell Jan 3, 2023
ca176df
Improved gui, added file loading, connected gui to the simulation
Wirlaa Jan 3, 2023
514654c
Connected map elements to gui
Wirlaa Jan 4, 2023
13be9c5
Added (scuffed) multiple windows
Wirlaa Jan 4, 2023
cb04560
Repaired some bugs
Yonell Jan 4, 2023
ca1647d
Uncoupled launchPresenter from mainPresenter
Wirlaa Jan 4, 2023
f928e43
Merge remote-tracking branch 'origin/main'
Wirlaa Jan 4, 2023
403ea72
added simulationStats
Yonell Jan 4, 2023
ef65569
Added animal tracking
Wirlaa Jan 4, 2023
d28820a
Merge remote-tracking branch 'origin/main'
Wirlaa Jan 4, 2023
8a5ef30
After merge
Yonell Jan 4, 2023
e390b4b
Added stats saving control
Yonell Jan 4, 2023
d9df34a
Added gui for statistics
Wirlaa Jan 4, 2023
169ebe1
Merge remote-tracking branch 'origin/main'
Wirlaa Jan 4, 2023
42c25cc
Code cleanup
Yonell Jan 5, 2023
609525e
Another merge after code cleanup
Yonell Jan 5, 2023
9210b7f
Resolving merge conflicts
Yonell Jan 5, 2023
1131f49
Added color for a tracked animal
Wirlaa Jan 5, 2023
8b666b6
Merge remote-tracking branch 'origin/main'
Wirlaa Jan 5, 2023
f35f980
Added animal drawings
Yonell Jan 5, 2023
2cd2388
Minor bugfixes (age being negative, concurrent modification exception…
Wirlaa Jan 5, 2023
b675504
Merge remote-tracking branch 'origin/main'
Wirlaa Jan 5, 2023
16e6df1
Added animal pictures
Yonell Jan 5, 2023
94f9fce
Merge
Yonell Jan 5, 2023
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
31 changes: 8 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/TheAbyss/gradle/
/TheAbyss/build/
/TheAbyss/.idea/
/TheAbyss/.gradle/
/TheAbyss/gradlew
/TheAbyss/gradlew.bat
/TheAbyss/settings.gradle
/TheAbyss/stats*.csv
11 changes: 11 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

123 changes: 123 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# TheAbyss
# TheAbyss
Object oriented project made by Weronika Klatka and Filip Piskorski
31 changes: 31 additions & 0 deletions TheAbyss/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id 'java'
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.13'
}

application {
getMainClass().set('agh.oop.project1.Main')
}

group 'org.example'
version '1.0-SNAPSHOT'

repositories {
mavenCentral()
}

javafx {
version = "17"
modules = [ 'javafx.controls' ]
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
implementation 'com.google.guava:guava:31.1-jre'
}

test {
useJUnitPlatform()
}
Loading