Commit Graph

26 Commits

Author SHA1 Message Date
Gabriel Ksawery Skowron-Rodriguez
3dc631a5f4 Merge branch 'Development' into SpartaqS-OrderIssuing 2022-05-17 15:12:47 +02:00
Gabriel Ksawery Skowron-Rodriguez
e804e6bff6 PlayerClickSystem fix and Soldier world position adjusted
+ PlayerClickSytem
++ now pass position of raycast hit not position of object iht
+ TilemapManager
++ added world space offset to place soldiers within the tile they stand at
2022-05-17 13:37:02 +02:00
Maciekxdabu
01db1678d8 merloj/kuch: soldiers attack 2022-05-16 15:23:39 +02:00
Gabriel Ksawery Skowron-Rodriguez
d6f6631de8 clicking on tile wip
+ Added PlayerClickSystem
++ raycasts and tries to hit the grid
+TilemapManager
++ some access level changes to get stuff out of it
++ GetTIleFromWorldCoords()
+++ to get the tile that was clicked
--- TO DO: FIGURE OUT HOW TO MAKE IT POSISBLE TO CLICK ON A TILE WITH NO SOLDIER
2022-05-16 15:22:02 +02:00
Maciekxdabu
93ff6c93d4 merloj: getallsoldiers() 2022-05-16 15:09:43 +02:00
c5bde051c5 chore 2022-05-16 15:01:00 +02:00
Maciekxdabu
eb98f2b09f merloj: new Soldier spawns 2022-05-16 14:56:01 +02:00
Krzysztof Stefan Rudnicki
635597680b Merge branch 'kuchy-soldier-tick' into 'Development'
feat: add tick system soldier, add set tag

See merge request gskowron/eopsy-lab-567-project!4
2022-05-16 14:45:38 +02:00
Maciekxdabu
6019a8eccd merloj: applied new soldiers to tilemap 2022-05-16 14:44:45 +02:00
6881d889a0 feat: add tick system soldier, add set tag 2022-05-16 14:44:12 +02:00
Maciekxdabu
3e6fb92ac2 Merge branch 'merloj-tilemap' into Development 2022-05-16 14:33:20 +02:00
Gabriel Ksawery Skowron-Rodriguez
2c248b7de0 Merge remote-tracking branch 'origin/merloj-tilemap' into SpartaqS-OrderIssuing 2022-05-16 14:33:05 +02:00
Maciekxdabu
acf737cbad merloj: base tilemap done 2022-05-16 14:32:01 +02:00
Krzysztof Stefan Rudnicki
c9ab4e1f93 Merge branch 'Development' into 'kuchy-soldiers'
# Conflicts:
#   The project/Assets/Scenes/SpartaqS.unity
2022-05-16 12:26:26 +00:00
Gabriel Ksawery Skowron-Rodriguez
523b73bcb3 Merge branch 'SpartaqS-Squad' into Development 2022-05-16 14:23:46 +02:00
ba336cd776 chore 2022-05-16 14:23:32 +02:00
Gabriel Ksawery Skowron-Rodriguez
50882e48db Added basic Squad logic
+ Squad
++ aggregates soldiers
++ orders are passed to soldiers (one order per tick)
+- for now debug functions to simulate player inputting of a movement order
2022-05-16 14:21:52 +02:00
2a0b75fd81 feat: Find soldiers 2022-05-16 14:16:41 +02:00
fe0d6a6b7f add soldier script 2022-05-16 14:16:41 +02:00
Gabriel Ksawery Skowron-Rodriguez
100f074ec1 Merge branch 'kuchy-soldiers' into SpartaqS-Squad 2022-05-16 13:42:44 +02:00
e21fe8a213 add soldier script 2022-05-16 13:39:57 +02:00
Gabriel Ksawery Skowron-Rodriguez
df91ef27c8 Merge branch 'kuchy-soldiers' into SpartaqS-Squad 2022-05-16 13:38:10 +02:00
Gabriel Ksawery Skowron-Rodriguez
98112df4a5 added TickSystem and an example tick receiver
+ basic TickSystem fully working:
++ add it to a scene for ticks to happen

+ ExampleTickReceiver reference monobehaviour
++ so everyone knows how to connect to the system
2022-05-16 13:34:11 +02:00
0879eb56b4 chore: add branch 2022-05-16 12:47:02 +02:00
Maciekxdabu
08ad9b62df Added scenes for each 2022-05-09 14:32:38 +02:00
Maciekxdabu
9c952ee9a4 Initial project
- moved gitignore into project folder
- created initial 3D Unity Project
2022-05-09 13:16:56 +02:00