6fa16f12ac
fix: fix formation
2022-05-23 17:55:37 +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
Gabriel Ksawery Skowron-Rodriguez
40dfa80f14
SquadManager progress
...
+ added prfab for squad manager
+ now squads are spawned dynamically by squad manager
2022-05-23 12:41:33 +02:00
Gabriel Ksawery Skowron-Rodriguez
decfc8bfca
cleanup Squad code
2022-05-23 12:22:06 +02:00
Gabriel Ksawery Skowron-Rodriguez
23de96c839
Merge branch 'SpartaqS-SoldierMovementInterrupt' into 'Development'
...
Soldier: Added preliminary interrupt handling
See merge request gskowron/eopsy-lab-567-project!9
2022-05-22 21:37:36 +02:00
Gabriel Ksawery Skowron-Rodriguez
1469eadfd5
Soldier: Added preliminary interrupt handling
...
+ soldier can now set its target destination when ordered to move to a position
+/- Squad: refactored MovementOrder to be less error prone
- cleaned up NotImplementedException for Exeecuting a Movement order
2022-05-22 21:37:03 +02:00
Gabriel Ksawery Skowron-Rodriguez
2c52961575
Merge branch 'SpartaqS-SoldierInterruptQueue' into 'Development'
...
Added soldier's queue functionality
See merge request gskowron/eopsy-lab-567-project!8
2022-05-22 21:19:45 +02:00
Gabriel Ksawery Skowron-Rodriguez
0fcd903343
made basic soldiers attack no faster than every second tick
...
+ one tick to reload the gun I guess
2022-05-22 21:19:05 +02:00
Gabriel Ksawery Skowron-Rodriguez
70c7414a0b
Added soldier's queue functionality
...
+ actions: basic actions that can the soldier creates on its own
+ interrupts: actions that are enqueued as a result of receiving orders. Executed before basic actions
+/- renamed "UpdateTarget" to "TryAttackEnemy"
+ made "speedAttack" (attack delay) functional
+ prepared target position (modified by movement orders)
2022-05-22 21:17:29 +02:00
Krzysztof Stefan Rudnicki
2515dfe567
Merge branch 'Main-Scene_impr' into 'Development'
...
fix: concept file
See merge request gskowron/eopsy-lab-567-project!7
2022-05-22 20:32:16 +02:00
Gabriel Ksawery Skowron-Rodriguez
e9f69fbd88
added temp code for squad WIP for showcase
...
proabbly need to refactor stuff that starts with "Temp" and was added in this commit
2022-05-20 11:51:59 +02:00
Gabriel Ksawery Skowron-Rodriguez
2d1aa7cb9c
added important comment to PlayerClickSystem
2022-05-20 11:30:15 +02:00
Gabriel Ksawery Skowron-Rodriguez
ee7c0fdfa1
added clicking on tiles to main scene
...
+ temp plane below tilemap to catch raycasts, need tofind a real way to do this on the tilemap itself (Tilemap2D collider does nto work)
2022-05-20 11:27:04 +02:00
Gabriel Ksawery Skowron-Rodriguez
de67d01f08
added hp display and improved main scene
2022-05-17 22:33:59 +02:00
Maciekxdabu
94a32459ea
merloj: finished demo 1
2022-05-17 22:22:04 +02:00
0d1d5e778a
feat: newline readme
2022-05-17 18:05:09 +02:00
4b856731bc
feat: Add unity version readme
2022-05-17 18:04:27 +02:00
