Commit Graph

1105 Commits

Author SHA1 Message Date
4f2faae599 chore 2022-06-15 03:02:51 +02:00
c9af823445 chore 2022-06-15 03:02:51 +02:00
cf290b5fb1 feat: add frontend 2022-06-15 02:54:07 +02:00
5682fb4e1b feat: redo lab3 2022-06-15 00:07:50 +02:00
69ecbea0be feat: add context 2022-06-13 01:11:46 +02:00
3cdd5ca8b4 feat: add login 2022-06-12 22:04:12 +02:00
264c1d4209 feat: update readme and start script 2022-06-12 17:07:54 +02:00
84a88ed2f0 feat: update readme and start script 2022-06-12 17:06:44 +02:00
2d599a2b8e feat: fetch data from json, block multiple login register 2022-06-11 13:51:11 +02:00
Maciekxdabu
10aec35d5f merloj: Updated Final Report 2022-06-10 12:38:34 +02:00
Maciekxdabu
a4bf6436cb merloj: Added Report 2022-06-10 12:35:39 +02:00
Maciekxdabu
bc058e4978 merloj: Deleted unused Debug Logs 2022-06-10 11:28:52 +02:00
Maciekxdabu
e7a73f0ce0 merloj: Modified Soldiers values 2022-06-10 11:05:03 +02:00
Maciekxdabu
06c13568c1 merloj: Fixed bug with empty squad 2022-06-10 10:59:49 +02:00
cd60cc258a feat: add routing, database saving, forms, button 2022-06-10 02:21:26 +02:00
e6a3bf15c3 chore 2022-06-08 03:50:18 +02:00
3d5ab8a2d1 Merge branch 'main' of https://gitlab-stud.elka.pw.edu.pl/egui22l/Krzysztof_Stefan_Rudnicki/egui_lab1_krzysztof_rudnicki into main 2022-06-08 01:23:21 +02:00
2d6b57adaf chore 2022-06-08 01:21:04 +02:00
60aa6a52d5 feat: finish report 2022-06-08 00:31:31 +02:00
cb555f4978 feat: add block diagrams algorithm 2022-06-07 23:53:53 +02:00
76b03cbf00 feat: finish report up to algorithm 2022-06-07 16:24:03 +02:00
084b4dee03 chore 2022-06-07 01:14:10 +02:00
6b09eb2ee4 Merge remote-tracking branch 'origin/magnetometer' into main 2022-06-06 21:38:20 +02:00
2c104ba6f8 chore 2022-06-06 21:28:05 +02:00
bc6d867f25 feat: finish schematic 2022-06-06 15:02:32 +02:00
ae435c4552 feat: oled and buttons 2022-06-06 13:53:18 +02:00
Maciekxdabu
150f828c22 Merge branch 'Development' into merloj-soldier_communication 2022-06-03 14:06:19 +02:00
Maciekxdabu
db503cf069 merloj: set soldier hp to 1 2022-06-03 14:06:06 +02:00
Krzysztof Stefan Rudnicki
e83f01586a Merge branch 'kuchy-robust-formation' into 'Development'
Kuchy robust formation

See merge request gskowron/eopsy-lab-567-project!19
2022-06-03 14:02:41 +02:00
Krzysztof Stefan Rudnicki
46ab64aa48 restore old path finding value 2022-06-03 14:02:20 +02:00
Maciekxdabu
d5e2c9ae1b merloj: finished basic communication
- rough, working design for now, needs to be polished
2022-06-03 13:53:29 +02:00
de4764a13b fix: even uneven formations 2022-06-03 13:51:30 +02:00
Maciekxdabu
ed8f316588 Merge branch 'Development' into merloj-soldier_communication 2022-06-03 13:31:20 +02:00
Gabriel Ksawery Skowron-Rodriguez
72c3b3f5f8 Soldier now knows their squad 2022-06-03 13:27:36 +02:00
Maciekxdabu
8f0e1a45ac Merge branch 'Development' into merloj-soldier_communication 2022-06-03 13:26:12 +02:00
Maciekxdabu
f24523da7c merloj: Communication p2
- can now find Soldiers in viewRange
2022-06-03 13:26:03 +02:00
Gabriel Ksawery Skowron-Rodriguez
fe056d660e added PathfindingSingleton to Main scene 2022-06-03 13:20:35 +02:00
Krzysztof Stefan Rudnicki
3e39ca54f0 Merge branch 'Development' into 'kuchy-robust-formation'
pathfinding wip

See merge request gskowron/eopsy-lab-567-project!18
2022-06-03 13:05:29 +02:00
Krzysztof Stefan Rudnicki
a1c85a04e5 Merge branch 'kuchy-robust-formation' into 'Development'
# Conflicts:
#   theProject/Assets/Scripts/Managers/TilemapManager.cs
2022-06-03 11:05:21 +00:00
Gabriel Ksawery Skowron-Rodriguez
b9b335be01 preliminary final movement
+ path created
- path costs not working correctly
- only "whole map" path is generated
2022-06-03 12:59:45 +02:00
ee93786a31 feat: add magnetometer 2022-06-03 11:38:46 +02:00
c5514854bf feat 2022-05-31 18:39:57 +02:00
Gabriel Ksawery Skowron-Rodriguez
8b4b345e23 pathfinding wip
+ mostly works
- for some reason does not find finalNode
sometimes
2022-05-30 15:02:44 +02:00
Maciekxdabu
e627369767 merloj: Communication class base
- also deleted unused Box Collider from Soldier prefab
2022-05-30 15:02:13 +02:00
0e36930777 feat: reformat formation assignment
toDo: fix middle squares not being taken
2022-05-30 15:00:56 +02:00
Maciekxdabu
f20a5b1e71 merloj: TTLList 2022-05-30 14:12:04 +02:00
4cdc53a377 feat: formation in middle
soldiers allign on the left and right of where we clicked
2022-05-30 13:48:37 +02:00
6146d64dba feat: detect edges in formation 2022-05-30 13:13:39 +02:00
Gabriel Ksawery Skowron-Rodriguez
635c7d2b0a small comment added 2022-05-27 21:46:21 +02:00
Gabriel Ksawery Skowron-Rodriguez
8589ee8007 basic movement done
+ soldier tries to move directly into the target position
- if it cannot move, it does nothing
2022-05-27 13:33:29 +02:00