WMICraft

s464961/WMICraft

Fork 0

forked from s464965/WMICraft

Commit Graph

Select branches

Hide Pull Requests

attack_v3

audio

bfs

castle

cnn

cnn_modified

code_fix

credits

decision_tree_impl

field

genetic_alg

grid

healthbar

knights_attack_v2

master

menu

monster_update

monsters_and_stats

problemy_z_ESC

smart_logs

spawner

stats

stats_update

temp

ui

updated_fortress_count

f4aa9741e3 Merge pull request 'added points in stats;' (#41) from stats_update into master master Angelika Iskra 2022-06-09 23:57:18 +0200
3591fedfa2 added points in stats; stats_update Angelika Iskra 2022-06-09 23:56:26 +0200
050a0359b0 Merge pull request 'final attack version! \o/' (#40) from attack_v3 into master Aleksandra Muczyńska 2022-06-09 23:26:20 +0200
c6cc763fe1 final attack version! \o/ attack_v3 AleksandraMuczynska 2022-06-09 23:24:57 +0200
08ea0e945e Merge pull request 'decision_tree_impl' (#39) from decision_tree_impl into master Jerzy Tomaszewski 2022-06-09 22:33:23 +0200
cb9b8e6b2d Merge pull request 'actually WORKING!!!!! one-direction attack with no ghost-knights (only knights, no monsters and fortress)' (#38) from knights_attack_v2 into master Aleksandra Muczyńska 2022-06-09 22:31:50 +0200
dfa408d5fa new csv for decision tree decision_tree_impl GeorgeTom17 2022-06-09 22:31:25 +0200
ebaf97d82c new csv for decision tree GeorgeTom17 2022-06-09 22:31:02 +0200
8666a7dbf9 actually WORKING!!!!! one-direction attack with no ghost-knights (only knights, no monsters and fortress) knights_attack_v2 AleksandraMuczynska 2022-06-09 22:29:44 +0200
952e8663b4 Merge pull request 'removed number of fortresses from stats' (#37) from updated_fortress_count into master Aleksandra Muczyńska 2022-06-09 20:39:24 +0200
5f7fea24fb removed number of fortresses from stats updated_fortress_count AleksandraMuczynska 2022-06-09 20:37:46 +0200
297bd19336 Merge pull request 'credits' (#36) from credits into master Jerzy Tomaszewski 2022-06-09 19:04:29 +0200
bab75274dc Merge pull request 'cnn' (#35) from cnn into master Juliusz Sadowski 2022-06-09 14:49:55 +0200
681bf08424 sprzatanie plikow cnn XsedoX 2022-06-09 14:47:47 +0200
c8f0dc76b6 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into cnn XsedoX 2022-06-09 14:43:47 +0200
e31364b21c fixed knights_hp + basic attack ^<>v (improvement in progress) AleksandraMuczynska 2022-06-08 12:51:09 +0200
1482730bee visual changes credits GeorgeTom17 2022-06-07 22:36:13 +0200
29aea5bec4 credits screen GeorgeTom17 2022-06-07 21:36:31 +0200
9afd1f366a Merge pull request 'genetic_alg' (#34) from genetic_alg into master Angelika Iskra 2022-06-06 15:19:58 +0200
6ddfddb2fd fix monsters count in fitness func; genetic_alg Angelika Iskra 2022-06-06 14:59:24 +0200
3f68f4c8a6 bug fix korzepadawid 2022-06-05 10:57:20 +0200
59a8c49b2d Merge pull request 'fixed bugs in genetic alg; modified fitness;' (#33) from genetic_alg_angela into genetic_alg Angelika Iskra 2022-06-02 13:33:38 +0200
fd4b34eed7 fixed bugs in genetic alg; modified fitness; Angelika Iskra 2022-06-02 13:32:59 +0200
08329f187b Merge pull request 'fix monsters count;' (#32) from genetic_alg_angela into genetic_alg Angelika Iskra 2022-06-02 01:31:50 +0200
fd081d5c56 fix monsters count; Angelika Iskra 2022-06-02 01:31:26 +0200
ee7a324e5d Merge pull request 'genetic_alg_angela' (#31) from genetic_alg_angela into genetic_alg Angelika Iskra 2022-06-02 00:52:53 +0200
10e61e724c setup genetic alg; Angelika Iskra 2022-06-02 00:52:16 +0200
f255178162 fix file not found error; Angelika Iskra 2022-06-01 19:52:16 +0200
d80e83cecf Merge pull request 'fixed return type' (#30) from hotfix into genetic_alg Dawid Korzępa 2022-05-31 22:13:46 +0200
ea105ad140 fixed return type korzepadawid 2022-05-31 22:13:16 +0200
32847593e6 Merge pull request 'counting islands with dfs' (#29) from genetic_alg_fitness into genetic_alg Dawid Korzępa 2022-05-31 21:37:26 +0200
f1f2302acd counting islands with dfs korzepadawid 2022-05-31 21:34:31 +0200
e89f564dd6 saving sands, trees, monsters etc positions korzepadawid 2022-05-31 15:50:42 +0200
162e2df890 FINISH 95% test 99% train XsedoX 2022-05-31 09:25:36 +0200
e9ef300dde import and export map; Angelika Iskra 2022-05-31 01:03:00 +0200
c7c1feb82c separated code korzepadawid 2022-05-30 23:34:28 +0200
7a9d685701 Genome class responsible for keeping grid and lists of positions korzepadawid 2022-05-30 23:27:31 +0200
c06624d79c example genome generation korzepadawid 2022-05-29 23:13:45 +0200
8d73a85707 poprawki XsedoX 2022-05-27 01:39:52 +0200
b6ba817d55 update XsedoX 2022-05-27 01:38:20 +0200
6aee7bb207 work on what_is_it func; cnn_modified Angelika Iskra 2022-05-27 00:15:32 +0200
36f20d8895 work on what_is_it func; Angelika Iskra 2022-05-26 23:34:46 +0200
5c1a1605b8 update XsedoX 2022-05-26 13:19:17 +0200
97628965f1 Merge pull request 'cnn' (#28) from cnn into master temp Juliusz Sadowski 2022-05-25 19:57:08 +0200
e8c32ade2a Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into cnn XsedoX 2022-05-25 19:54:47 +0200
c6697bdc79 usuniecie starego nauczonego modelu XsedoX 2022-05-25 19:50:30 +0200
088e90ec5b pytorch lighning addition XsedoX 2022-05-25 19:47:08 +0200
4d88b300ae Merge pull request 'fixed hp directions' (#26) from code_fix into master Aleksandra Muczyńska 2022-05-21 14:32:17 +0200
94b4cbef58 fixed hp directions code_fix AleksandraMuczynska 2022-05-21 14:31:02 +0200
4e3e68d4c3 FINISH XsedoX 2022-05-18 15:44:07 +0200
431113a04c pokazuje zdjecie o jakie pytasz XsedoX 2022-05-18 12:18:59 +0200
736dbc9616 nie potrzeba filderu all XsedoX 2022-05-18 10:29:05 +0200
7ce2f0cc38 Merge pull request 'decision_tree_impl' (#25) from decision_tree_impl into master Dawid Korzępa 2022-05-18 10:05:08 +0200
dc411fae42 neural network sprawny wraz z interfejsem XsedoX 2022-05-17 22:54:56 +0200
3fce0a5b57 uzycie sprite.Group.update() - gdy umrze sprite, to healthbar nie bedzie renderowany healthbar XsedoX 2022-05-13 10:37:00 +0200
89c307535b Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into stats XsedoX 2022-05-13 10:06:23 +0200
30e2d39d28 Merge pull request 'healthbar' (#24) from healthbar into master Juliusz Sadowski 2022-05-11 16:53:14 +0200
504cfd1af0 poprawki do healthbar oraz dostawania obrazen. TRZEBA UZYWAC FUNKCJI W knight.py XsedoX 2022-05-11 16:50:14 +0200
33577c1824 hotfix korzepadawid 2022-05-09 18:22:01 +0200
1a4f245087 decision_tree korzepadawid 2022-05-08 20:36:33 +0200
8b76d3635b finding neighbour tiles korzepadawid 2022-05-08 19:26:09 +0200
9aa9552499 hp_bar pod tarczami liczony na podstawie hp knightow stats XsedoX 2022-04-29 10:21:22 +0200
4ab8065879 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft XsedoX 2022-04-29 06:29:51 +0200
9f3c5fb2d5 liczenie rycerzy dziala XsedoX 2022-04-28 21:50:12 +0200
7030488a8a Merge pull request 'ESC chyba naprawiony(ale pewnie i tak zaraz znajdziemy jakiegos buga xd)' (#23) from problemy_z_ESC into master Juliusz Sadowski 2022-04-28 14:24:49 +0200
fe964ceb7e ESC chyba naprawiony(ale pewnie i tak zaraz znajdziemy jakiegos buga xd) problemy_z_ESC XsedoX 2022-04-28 14:23:44 +0200
f9c5f331f2 Merge pull request 'healthbar' (#22) from healthbar into master Juliusz Sadowski 2022-04-28 14:16:16 +0200
dca9c82b70 health_bar.py - gotowy XsedoX 2022-04-28 14:13:59 +0200
0f6f2354d3 sprite group w level.py zamienilem na LayeredUpdates() oraz dodałem do każdego sprite'a layer, wiec nie beda na siebie nachodzic nigdy XsedoX 2022-04-28 10:18:17 +0200
1998f94c3d Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft XsedoX 2022-04-28 09:51:50 +0200
c11fdae8a5 healthbar WIP - team health bars jako klasa health_bar.py XsedoX 2022-04-28 09:50:24 +0200
9f62bb1a93 Merge pull request 'a_star' (#21) from a_star into master Dawid Korzępa 2022-04-27 19:50:51 +0200
e5af464eb2 healthbar WIP - team health bars jako klasa health_bar.py XsedoX 2022-04-24 22:06:20 +0200
55c3ea0aa8 fix: changed sand cost korzepadawid 2022-04-13 18:56:39 +0200
1dbb1a0e4c feat: field costs korzepadawid 2022-04-13 18:35:02 +0200
af2f61984a feat: logs queue korzepadawid 2022-04-12 20:44:27 +0200
04f17e3293 feat: a_star without tile costs korzepadawid 2022-04-12 20:21:29 +0200
7131d1f905 feat: movement korzepadawid 2022-04-12 19:12:41 +0200
6d4891fab8 fix: integration with level korzepadawid 2022-04-12 00:35:01 +0200
286164c1dd feat: a_star implementation korzepadawid 2022-04-12 00:21:30 +0200
544c5276d5 feat: added a_star method korzepadawid 2022-04-12 00:05:47 +0200
2bfaff8a30 update: changed variable name in a_star.py korzepadawid 2022-04-11 23:56:35 +0200
6c27199988 feat: result function korzepadawid 2022-04-11 23:53:50 +0200
fbbb521a4b fix: actions korzepadawid 2022-04-11 22:52:58 +0200
b68013a0cd feat: actions korzepadawid 2022-04-11 21:52:21 +0200
019b3c86be feat: expand and child node korzepadawid 2022-04-11 20:04:53 +0200
10485ce39d feat: enums korzepadawid 2022-04-11 19:49:32 +0200
f4ec5b5869 feat: models korzepadawid 2022-04-11 19:18:03 +0200
e2fad68813 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft XsedoX 2022-04-11 17:54:00 +0200
0a7b6136a5 healthbar WIP XsedoX 2022-04-11 17:51:46 +0200
05fcfc76f3 Merge pull request 'bfs' (#19) from bfs into master Angelika Iskra 2022-04-11 13:49:11 +0200
404eb8e70d refactor bfs; bfs Angelika Iskra 2022-04-11 13:13:03 +0200
e98a4da2aa finished bfs; Angelika Iskra 2022-04-11 12:56:22 +0200
88297d0b9b added collision to bfs; Angelika Iskra 2022-04-11 12:08:03 +0200
57cdb87820 worked on bfs; Angelika Iskra 2022-04-11 12:00:15 +0200
8196a5ec62 bfs - knights are moving but idk where Angelika Iskra 2022-04-11 00:01:57 +0200
ac74280271 work on new logic; Angelika Iskra 2022-04-10 20:28:50 +0200
38b1d3eb68 smart logs smart_logs korzepadawid 2022-04-10 18:38:57 +0200
62e78ce885 odkryłem że istnieje grupa do jednego sprite'a - GroupSingle i zmieniłem grupe z tile'ami na single. XsedoX 2022-04-09 21:28:31 +0200
c1d05eb1d1 Merge pull request 'mozna zgetowac tile po row i column do tego jest funkcja get_tile w grid;' (#18) from field into master Juliusz Sadowski 2022-04-08 17:16:51 +0200