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

43 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angelika Iskra
404eb8e70d refactor bfs; 2022-04-11 13:13:03 +02:00
Angelika Iskra
e98a4da2aa finished bfs; 2022-04-11 12:56:22 +02:00
Angelika Iskra
88297d0b9b added collision to bfs; 2022-04-11 12:08:03 +02:00
Angelika Iskra
57cdb87820 worked on bfs; 2022-04-11 12:00:15 +02:00
Angelika Iskra
8196a5ec62 bfs - knights are moving but idk where 2022-04-11 00:01:57 +02:00
Angelika Iskra
ac74280271 work on new logic; 2022-04-10 20:28:50 +02:00
Juliusz Sadowski
c1d05eb1d1 Merge pull request 'mozna zgetowac tile po row i column do tego jest funkcja get_tile w grid;' (#18) from field into master 
Reviewed-on: s464965/WMICraft#18
 2022-04-08 17:16:51 +02:00
XsedoX
deabeeac43 mozna zgetowac tile po row i column do tego jest funkcja get_tile w grid; 
step_onto -> put_on(zmiana nazwy), dziala poprawnie(maly bug byl);funkcja put_on_tile(row, column, obj) sluzy polozeniu danego obiektu na danym tilu, przyklad uzycia zakomentowany w game.py(wywolujcie po spawnerze, bo nadpisze pozycje xd); dorobilem wlasny exception, gdy tile jest zajety w pliku exceptions.py - moze sie przyda ten plik
 2022-04-08 17:15:01 +02:00
Juliusz Sadowski
e768a534a4 Merge pull request 'zmiana rzedow z sprite.Group na pythonowa tablice' (#17) from grid into master 
Reviewed-on: s464965/WMICraft#17
 2022-04-08 11:25:28 +02:00
XsedoX
5700cd89c8 zmiana rzedow z sprite.Group na pythonowa tablice 2022-04-08 11:24:03 +02:00
Jerzy Tomaszewski
37eb63705d Merge pull request 'controlling fields with water and trees' (#16) from field into master 
Reviewed-on: s464965/WMICraft#16
 2022-04-06 21:14:41 +02:00
GeorgeTom17
7286171207 controlling fields with water and trees 2022-04-06 21:08:32 +02:00
Juliusz Sadowski
9b6f9ea003 Merge pull request 'field' (#15) from field into master 
Reviewed-on: s464965/WMICraft#15
 2022-04-05 15:39:36 +02:00
XsedoX
08ccd74413 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft 2022-04-05 15:38:30 +02:00
XsedoX
c75299e152 poprawki field.py 2022-04-05 15:38:26 +02:00
Juliusz Sadowski
d0f9a66888 Merge pull request 'wejscie na pole' (#14) from field into master 
Reviewed-on: s464965/WMICraft#14
 2022-04-05 10:55:49 +02:00
XsedoX
c927bab887 wejscie na pole 2022-04-05 10:54:30 +02:00
Juliusz Sadowski
21c05e4f40 Merge pull request 'field zna swoj stan ale go sam nie odswieza(trzeba recznie zmieniac wartosc - todo); field jest teraz spritem(co przyda sie pozniej); spawner.py dostosowany do nowego kodu; game.py dostosowane do zmian; twierdza dalej jest widziana jako 1x1' (#13) from field into master 
Reviewed-on: s464965/WMICraft#13
 2022-04-05 10:49:57 +02:00
XsedoX
86aa939433 field zna swoj stan ale go sam nie odswieza(trzeba recznie zmieniac wartosc - todo); field jest teraz spritem(co przyda sie pozniej); spawner.py dostosowany do nowego kodu; game.py dostosowane do zmian; twierdza dalej jest widziana jako 1x1 2022-04-05 10:47:45 +02:00
Dawid Korzępa
0d6fdcbfea Merge pull request 'knights_queue' (#12) from knights_queue into master 
Reviewed-on: s464965/WMICraft#12
 2022-04-04 21:58:14 +02:00
korzepadawid
621a36461c fixed bug :~DDD 2022-04-04 21:51:32 +02:00
korzepadawid
4caba91c7e tests: added edge case 2022-04-04 21:27:47 +02:00
korzepadawid
f06ea9e5b0 tests: added test case 2022-04-04 21:23:32 +02:00
korzepadawid
bef17bccd1 feat: round queue 2022-04-04 21:07:40 +02:00
Aleksandra Muczyńska
37c58763f8 Merge pull request 'random monster images and stats added (monsters, knights)' (#11) from monsters_and_stats into master 
Reviewed-on: s464965/WMICraft#11
 2022-03-24 21:46:02 +01:00
AleksandraMuczynska
d6c281c814 random monster images and stats added (monsters, knights) 2022-03-24 21:45:17 +01:00
Angelika Iskra
65afafb642 Merge pull request 'added castle;' (#10) from castle into master 
Reviewed-on: s464965/WMICraft#10
 2022-03-24 16:33:08 +01:00
Angelika Iskra
cacb305d47 added castle; 2022-03-24 16:32:14 +01:00
Aleksandra Muczyńska
7d73f30a7c Merge pull request 'monsters v2 (max będzie v4)' (#9) from monster_update into master 
Reviewed-on: s464965/WMICraft#9
 2022-03-24 13:10:19 +01:00
AleksandraMuczynska
25d46a1baf monsters v2 (max będzie v4) 2022-03-24 13:09:43 +01:00
Aleksandra Muczyńska
035f8470a6 Merge pull request 'niekompletny update potworów' (#8) from monster_update into master 
Reviewed-on: s464965/WMICraft#8
 2022-03-24 12:55:41 +01:00
AleksandraMuczynska
bc6aa0a558 niekompletny update potworów 2022-03-24 12:54:22 +01:00
Dawid Korzępa
58518c3120 Merge pull request 'feat: spawning teams' (#7) from Knights_team_spawn into master 
Reviewed-on: s464965/WMICraft#7
 2022-03-21 21:13:30 +01:00
korzepadawid
352f5ecee9 feat: spawning teams 2022-03-21 20:30:02 +01:00
Juliusz Sadowski
84b17269e3 Merge pull request 'naprawa spawner.py' (#6) from spawner into master 
Reviewed-on: s464965/WMICraft#6
 2022-03-21 18:43:30 +01:00
XsedoX
b60ecf8ed1 naprawa spawner.py 2022-03-21 18:39:28 +01:00
Dawid Korzępa
f7cfb1a22b Merge pull request 'structure_cleanup' (#4) from structure_cleanup into master 
Reviewed-on: s464965/WMICraft#4
 2022-03-13 15:06:53 +01:00
korzepadawid
b647ba3423 refactor: separated dir for screens 2022-03-11 20:00:42 +01:00
korzepadawid
190b2bec01 refactor: file structure and cleanup 2022-03-11 19:42:17 +01:00
XsedoX
c39aba8c30 Merge branch 'master' of https://git.wmi.amu.edu.pl/s464965/WMICraft 
 Conflicts:
	game.py
 2022-03-10 22:15:24 +01:00
XsedoX
89735b34ab klasa spawnujaca dowolna liste obiektow w dowolnym obszarze 2022-03-10 22:13:25 +01:00
GeorgeTom17
b4da4319b8 added monsters 2022-03-10 18:34:58 +01:00
Rayline
bfe6405331 Rycerz istnieje 2022-03-09 16:59:58 +01:00