Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
8fdd5e3
Update .gitignore
smelaa Dec 8, 2022
ab04c97
Basic classes added
Jullija Dec 13, 2022
b13ad8e
SimultaionEngine commit
Jullija Dec 14, 2022
fd7ae3d
Merge pull request #1 from smelaa/test
smelaa Dec 14, 2022
2c0ecf2
classes added + Vector2d&Direction implemented
smelaa Dec 15, 2022
13ee667
Merge pull request #2 from smelaa/firstbranch
smelaa Dec 15, 2022
8ec2c23
classes & basic methods added
smelaa Dec 16, 2022
5ef716a
Merge pull request #3 from smelaa/firstbranch
Jullija Dec 16, 2022
c26ed6e
LittleAdjustment and TotalRandom implementation
Jullija Dec 16, 2022
32523ca
Merge pull request #4 from smelaa/JuliaBranch
Jullija Dec 16, 2022
4ac8b18
class Animal implementation
smelaa Dec 17, 2022
afc5485
Merge pull request #5 from smelaa/OlaBranch
smelaa Dec 17, 2022
2f433c1
IHolyGardener variants implementation
smelaa Dec 18, 2022
ac9ff0c
Merge pull request #6 from smelaa/OlaBranch
smelaa Dec 18, 2022
c1034c8
Behaviour improvement
Jullija Dec 22, 2022
4ecfd1d
Map and behaviour
Jullija Dec 22, 2022
b0ddc08
Merge pull request #8 from smelaa/JuliaBranch
smelaa Dec 23, 2022
e1e8921
Little adjustments
smelaa Dec 23, 2022
47008ea
initial gui config
smelaa Dec 23, 2022
0785ef6
Merge pull request #9 from smelaa/OlaBranch
Jullija Dec 25, 2022
b2d5eda
FileMenager, Statistics, Map
Jullija Dec 27, 2022
58b6ecd
Merge pull request #10 from smelaa/JuliaBranch
smelaa Dec 28, 2022
ec16588
gui config continuation
smelaa Dec 28, 2022
55c1cb6
Merge branch 'main' into OlaBranch
smelaa Dec 28, 2022
f48cf72
Merge pull request #11 from smelaa/OlaBranch
Jullija Dec 28, 2022
65e9fb9
last parts of gui planned
smelaa Dec 28, 2022
ae030e1
Merge branch 'main' into OlaBranch
smelaa Dec 28, 2022
705d528
Merge pull request #12 from smelaa/OlaBranch
Jullija Dec 29, 2022
3c3e7e3
congif controller commit
smelaa Dec 29, 2022
8da1ed8
Merge branch 'OlaBranch' of https://github.com/smelaa/EvolutionGenera…
smelaa Dec 29, 2022
d8964a3
Merge pull request #13 from smelaa/OlaBranch
Jullija Dec 29, 2022
faa84da
CSV files scanner added
smelaa Dec 29, 2022
72ae06a
hours of hardwork with putting it all together
smelaa Dec 29, 2022
0fe68e2
Merge pull request #14 from smelaa/BestiesBranch
Jullija Dec 29, 2022
62b7c65
so many milestones
smelaa Dec 29, 2022
803292a
Merge pull request #15 from smelaa/BestiesBranch
Jullija Dec 29, 2022
c955019
colors fixed
smelaa Dec 30, 2022
d24b936
Merge pull request #16 from smelaa/BestiesBranch
smelaa Dec 30, 2022
4c78507
play/pause now working
smelaa Dec 30, 2022
07cc4c2
Merge pull request #17 from smelaa/OlaBranch
Jullija Dec 30, 2022
6b58f6b
Grass is being eaten, bugfixes
Jullija Dec 30, 2022
3ff209c
Merge pull request #18 from smelaa/JuliaBranch
smelaa Dec 31, 2022
ebdb3f3
stop button added
smelaa Dec 31, 2022
c64c6e7
Merge pull request #19 from smelaa/OlaBranch
Jullija Dec 31, 2022
4837cbf
the app is working - we are the champions
smelaa Dec 31, 2022
1fdcc16
Merge pull request #20 from smelaa/OlaBranch
Jullija Dec 31, 2022
6a0f1fb
legend fixed
smelaa Dec 31, 2022
3a08f5a
Merge pull request #21 from smelaa/OlaBranch
Jullija Dec 31, 2022
cab5ad2
Update README.md
Jullija Jan 1, 2023
dae9861
Update README.md
Jullija Jan 1, 2023
60e4a90
Update README.md
Jullija Jan 1, 2023
a53e1e5
Update README.md
Jullija Jan 1, 2023
8dde3af
Update README.md
Jullija Jan 1, 2023
964e524
Update README.md
Jullija Jan 1, 2023
76b7c62
last adjustments
smelaa Jan 2, 2023
ced2502
Merge pull request #22 from smelaa/OlaBranch
Jullija Jan 2, 2023
b32da0f
Config files
Jullija Jan 2, 2023
5eec19d
code cleaned up
smelaa Jan 2, 2023
5461e17
most popular genome minor bug fixed
smelaa Jan 2, 2023
658b0dc
Energy to age change
Jullija Jan 3, 2023
f84422d
Update README.md
Jullija Jan 3, 2023
15984ad
Update README.md
Jullija Jan 3, 2023
2d92b28
Update README.md
Jullija Jan 6, 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

# Package Files #
*.jar
!gradle/wrapper/gradle-wrapper.jar
*.war
*.nar
*.ear
Expand All @@ -21,3 +22,8 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

build/
.gradle/
.org.example/
.DS_Store
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

11 changes: 11 additions & 0 deletions .idea/EvolutionGenerator.iml

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

10 changes: 10 additions & 0 deletions .idea/compiler.xml

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

18 changes: 18 additions & 0 deletions .idea/gradle.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml

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

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

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

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

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_base_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_base_win_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_controls_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_controls_win_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_fxml_win_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_graphics_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_openjfx_javafx_graphics_win_17.xml

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

11 changes: 11 additions & 0 deletions .idea/libraries/Gradle__org_opentest4j_opentest4j_1_2_0.xml

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

9 changes: 9 additions & 0 deletions .idea/misc.xml

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

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.

12 changes: 12 additions & 0 deletions .idea/modules/oolab.iml

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

20 changes: 20 additions & 0 deletions .idea/modules/oolab.main.iml

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

25 changes: 25 additions & 0 deletions .idea/modules/oolab.test.iml

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

Loading