s464961/WMICraft
1
0
Fork 0
forked from s464965/WMICraft
Code Issues Pull Requests Projects Releases Wiki Activity
106 Commits 26 Branches 0 Tags 291 MiB
08329f187b
Commit Graph

106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angelika Iskra
08329f187b Merge pull request 'fix monsters count;' (#32) from genetic_alg_angela into genetic_alg 
Reviewed-on: s464965/WMICraft#32
 2022-06-02 01:31:50 +02:00
Angelika Iskra
fd081d5c56 fix monsters count; 2022-06-02 01:31:26 +02:00
Angelika Iskra
ee7a324e5d Merge pull request 'genetic_alg_angela' (#31) from genetic_alg_angela into genetic_alg 
Reviewed-on: s464965/WMICraft#31
 2022-06-02 00:52:53 +02:00
Angelika Iskra
10e61e724c setup genetic alg; 2022-06-02 00:52:16 +02:00
Angelika Iskra
f255178162 fix file not found error; 2022-06-01 19:52:16 +02:00
Dawid Korzępa
d80e83cecf Merge pull request 'fixed return type' (#30) from hotfix into genetic_alg 
Reviewed-on: s464965/WMICraft#30
 2022-05-31 22:13:46 +02:00
korzepadawid
ea105ad140 fixed return type 2022-05-31 22:13:16 +02:00
Dawid Korzępa
32847593e6 Merge pull request 'counting islands with dfs' (#29) from genetic_alg_fitness into genetic_alg 
Reviewed-on: s464965/WMICraft#29
 2022-05-31 21:37:26 +02:00
korzepadawid
f1f2302acd counting islands with dfs 2022-05-31 21:34:31 +02:00
korzepadawid
e89f564dd6 saving sands, trees, monsters etc positions 2022-05-31 15:50:42 +02:00
Angelika Iskra
e9ef300dde import and export map; 2022-05-31 01:03:00 +02:00
korzepadawid
c7c1feb82c separated code 2022-05-30 23:34:28 +02:00
korzepadawid
7a9d685701 Genome class responsible for keeping grid and lists of positions 2022-05-30 23:27:31 +02:00
korzepadawid
c06624d79c example genome generation 2022-05-29 23:13:45 +02:00
Juliusz Sadowski
97628965f1 Merge pull request 'cnn' (#28) from cnn into master 
Reviewed-on: s464965/WMICraft#28
 2022-05-25 19:57:08 +02:00
XsedoX
e8c32ade2a Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into cnn 
 Conflicts:
	common/constants.py
	common/helpers.py
	requirements.txt
 2022-05-25 19:54:47 +02:00
XsedoX
c6697bdc79 usuniecie starego nauczonego modelu 2022-05-25 19:50:30 +02:00
XsedoX
088e90ec5b pytorch lighning addition 2022-05-25 19:47:08 +02:00
Aleksandra Muczyńska
4d88b300ae Merge pull request 'fixed hp directions' (#26) from code_fix into master 
Reviewed-on: s464965/WMICraft#26
 2022-05-21 14:32:17 +02:00
AleksandraMuczynska
94b4cbef58 fixed hp directions 2022-05-21 14:31:02 +02:00
XsedoX
4e3e68d4c3 FINISH 2022-05-18 15:44:07 +02:00
XsedoX
431113a04c pokazuje zdjecie o jakie pytasz 2022-05-18 12:18:59 +02:00
XsedoX
736dbc9616 nie potrzeba filderu all 2022-05-18 10:29:05 +02:00
Dawid Korzępa
7ce2f0cc38 Merge pull request 'decision_tree_impl' (#25) from decision_tree_impl into master 
Reviewed-on: s464965/WMICraft#25
 2022-05-18 10:05:08 +02:00
XsedoX
dc411fae42 neural network sprawny wraz z interfejsem 2022-05-17 22:54:56 +02:00
XsedoX
3fce0a5b57 uzycie sprite.Group.update() - gdy umrze sprite, to healthbar nie bedzie renderowany 2022-05-13 10:37:00 +02:00
XsedoX
89c307535b Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft into stats 
 Conflicts:
	logic/game.py
	ui/stats.py
 2022-05-13 10:06:23 +02:00
Juliusz Sadowski
30e2d39d28 Merge pull request 'healthbar' (#24) from healthbar into master 
Reviewed-on: s464965/WMICraft#24
 2022-05-11 16:53:14 +02:00
XsedoX
504cfd1af0 poprawki do healthbar oraz dostawania obrazen. TRZEBA UZYWAC FUNKCJI W knight.py 2022-05-11 16:50:14 +02:00
korzepadawid
33577c1824 hotfix 2022-05-09 18:22:01 +02:00
korzepadawid
1a4f245087 decision_tree 2022-05-08 20:36:33 +02:00
korzepadawid
8b76d3635b finding neighbour tiles 2022-05-08 19:26:09 +02:00
XsedoX
9aa9552499 hp_bar pod tarczami liczony na podstawie hp knightow 2022-04-29 10:21:22 +02:00
XsedoX
4ab8065879 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft 2022-04-29 06:29:51 +02:00
XsedoX
9f3c5fb2d5 liczenie rycerzy dziala 2022-04-28 21:50:12 +02:00
Juliusz Sadowski
7030488a8a Merge pull request 'ESC chyba naprawiony(ale pewnie i tak zaraz znajdziemy jakiegos buga xd)' (#23) from problemy_z_ESC into master 
Reviewed-on: s464965/WMICraft#23
 2022-04-28 14:24:49 +02:00
XsedoX
fe964ceb7e ESC chyba naprawiony(ale pewnie i tak zaraz znajdziemy jakiegos buga xd) 2022-04-28 14:23:44 +02:00
Juliusz Sadowski
f9c5f331f2 Merge pull request 'healthbar' (#22) from healthbar into master 
Reviewed-on: s464965/WMICraft#22
 2022-04-28 14:16:16 +02:00
XsedoX
dca9c82b70 health_bar.py - gotowy 2022-04-28 14:13:59 +02:00
XsedoX
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 2022-04-28 10:18:17 +02:00
XsedoX
1998f94c3d Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft 
 Conflicts:
	logic/game.py
 2022-04-28 09:51:50 +02:00
XsedoX
c11fdae8a5 healthbar WIP - team health bars jako klasa health_bar.py 2022-04-28 09:50:24 +02:00
Dawid Korzępa
9f62bb1a93 Merge pull request 'a_star' (#21) from a_star into master 
Reviewed-on: s464965/WMICraft#21
 2022-04-27 19:50:51 +02:00
XsedoX
e5af464eb2 healthbar WIP - team health bars jako klasa health_bar.py 2022-04-24 22:06:20 +02:00
korzepadawid
55c3ea0aa8 fix: changed sand cost 2022-04-13 18:56:39 +02:00
korzepadawid
1dbb1a0e4c feat: field costs 2022-04-13 18:35:02 +02:00
korzepadawid
af2f61984a feat: logs queue 2022-04-12 20:44:27 +02:00
korzepadawid
04f17e3293 feat: a_star without tile costs 2022-04-12 20:21:29 +02:00
korzepadawid
7131d1f905 feat: movement 2022-04-12 19:12:41 +02:00
korzepadawid
6d4891fab8 fix: integration with level 2022-04-12 00:35:01 +02:00