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 |
|
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 |
|
|
|
0e36930777
|
feat: reformat formation assignment
toDo: fix middle squares not being taken
|
2022-05-30 15:00:56 +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 |
|
Gabriel Ksawery Skowron-Rodriguez
|
0ff19d299b
|
added more enemies to show the power of friendmaking
|
2022-05-27 12:34:22 +02:00 |
|
Maciekxdabu
|
5c5e4d47eb
|
made soldiers spawn every 4/5 seconds
|
2022-05-23 19:14:57 +02:00 |
|
Maciekxdabu
|
6d49382e56
|
Merge branch 'Development'
|
2022-05-23 19:09:24 +02:00 |
|
Maciekxdabu
|
be14e2b26f
|
The power of friendship
3 engingeers, 1 computer, like 5 bugs squashed.
SoldierCount++
|
2022-05-23 19:07:14 +02:00 |
|
Krzysztof Stefan Rudnicki
|
ca123b397c
|
Merge branch 'kuchy-formation' into 'Development'
Kuchy formation
See merge request gskowron/eopsy-lab-567-project!17
|
2022-05-23 17:57:51 +02:00 |
|
|
|
6fa16f12ac
|
fix: fix formation
|
2022-05-23 17:55:37 +02:00 |
|
Maciekxdabu
|
32b28cfdc6
|
Merge branch 'Development' of https://gitlab-stud.elka.pw.edu.pl/gskowron/eopsy-lab-567-project into Development
|
2022-05-23 17:46:26 +02:00 |
|
Maciekxdabu
|
200397a5eb
|
merloj: tilemap fixes in Main scene
|
2022-05-23 17:46:14 +02:00 |
|
Krzysztof Stefan Rudnicki
|
549ca3865f
|
Merge branch 'Development' into 'kuchy-formation'
made usage of adding/removing soldiers to squad easier
See merge request gskowron/eopsy-lab-567-project!16
|
2022-05-23 17:41:58 +02:00 |
|
Krzysztof Stefan Rudnicki
|
9df38ff1a6
|
Merge branch 'kuchy-formation' into 'Development'
# Conflicts:
# theProject/Assets/Scripts/Squad.cs
|
2022-05-23 15:41:53 +00:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
978329a9c7
|
Merge branch 'SpartaqS-AddingSoldiersToSquad' into 'Development'
made usage of adding/removing soldiers to squad easier
See merge request gskowron/eopsy-lab-567-project!13
|
2022-05-23 17:37:56 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
a0c9226757
|
Soldiers are placed on tile and spawed periodically (when possible)
|
2022-05-23 17:37:04 +02:00 |
|
|
|
4ee480cdc0
|
feat: add formation calculation
|
2022-05-23 17:36:25 +02:00 |
|
Maciekxdabu
|
7cc7000a67
|
merloj: tilemapy stuffy
- collider tilempawoy
- rysowanie ustalonej wielkości mapy
|
2022-05-23 17:29:47 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
93ba29703e
|
made usage of adding/removing soldiers to squad easier
+ now only add/remove soldier to squad once and this
|
2022-05-23 16:27:39 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
ce3d7d69ee
|
Adding initial soldiers to squads
|
2022-05-23 15:13:48 +02:00 |
|
Krzysztof Stefan Rudnicki
|
973ab6af6f
|
Merge branch 'Development' into 'kuchy-formation'
Development
See merge request gskowron/eopsy-lab-567-project!12
|
2022-05-23 15:11:24 +02:00 |
|
Maciekxdabu
|
39c0b33131
|
Merge branch 'Development' into merloj-New_Input_System
|
2022-05-23 15:01:28 +02:00 |
|
Maciekxdabu
|
f1fe305d79
|
merloj: added input system
|
2022-05-23 15:01:14 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
b3b8f4cb76
|
merge fix
|
2022-05-23 14:50:00 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
1c376a1da4
|
cosmetic fix
|
2022-05-23 14:37:26 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
288e40e55e
|
Merge branch 'Development' into SpartaqS-AddingSoldiersToSquad
|
2022-05-23 14:32:16 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
5ef45955fc
|
removed debug logs from soldier
|
2022-05-23 14:32:03 +02:00 |
|
Maciekxdabu
|
cc06fd99d9
|
merloj: base prefab in Manager
|
2022-05-23 14:31:46 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
530aee0cf8
|
fixed merge
|
2022-05-23 14:30:01 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
a0564ec377
|
Merge branch 'SpartaqS-AddingSoldiersToSquad' into Development
|
2022-05-23 14:20:38 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
28f7e76c0b
|
sort of fix
|
2022-05-23 14:15:06 +02:00 |
|
Maciekxdabu
|
3ea366e43f
|
merloj: working movement on Development
- plus fixed text on Base prefab
|
2022-05-23 14:12:29 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
42452e6e64
|
Cleanup Soldiers and Bases (make Entity base class)
|
2022-05-23 14:04:53 +02:00 |
|
Maciekxdabu
|
68a93d8891
|
merloj: missing function fix (SetTileCoord())
|
2022-05-23 14:00:59 +02:00 |
|
Maciekxdabu
|
ae04f9f4af
|
Merge branch 'merloj-full_soldier_movement' into Development
|
2022-05-23 13:52:24 +02:00 |
|
Maciekxdabu
|
5fb48804ad
|
merloj: final movement
|
2022-05-23 13:48:02 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
4ff01692aa
|
Merge branch 'Development' into SpartaqS-AddingSoldiersToSquad
|
2022-05-23 13:21:13 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
a4f64abb66
|
cleaned up OnDestroy()
|
2022-05-23 13:20:08 +02:00 |
|
|
|
f9804b48bb
|
Soldier is a child of base
|
2022-05-23 13:18:37 +02:00 |
|
Krzysztof Stefan Rudnicki
|
b41c920fb2
|
Merge branch 'kuchy-enemy-base' into 'Development'
feat: add base
See merge request gskowron/eopsy-lab-567-project!10
|
2022-05-23 13:00:08 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
81cb9f5489
|
Merge branch 'Development' into SpartaqS-AddingSoldiersToSquad
|
2022-05-23 13:00:02 +02:00 |
|
|
|
4b607e25f0
|
feat: more hp for base
|
2022-05-23 12:58:45 +02:00 |
|
Gabriel Ksawery Skowron-Rodriguez
|
65899a25e5
|
WIP, before tilemap manager changes
|
2022-05-23 12:57:50 +02:00 |
|
Maciekxdabu
|
16365477b0
|
merloj: spawn bases
|
2022-05-23 12:55:42 +02:00 |
|
|
|
8085bbb2e7
|
feat: add base
|
2022-05-23 12:54:59 +02:00 |
|
Maciekxdabu
|
2645aad5f4
|
merloj: added Soldier onDeath UnityEvent
|
2022-05-23 12:48:43 +02:00 |
|
